Fix issue with moderator and org subscription

dappforce · Nov 30, 2023 · 7c89c47 · 7c89c47
1 parent 4c14d4e
commit 7c89c47
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 4 deletions.
diff --git a/src/services/datahub/generated-query.ts b/src/services/datahub/generated-query.ts
@@ -702,7 +702,10 @@ export type SubscribeOrganizationSubscription = {
       ctxPostIds?: Array<string> | null
       organizationModerators?: Array<{
         __typename?: 'ModerationOrganizationModerator'
-        id: string
+        moderator: {
+          __typename?: 'Moderator'
+          substrateAccount: { __typename?: 'Account'; id: string }
+        }
       }> | null
     }
   }
@@ -1151,7 +1154,11 @@ export const SubscribeOrganization = gql`
       event
       entity {
         organizationModerators {
-          id
+          moderator {
+            substrateAccount {
+              id
+            }
+          }
         }
         ctxPostIds
       }

diff --git a/src/services/datahub/moderation/mutation.ts b/src/services/datahub/moderation/mutation.ts
@@ -2,11 +2,13 @@ import {
   ApiModerationActionsBody,
   ApiModerationActionsResponse,
 } from '@/pages/api/moderation/actions'
+import { queryClient } from '@/services/provider'
 import { useMyAccount } from '@/stores/my-account'
 import mutationWrapper from '@/subsocial-query/base'
 import { SocialCallDataArgs, socialCallName } from '@subsocial/data-hub-sdk'
 import axios, { AxiosResponse } from 'axios'
 import { createSocialDataEventInput, DatahubParams } from '../utils'
+import { getModeratorQuery } from './query'
 
 type ModerationCallNames =
   | (typeof socialCallName)['synth_moderation_init_moderator']
@@ -56,5 +58,16 @@ export const useModerationActions = mutationWrapper(
     data: SimplifiedModerationActionParams<T>
   ) => {
     return moderationActions(augmentModerationActionParams(data))
+  },
+  {
+    onSuccess: (_, variables) => {
+      // HOTFIX: there is no event from subscription when the new moderator and org is linked, so we invalidate the query manually
+      const completeArgs = augmentModerationActionParams(variables)
+      if (completeArgs.callName === 'synth_moderation_init_moderator') {
+        setTimeout(() => {
+          getModeratorQuery.invalidate(queryClient, completeArgs.address)
+        }, 1_000)
+      }
+    },
   }
 )
diff --git a/src/services/datahub/moderation/subscription.ts b/src/services/datahub/moderation/subscription.ts
@@ -51,7 +51,11 @@ const SUBSCRIBE_ORGANIZATION = gql`
       event
       entity {
         organizationModerators {
-          id
+          moderator {
+            substrateAccount {
+              id
+            }
+          }
         }
         ctxPostIds
       }
@@ -172,7 +176,7 @@ async function processOrganization(
   const moderators = entity.organizationModerators
 
   moderators?.forEach((moderator) => {
-    const address = moderator.id
+    const address = moderator.moderator.substrateAccount.id
     getModeratorQuery.setQueryData(queryClient, address, (oldData) => {
       if (!oldData) return null
       const postIdsSet = new Set(oldData.postIds)