zio/bsky-app
2
0
Fork 0
Code Pull requests Releases Packages Activity

[🐴] update convo list from message bus (#4189)

Browse source 
* update convo list from message bus

* don't increase unread count if you're the sender

* add refetch interval back

* Fix deleted message state copy

* only enable if `hasSession`

* Fix logged out handling

* increase refetch interval to 60s

* request 10s interval when message screen active

* use useAppState hook for convo resume/background

* Combine forces

* fix useFocusEffect logic

---------

Co-authored-by: Eric Bailey <git@esb.lol>
This commit is contained in:
Samuel Newman 2024-05-24 19:59:28 +01:00 • committed by GitHub
parent c0175af76a
commit dc9d80d2a8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 376 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/screens/Messages/List/ChatListItem.tsx
View file

@ -105,7 +105,9 @@ function ChatListItemReady({
lastMessageSentAt = convo.lastMessage.sentAt
}
if (ChatBskyConvoDefs.isDeletedMessageView(convo.lastMessage)) {
lastMessage = _(msg`Conversation deleted`)
lastMessage = isDeletedAccount
? _(msg`Conversation deleted`)
: _(msg`Message deleted`)
}
const [showActions, setShowActions] = useState(false)

28
src/screens/Messages/List/index.tsx
View file

@ -1,16 +1,20 @@
import React, {useCallback, useMemo, useState} from 'react'
import React, {useCallback, useEffect, useMemo, useState} from 'react'
import {View} from 'react-native'
import {ChatBskyConvoDefs} from '@atproto/api'
import {msg, Trans} from '@lingui/macro'
import {useLingui} from '@lingui/react'
import {useFocusEffect} from '@react-navigation/native'
import {NativeStackScreenProps} from '@react-navigation/native-stack'
import {useAppState} from '#/lib/hooks/useAppState'
import {useInitialNumToRender} from '#/lib/hooks/useInitialNumToRender'
import {MessagesTabNavigatorParams} from '#/lib/routes/types'
import {cleanError} from '#/lib/strings/errors'
import {logger} from '#/logger'
import {isNative} from '#/platform/detection'
import {useListConvos} from '#/state/queries/messages/list-converations'
import {MESSAGE_SCREEN_POLL_INTERVAL} from '#/state/messages/convo/const'
import {useMessagesEventBus} from '#/state/messages/events'
import {useListConvosQuery} from '#/state/queries/messages/list-converations'
import {List} from '#/view/com/util/List'
import {ViewHeader} from '#/view/com/util/ViewHeader'
import {CenteredView} from '#/view/com/util/Views'
@ -52,7 +56,7 @@ export function MessagesScreen({navigation, route}: Props) {
// this tab. We should immediately push to the conversation after pressing the notification.
// After we push, reset with `setParams` so that this effect will fire next time we press a notification, even if
// the conversation is the same as before
React.useEffect(() => {
useEffect(() => {
if (pushToConversation) {
navigation.navigate('MessagesConversation', {
conversation: pushToConversation,
@ -61,6 +65,22 @@ export function MessagesScreen({navigation, route}: Props) {
}
}, [navigation, pushToConversation])
// Request the poll interval to be 10s (or whatever the MESSAGE_SCREEN_POLL_INTERVAL is set to in the future)
// but only when the screen is active
const messagesBus = useMessagesEventBus()
const state = useAppState()
const isActive = state === 'active'
useFocusEffect(
useCallback(() => {
if (isActive) {
const unsub = messagesBus.requestPollInterval(
MESSAGE_SCREEN_POLL_INTERVAL,
)
return () => unsub()
}
}, [messagesBus, isActive]),
)
const renderButton = useCallback(() => {
return (
<Link
@ -88,7 +108,7 @@ export function MessagesScreen({navigation, route}: Props) {
isError,
error,
refetch,
} = useListConvos({refetchInterval: 15_000})
} = useListConvosQuery()
useRefreshOnFocus(refetch)