Fixing sending messages, caching groups when fetching them

ephemeraHQ · Aug 21, 2024 · 255907c · 255907c
1 parent 56f0375
commit 255907c
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 21 deletions.
diff --git a/queries/useGroupConsentQuery.ts b/queries/useGroupConsentQuery.ts
@@ -16,9 +16,6 @@ export const useGroupConsentQuery = (
   const statusFromState = useSettingsStore(
     useShallow((s) => s.groupStatus[topic])
   );
-  const initialDataUpdatedAt = useSettingsStore(
-    useShallow((s) => s.lastAsyncUpdate)
-  );
   const { data: group } = useGroupQuery(account, topic);
   return useQuery({
     queryKey: groupConsentQueryKey(account, topic),
@@ -28,7 +25,6 @@ export const useGroupConsentQuery = (
     },
     enabled: !!group,
     initialData: statusFromState ?? "unknown",
-    initialDataUpdatedAt,
     ...queryOptions,
   });
 };

diff --git a/queries/useGroupMembersQuery.ts b/queries/useGroupMembersQuery.ts
@@ -1,8 +1,6 @@
-import { useSettingsStore } from "@data/store/accountsStore";
 import { QueryObserverOptions, useQuery } from "@tanstack/react-query";
 import { Member } from "@xmtp/react-native-sdk";
 import { InboxId } from "@xmtp/react-native-sdk/build/lib/Client";
-import { useShallow } from "zustand/react/shallow";
 
 import { groupMembersQueryKey } from "./QueryKeys";
 import { entifyWithAddress, EntityObjectWithAddress } from "./entify";
@@ -16,10 +14,7 @@ export const useGroupMembersQuery = (
   topic: string,
   queryOptions?: Partial<QueryObserverOptions<GroupMembersSelectData>>
 ) => {
-  const { data: group } = useGroupQuery(account, topic);
-  const initialDataUpdatedAt = useSettingsStore(
-    useShallow((s) => s.lastAsyncUpdate)
-  );
+  const { data: group, dataUpdatedAt } = useGroupQuery(account, topic);
   return useQuery<GroupMembersSelectData>({
     queryKey: groupMembersQueryKey(account, topic),
     queryFn: async () => {
@@ -30,7 +25,6 @@ export const useGroupMembersQuery = (
           ids: [],
         };
       }
-      await group.sync();
       const updatedMembers = await group.membersList();
       return entifyWithAddress(
         updatedMembers,
@@ -47,7 +41,7 @@ export const useGroupMembersQuery = (
           (member) => member.addresses[0]
         )
       : undefined,
-    initialDataUpdatedAt,
+    initialDataUpdatedAt: dataUpdatedAt,
     enabled: !!group,
     ...queryOptions,
   });

diff --git a/queries/useGroupQuery.ts b/queries/useGroupQuery.ts
@@ -57,3 +57,11 @@ export const invalidateGroupQuery = (account: string, topic: string) => {
     queryKey: groupQueryKey(account, topic),
   });
 };
+
+export const setGroupQueryData = (
+  account: string,
+  topic: string,
+  group: Group
+) => {
+  queryClient.setQueryData(groupQueryKey(account, topic), group);
+};
diff --git a/utils/xmtpRN/conversations.ts b/utils/xmtpRN/conversations.ts
@@ -1,11 +1,13 @@
 import { setGroupDescriptionQueryData } from "@queries/useGroupDescriptionQuery";
+import { setGroupQueryData } from "@queries/useGroupQuery";
 import { converseEventEmitter } from "@utils/events";
 import { getGroupIdFromTopic } from "@utils/groupUtils/groupId";
 import logger from "@utils/logger";
 import {
   ConsentListEntry,
   ConversationContext,
   ConversationVersion,
+  Group,
   InboxId,
 } from "@xmtp/react-native-sdk";
 import { PermissionPolicySet } from "@xmtp/react-native-sdk/build/lib/types/PermissionPolicySet";
