fix(mobile): notification for inbox

Author: hyoban

apps/mobile/src/hooks/useMessaging.ts

@@ -1,4 +1,5 @@
 import { useHasNotificationActions } from "@follow/store/action/hooks"
+import { ROUTE_FEED_IN_INBOX } from "@follow/store/constants/app"
 import { useWhoami } from "@follow/store/user/hooks"
 import { getApp } from "@react-native-firebase/app"
 import type { FirebaseMessagingTypes } from "@react-native-firebase/messaging"
@@ -48,6 +49,7 @@ export function useMessaging() {
     function navigateToEntry(message: FirebaseMessagingTypes.RemoteMessage) {
       if (
         !message.data ||
+        message.data.type !== "new-entry" ||
         typeof message.data.view !== "string" ||
         typeof message.data.entryId !== "string"
       ) {
@@ -57,6 +59,7 @@ export function useMessaging() {
       navigation.pushControllerView(EntryDetailScreen, {
         entryId: message.data.entryId,
         view: Number.parseInt(message.data.view),
+        isInbox: String(message.data.feedId).startsWith(ROUTE_FEED_IN_INBOX),
       })
     }
 

apps/mobile/src/screens/(stack)/entries/[entryId]/EntryDetailScreen.tsx

@@ -37,15 +37,17 @@ export const EntryDetailScreen: NavigationControllerView<{
   entryId: string
   entryIds?: string[]
   view: FeedViewType
-}> = ({ entryId, entryIds, view: viewType }) => {
-  useAutoMarkAsRead(entryId)
+  isInbox?: boolean
+}> = ({ entryId, entryIds, view: viewType, isInbox }) => {
+  usePrefetchEntryDetail(entryId, isInbox)
   const entry = useEntry(entryId, (state) => ({
     title: state.title,
     url: state.url,
     summary: state.settings?.summary,
     translation: state.settings?.translation,
     readability: state.settings?.readability,
   }))
+  useAutoMarkAsRead(entryId, !!entry)
   const insets = useSafeAreaInsets()
   const ctxValue = useMemo(
     () => ({

packages/internal/store/src/entry/hooks.ts

@@ -120,10 +120,10 @@ export const useEntriesQuery = (
   }, [entriesIds, query])
 }
 
-export const usePrefetchEntryDetail = (entryId: string) => {
+export const usePrefetchEntryDetail = (entryId: string, isInbox?: boolean) => {
   return useQuery({
     queryKey: ["entry", entryId],
-    queryFn: () => entrySyncServices.fetchEntryDetail(entryId),
+    queryFn: () => entrySyncServices.fetchEntryDetail(entryId, isInbox),
   })
 }
 

packages/internal/store/src/entry/store.ts

@@ -543,11 +543,12 @@ class EntrySyncServices {
     return res
   }
 
-  async fetchEntryDetail(entryId: EntryId) {
+  async fetchEntryDetail(entryId: EntryId, isInbox?: boolean) {
     const currentEntry = getEntry(entryId)
-    const res = currentEntry?.inboxHandle
-      ? await apiClient().entries.inbox.$get({ query: { id: entryId } })
-      : await apiClient().entries.$get({ query: { id: entryId } })
+    const res =
+      currentEntry?.inboxHandle || isInbox
+        ? await apiClient().entries.inbox.$get({ query: { id: entryId } })
+        : await apiClient().entries.$get({ query: { id: entryId } })
     const entry = honoMorph.toEntry(res.data)
     if (!currentEntry && entry) {
       await entryActions.upsertMany([entry])

packages/internal/store/src/unread/hooks.ts

@@ -42,13 +42,15 @@ export const useSyncUnreadWhenUnMatch = (entryIds: string[]) => {
   }, [entryIds.toString()])
 }
 
-export const useAutoMarkAsRead = (entryId: string) => {
+export const useAutoMarkAsRead = (entryId: string, enabled: boolean) => {
   const { mutate } = useMutation({
     mutationFn: (entryId: string) => unreadSyncService.markEntryAsRead(entryId),
   })
   useEffect(() => {
-    mutate(entryId)
-  }, [entryId, mutate])
+    if (enabled) {
+      mutate(entryId)
+    }
+  }, [enabled, entryId, mutate])
 }
 
 export const useUnreadById = (id: string) => {