Fixed #476

src/utils/queryHooks/timeline.ts

@@ -2,10 +2,7 @@ import apiInstance, { InstanceResponse } from '@api/instance'
 import haptics from '@components/haptics'
 import queryClient from '@helpers/queryClient'
 import { store } from '@root/store'
-import {
-  checkInstanceFeature,
-  getInstanceNotificationsFilter
-} from '@utils/slices/instancesSlice'
+import { checkInstanceFeature, getInstanceNotificationsFilter } from '@utils/slices/instancesSlice'
 import { AxiosError } from 'axios'
 import { uniqBy } from 'lodash'
 import {
@@ -30,10 +27,7 @@ export type QueryKeyTimeline = [
   }
 ]
 
-const queryFunction = async ({
-  queryKey,
-  pageParam
-}: QueryFunctionContext<QueryKeyTimeline>) => {
+const queryFunction = async ({ queryKey, pageParam }: QueryFunctionContext<QueryKeyTimeline>) => {
   const { page, account, hashtag, list, toot } = queryKey[1]
   let params: { [key: string]: string } = { ...pageParam }
 
@@ -65,9 +59,9 @@ const queryFunction = async ({
     case 'Notifications':
       const rootStore = store.getState()
       const notificationsFilter = getInstanceNotificationsFilter(rootStore)
-      const usePositiveFilter = checkInstanceFeature(
-        'notification_types_positive_filter'
-      )(rootStore)
+      const usePositiveFilter = checkInstanceFeature('notification_types_positive_filter')(
+        rootStore
+      )
       return apiInstance<Mastodon.Notification[]>({
         method: 'get',
         url: 'notifications',
@@ -99,9 +93,7 @@ const queryFunction = async ({
           }
         })
       } else {
-        const res1 = await apiInstance<
-          (Mastodon.Status & { _pinned: boolean })[]
-        >({
+        const res1 = await apiInstance<(Mastodon.Status & { _pinned: boolean })[]>({
           method: 'get',
           url: `accounts/${account}/statuses`,
           params: {
@@ -190,11 +182,7 @@ const queryFunction = async ({
         url: `statuses/${toot}/context`
       })
       return {
-        body: [
-          ...res2_1.body.ancestors,
-          res1_1.body,
-          ...res2_1.body.descendants
-        ]
+        body: [...res2_1.body.ancestors, res1_1.body, ...res2_1.body.descendants]
       }
     default:
       return Promise.reject()
@@ -207,10 +195,7 @@ const useTimelineQuery = ({
   options,
   ...queryKeyParams
 }: QueryKeyTimeline[1] & {
-  options?: UseInfiniteQueryOptions<
-    InstanceResponse<Mastodon.Status[]>,
-    AxiosError
-  >
+  options?: UseInfiniteQueryOptions<InstanceResponse<Mastodon.Status[]>, AxiosError>
 }) => {
   const queryKey: QueryKeyTimeline = ['Timeline', { ...queryKeyParams }]
   return useInfiniteQuery(queryKey, queryFunction, {
@@ -284,7 +269,7 @@ export type MutationVarsTimelineUpdateStatusProperty = {
   queryKey: QueryKeyTimeline
   rootQueryKey?: QueryKeyTimeline
   id: Mastodon.Status['id'] | Mastodon.Poll['id']
-  reblog?: boolean
+  isReblog?: boolean
   payload:
     | {
         property: 'bookmarked' | 'muted' | 'pinned'
@@ -384,9 +369,9 @@ const mutationFunction = async (params: MutationVarsTimeline) => {
           }
           return apiInstance<Mastodon.Status>({
             method: 'post',
-            url: `statuses/${params.id}/${
-              params.payload.currentValue ? 'un' : ''
-            }${MapPropertyToUrl[params.payload.property]}`,
+            url: `statuses/${params.id}/${params.payload.currentValue ? 'un' : ''}${
+              MapPropertyToUrl[params.payload.property]
+            }`,
             ...(params.payload.property === 'reblogged' && { body })
           })
       }
@@ -396,9 +381,9 @@ const mutationFunction = async (params: MutationVarsTimeline) => {
         case 'mute':
           return apiInstance<Mastodon.Account>({
             method: 'post',
-            url: `accounts/${params.id}/${
-              params.payload.currentValue ? 'un' : ''
-            }${params.payload.property}`
+            url: `accounts/${params.id}/${params.payload.currentValue ? 'un' : ''}${
+              params.payload.property
+            }`
           })
         case 'reports':
           return apiInstance<Mastodon.Account>({
@@ -455,8 +440,7 @@ const useTimelineMutation = ({
     ...(onMutate && {
       onMutate: params => {
         queryClient.cancelQueries(params.queryKey)
-        const oldData =
-          params.queryKey && queryClient.getQueryData(params.queryKey)
+        const oldData = params.queryKey && queryClient.getQueryData(params.queryKey)
 
         haptics('Light')
         switch (params.type) {

src/utils/queryHooks/timeline/update/status.ts

@@ -2,32 +2,27 @@ import { MutationVarsTimelineUpdateStatusProperty } from '@utils/queryHooks/time
 
 const updateStatus = ({
   item,
-  reblog,
+  isReblog,
   payload
 }: {
   item: Mastodon.Status
-  reblog?: boolean
+  isReblog?: boolean
   payload: MutationVarsTimelineUpdateStatusProperty['payload']
 }) => {
   switch (payload.property) {
     case 'poll':
-      if (reblog) {
+      if (isReblog) {
         item.reblog!.poll = payload.data
       } else {
         item.poll = payload.data
       }
       break
     default:
-      if (reblog) {
+      if (isReblog) {
         item.reblog![payload.property] =
-          typeof payload.currentValue === 'boolean'
-            ? !payload.currentValue
-            : true
+          typeof payload.currentValue === 'boolean' ? !payload.currentValue : true
         if (payload.propertyCount) {
-          if (
-            typeof payload.currentValue === 'boolean' &&
-            payload.currentValue
-          ) {
+          if (typeof payload.currentValue === 'boolean' && payload.currentValue) {
             item.reblog![payload.propertyCount] = payload.countValue - 1
           } else {
             item.reblog![payload.propertyCount] = payload.countValue + 1
@@ -35,14 +30,9 @@ const updateStatus = ({
         }
       } else {
         item[payload.property] =
-          typeof payload.currentValue === 'boolean'
-            ? !payload.currentValue
-            : true
+          typeof payload.currentValue === 'boolean' ? !payload.currentValue : true
         if (payload.propertyCount) {
-          if (
-            typeof payload.currentValue === 'boolean' &&
-            payload.currentValue
-          ) {
+          if (typeof payload.currentValue === 'boolean' && payload.currentValue) {
             item[payload.propertyCount] = payload.countValue - 1
           } else {
             item[payload.propertyCount] = payload.countValue + 1

src/utils/queryHooks/timeline/updateStatusProperty.ts

@@ -1,9 +1,6 @@
 import queryClient from '@helpers/queryClient'
 import { InfiniteData } from 'react-query'
-import {
-  MutationVarsTimelineUpdateStatusProperty,
-  TimelineData
-} from '../timeline'
+import { MutationVarsTimelineUpdateStatusProperty, TimelineData } from '../timeline'
 import updateConversation from './update/conversation'
 import updateNotification from './update/notification'
 import updateStatus from './update/status'
@@ -12,12 +9,54 @@ const updateStatusProperty = ({
   queryKey,
   rootQueryKey,
   id,
-  reblog,
+  isReblog,
   payload
 }: MutationVarsTimelineUpdateStatusProperty) => {
-  queryClient.setQueryData<InfiniteData<TimelineData> | undefined>(
-    queryKey,
-    old => {
+  queryClient.setQueryData<InfiniteData<TimelineData> | undefined>(queryKey, old => {
+    if (old) {
+      let foundToot = false
+      old.pages = old.pages.map(page => {
+        // Skip rest of the pages if any toot is found
+        if (foundToot) {
+          return page
+        } else {
+          if (typeof (page.body as Mastodon.Conversation[])[0].unread === 'boolean') {
+            const items = page.body as Mastodon.Conversation[]
+            const tootIndex = items.findIndex(({ last_status }) => last_status?.id === id)
+            if (tootIndex >= 0) {
+              foundToot = true
+              updateConversation({ item: items[tootIndex], payload })
+            }
+            return page
+          } else if (typeof (page.body as Mastodon.Notification[])[0].type === 'string') {
+            const items = page.body as Mastodon.Notification[]
+            const tootIndex = items.findIndex(({ status }) => status?.id === id)
+            if (tootIndex >= 0) {
+              foundToot = true
+              updateNotification({ item: items[tootIndex], payload })
+            }
+          } else {
+            const items = page.body as Mastodon.Status[]
+            const tootIndex = isReblog
+              ? items.findIndex(({ reblog }) => reblog?.id === id)
+              : items.findIndex(toot => toot.id === id)
+            // if favourites page and notifications page, remove the item instead
+            if (tootIndex >= 0) {
+              foundToot = true
+              updateStatus({ item: items[tootIndex], isReblog, payload })
+            }
+          }
+
+          return page
+        }
+      })
+    }
+
+    return old
+  })
+
+  rootQueryKey &&
+    queryClient.setQueryData<InfiniteData<TimelineData> | undefined>(rootQueryKey, old => {
       if (old) {
         let foundToot = false
         old.pages = old.pages.map(page => {
@@ -25,39 +64,30 @@ const updateStatusProperty = ({
           if (foundToot) {
             return page
           } else {
-            if (
-              typeof (page.body as Mastodon.Conversation[])[0].unread ===
-              'boolean'
-            ) {
+            if (typeof (page.body as Mastodon.Conversation[])[0].unread === 'boolean') {
               const items = page.body as Mastodon.Conversation[]
-              const tootIndex = items.findIndex(
-                ({ last_status }) => last_status?.id === id
-              )
+              const tootIndex = items.findIndex(({ last_status }) => last_status?.id === id)
               if (tootIndex >= 0) {
                 foundToot = true
                 updateConversation({ item: items[tootIndex], payload })
               }
               return page
-            } else if (
-              typeof (page.body as Mastodon.Notification[])[0].type === 'string'
-            ) {
+            } else if (typeof (page.body as Mastodon.Notification[])[0].type === 'string') {
               const items = page.body as Mastodon.Notification[]
-              const tootIndex = items.findIndex(
-                ({ status }) => status?.id === id
-              )
+              const tootIndex = items.findIndex(({ status }) => status?.id === id)
               if (tootIndex >= 0) {
                 foundToot = true
                 updateNotification({ item: items[tootIndex], payload })
               }
             } else {
               const items = page.body as Mastodon.Status[]
-              const tootIndex = reblog
+              const tootIndex = isReblog
                 ? items.findIndex(({ reblog }) => reblog?.id === id)
                 : items.findIndex(toot => toot.id === id)
               // if favourites page and notifications page, remove the item instead
               if (tootIndex >= 0) {
                 foundToot = true
-                updateStatus({ item: items[tootIndex], reblog, payload })
+                updateStatus({ item: items[tootIndex], isReblog, payload })
               }
             }
 
@@ -67,65 +97,7 @@ const updateStatusProperty = ({
       }
 
       return old
-    }
-  )
-
-  rootQueryKey &&
-    queryClient.setQueryData<InfiniteData<TimelineData> | undefined>(
-      rootQueryKey,
-      old => {
-        if (old) {
-          let foundToot = false
-          old.pages = old.pages.map(page => {
-            // Skip rest of the pages if any toot is found
-            if (foundToot) {
-              return page
-            } else {
-              if (
-                typeof (page.body as Mastodon.Conversation[])[0].unread ===
-                'boolean'
-              ) {
-                const items = page.body as Mastodon.Conversation[]
-                const tootIndex = items.findIndex(
-                  ({ last_status }) => last_status?.id === id
-                )
-                if (tootIndex >= 0) {
-                  foundToot = true
-                  updateConversation({ item: items[tootIndex], payload })
-                }
-                return page
-              } else if (
-                typeof (page.body as Mastodon.Notification[])[0].type ===
-                'string'
-              ) {
-                const items = page.body as Mastodon.Notification[]
-                const tootIndex = items.findIndex(
-                  ({ status }) => status?.id === id
-                )
-                if (tootIndex >= 0) {
-                  foundToot = true
-                  updateNotification({ item: items[tootIndex], payload })
-                }
-              } else {
-                const items = page.body as Mastodon.Status[]
-                const tootIndex = reblog
-                  ? items.findIndex(({ reblog }) => reblog?.id === id)
-                  : items.findIndex(toot => toot.id === id)
-                // if favourites page and notifications page, remove the item instead
-                if (tootIndex >= 0) {
-                  foundToot = true
-                  updateStatus({ item: items[tootIndex], reblog, payload })
-                }
-              }
-
-              return page
-            }
-          })
-        }
-
-        return old
-      }
-    )
+    })
 }
 
 export default updateStatusProperty