Basic editing works

src/utils/navigation/navigators.ts

@@ -26,31 +26,20 @@ export type RootStackParamList = {
         type: 'edit'
         incomingStatus: Mastodon.Status
         replyToStatus?: Mastodon.Status
-        queryKey?: [
-          'Timeline',
-          {
-            page: App.Pages
-            hashtag?: Mastodon.Tag['name']
-            list?: Mastodon.List['id']
-            toot?: Mastodon.Status['id']
-            account?: Mastodon.Account['id']
-          }
-        ]
+        queryKey?: QueryKeyTimeline
+        rootQueryKey?: QueryKeyTimeline
+      }
+    | {
+        type: 'deleteEdit'
+        incomingStatus: Mastodon.Status
+        replyToStatus?: Mastodon.Status
+        queryKey?: QueryKeyTimeline
       }
     | {
         type: 'reply'
         incomingStatus: Mastodon.Status
         accts: Mastodon.Account['acct'][]
-        queryKey?: [
-          'Timeline',
-          {
-            page: App.Pages
-            hashtag?: Mastodon.Tag['name']
-            list?: Mastodon.List['id']
-            toot?: Mastodon.Status['id']
-            account?: Mastodon.Account['id']
-          }
-        ]
+        queryKey?: QueryKeyTimeline
       }
     | {
         type: 'conversation'

src/utils/queryHooks/timeline.ts

@@ -13,6 +13,7 @@ import {
   useMutation
 } from 'react-query'
 import deleteItem from './timeline/deleteItem'
+import editItem from './timeline/editItem'
 import updateStatusProperty from './timeline/updateStatusProperty'
 
 export type QueryKeyTimeline = [
@@ -303,13 +304,21 @@ export type MutationVarsTimelineUpdateAccountProperty = {
   }
 }
 
+export type MutationVarsTimelineEditItem = {
+  // This is for editing status
+  type: 'editItem'
+  queryKey?: QueryKeyTimeline
+  rootQueryKey?: QueryKeyTimeline
+  status: Mastodon.Status
+}
+
 export type MutationVarsTimelineDeleteItem = {
   // This is for deleting status and conversation
   type: 'deleteItem'
   source: 'statuses' | 'conversations'
   queryKey?: QueryKeyTimeline
   rootQueryKey?: QueryKeyTimeline
-  id: Mastodon.Conversation['id']
+  id: Mastodon.Status['id']
 }
 
 export type MutationVarsTimelineDomainBlock = {
@@ -322,6 +331,7 @@ export type MutationVarsTimelineDomainBlock = {
 export type MutationVarsTimeline =
   | MutationVarsTimelineUpdateStatusProperty
   | MutationVarsTimelineUpdateAccountProperty
+  | MutationVarsTimelineEditItem
   | MutationVarsTimelineDeleteItem
   | MutationVarsTimelineDomainBlock
 
@@ -371,6 +381,8 @@ const mutationFunction = async (params: MutationVarsTimeline) => {
             }
           })
       }
+    case 'editItem':
+      return { body: params.status }
     case 'deleteItem':
       return apiInstance<Mastodon.Conversation>({
         method: 'delete',
@@ -423,6 +435,9 @@ const useTimelineMutation = ({
           case 'updateStatusProperty':
             updateStatusProperty(params)
             break
+          case 'editItem':
+            editItem(params)
+            break
           case 'deleteItem':
             deleteItem(params)
             break

src/utils/queryHooks/timeline/deleteItem.ts

@@ -6,11 +6,7 @@ const deleteItem = ({
   queryKey,
   rootQueryKey,
   id
-}: {
-  queryKey?: MutationVarsTimelineDeleteItem['queryKey']
-  rootQueryKey?: MutationVarsTimelineDeleteItem['rootQueryKey']
-  id: MutationVarsTimelineDeleteItem['id']
-}) => {
+}: MutationVarsTimelineDeleteItem) => {
   queryKey &&
     queryClient.setQueryData<InfiniteData<any> | undefined>(queryKey, old => {
       if (old) {

src/utils/queryHooks/timeline/editItem.ts

@@ -0,0 +1,52 @@
+import queryClient from '@helpers/queryClient'
+import { InfiniteData } from 'react-query'
+import { MutationVarsTimelineEditItem } from '../timeline'
+
+const editItem = ({
+  queryKey,
+  rootQueryKey,
+  status
+}: MutationVarsTimelineEditItem) => {
+  console.log('START')
+  queryKey &&
+    queryClient.setQueryData<InfiniteData<any> | undefined>(queryKey, old => {
+      if (old) {
+        old.pages = old.pages.map(page => {
+          page.body = page.body.map((item: Mastodon.Status) => {
+            if (item.id === status.id) {
+              console.log('found queryKey', queryKey)
+              console.log('new content', status.content)
+              item = status
+            }
+            return item
+          })
+          return page
+        })
+        return old
+      }
+    })
+
+  rootQueryKey &&
+    queryClient.setQueryData<InfiniteData<any> | undefined>(
+      rootQueryKey,
+      old => {
+        if (old) {
+          old.pages = old.pages.map(page => {
+            page.body = page.body.map((item: Mastodon.Status) => {
+              if (item.id === status.id) {
+                console.log('found rootQueryKey', queryKey)
+                console.log('new content', status.content)
+                item = status
+              }
+              return item
+            })
+            return page
+          })
+          return old
+        }
+      }
+    )
+  console.log('EDN')
+}
+
+export default editItem

src/utils/queryHooks/timeline/updateStatusProperty.ts

@@ -14,13 +14,7 @@ const updateStatusProperty = ({
   id,
   reblog,
   payload
-}: {
-  queryKey: MutationVarsTimelineUpdateStatusProperty['queryKey']
-  rootQueryKey?: MutationVarsTimelineUpdateStatusProperty['rootQueryKey']
-  id: MutationVarsTimelineUpdateStatusProperty['id']
-  reblog?: MutationVarsTimelineUpdateStatusProperty['reblog']
-  payload: MutationVarsTimelineUpdateStatusProperty['payload']
-}) => {
+}: MutationVarsTimelineUpdateStatusProperty) => {
   queryClient.setQueryData<InfiniteData<TimelineData> | undefined>(
     queryKey,
     old => {

src/utils/slices/instancesSlice.ts

@@ -344,14 +344,16 @@ export const getInstanceVersion = ({ instances: { instances } }: RootState) =>
   instances[findInstanceActive(instances)]?.version
 export const checkInstanceFeature =
   (feature: string) =>
-  ({ instances: { instances } }: RootState) => {
-    return features
-      .filter(f => f.feature === feature)
-      .filter(
-        f =>
-          parseFloat(instances[findInstanceActive(instances)]?.version) >=
-          f.version
-      )
+  ({ instances: { instances } }: RootState): Boolean => {
+    return (
+      features
+        .filter(f => f.feature === feature)
+        .filter(
+          f =>
+            parseFloat(instances[findInstanceActive(instances)]?.version) >=
+            f.version
+        ).length > 0
+    )
   }
 
 /* Get Instance Configuration */