@@ -57,8 +59,10 @@ const protocolConversationToStateConversation = (
 });
 
 const protocolGroupToStateConversation = (
+  account: string,
   group: GroupWithCodecsType
 ): XmtpConversation => {
+  setGroupQueryData(account, group.topic, group as Group);
   const groupMembersAddresses: string[] = [];
   const groupAddedByInboxId = group.addedByInboxId;
   let groupCreator: string | undefined;
@@ -177,7 +181,10 @@ const handleNewConversation = async (
         ? protocolConversationToStateConversation(
             conversation as ConversationWithCodecsType
           )
-        : protocolGroupToStateConversation(conversation as GroupWithCodecsType),
+        : protocolGroupToStateConversation(
+            client.address,
+            conversation as GroupWithCodecsType
+          ),
     ],
     true
   );
@@ -328,8 +335,12 @@ export const loadConversations = async (
     const conversationsToSave = newConversations.map(
       protocolConversationToStateConversation
     );
-    const groupsToCreate = newGroups.map(protocolGroupToStateConversation);
-    const groupsToUpdate = knownGroups.map(protocolGroupToStateConversation);
+    const groupsToCreate = newGroups.map((g) =>
+      protocolGroupToStateConversation(account, g)
+    );
+    const groupsToUpdate = knownGroups.map((g) =>
+      protocolGroupToStateConversation(account, g)
+    );
     saveConversations(client.address, [
       ...conversationsToSave,
       ...groupsToCreate,
@@ -571,7 +582,7 @@ export const refreshGroup = async (account: string, topic: string) => {
   await group.sync();
   saveConversations(
     client.address,
-    [protocolGroupToStateConversation(group)],
+    [protocolGroupToStateConversation(account, group)],
     true
   );
   const updatedMembers = await group.membersList();

diff --git a/utils/xmtpRN/messages.ts b/utils/xmtpRN/messages.ts
@@ -218,7 +218,6 @@ export const syncGroupsMessages = async (
   groups: GroupWithCodecsType[],
   queryGroupsFromTimestamp: { [topic: string]: number }
 ) => {
-  logger.info(`Syncing ${groups.length} groups...`);
   for (const group of groups) {
     // No need to group.sync here as syncGroupsMessages is called either
     // from handleNewConversation which syncs before, or on groups returned
@@ -235,9 +234,7 @@ export const syncGroupsMessages = async (
     );
     groupMembers[group.topic] = group.members;
     saveMemberInboxIds(account, group.members);
-    logger.debug("synced group", group.topic);
   }
-  logger.info(`${groups.length} groups synced!`);
   const newMessages = (
     await Promise.all(
       groups.map((g) =>

diff --git a/utils/xmtpRN/send.ts b/utils/xmtpRN/send.ts
@@ -4,6 +4,7 @@ import {
   TransactionReference,
 } from "@xmtp/content-type-transaction-reference";
 import {
+  ConversationVersion,
   PreparedLocalMessage,
   sendPreparedMessage,
 } from "@xmtp/react-native-sdk";
@@ -178,7 +179,10 @@ export const sendPendingMessages = async (account: string) => {
         message.conversationId
       );
       if (conversation) {
-        if ((conversation as any).peerAddress && message.status === "sending") {
+        if (
+          conversation.version === ConversationVersion.DIRECT &&
+          message.status === "sending"
+        ) {
           // DM Conversation
           const preparedMessage = await (
             conversation as ConversationWithCodecsType
@@ -193,7 +197,7 @@ export const sendPendingMessages = async (account: string) => {
             newMessageSent: preparedMessage.preparedAt,
             message,
           };
-        } else if ((conversation as any).peerInboxIds) {
+        } else if (conversation.version === ConversationVersion.GROUP) {
           // This is a group message. Preparing it will store
           // it in libxmtp db to be published later, it's different
           // from 1v1 prepareMessage which needs to be sent using sendPreparedMessage