Fixes #3633 (#3643)

coral-xyz · Apr 7, 2023 · 5158183 · 5158183 · vercel · Apr 7, 2023
1 parent dc3a6fd
commit 5158183
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/packages/db/src/api/friendships.ts b/packages/db/src/api/friendships.ts
@@ -23,15 +23,17 @@ export const refreshFriendships = async (uuid: string, jwt?: string) => {
       return;
     }
     const existingChats = await db.inbox.toArray();
-    existingChats.forEach((existingChat) => {
+    for (const existingChat of existingChats) {
       if (!chats.find((x) => x.remoteUserId === existingChat.remoteUserId)) {
-        db.inbox.delete(existingChat.remoteUserId);
+        await db.inbox.delete(existingChat.remoteUserId);
       }
-    });
+    }
     if (chats) {
-      chats?.forEach((chat) => {
-        db.inbox.put(chat);
-      });
+      await Promise.all(
+        chats?.map(async (chat) => {
+          await db.inbox.put(chat);
+        }) || []
+      );
     }
   } catch (e) {
     console.error(e);
@@ -49,9 +51,11 @@ export const refreshGroups = async (uuid: string, jwt?: string) => {
 
     const res = await response.json();
     const collections: CollectionChatData[] = res.collections;
-    collections?.forEach((collection) => {
-      createOrUpdateCollection(uuid, collection);
-    });
+    await Promise.all(
+      collections?.map(async (collection) => {
+        await createOrUpdateCollection(uuid, collection);
+      }) || []
+    );
   } catch (e) {
     console.error(e);
   }

diff --git a/packages/db/src/db/chats.ts b/packages/db/src/db/chats.ts
@@ -108,8 +108,8 @@ export const createOrUpdateCollection = async (
 ) => {
   const db = getDb(uuid);
   if (await db.collections.get(data.collectionId)) {
-    db.collections.update(data.collectionId, data);
+    return db.collections.update(data.collectionId, data);
   } else {
-    db.collections.put(data);
+    return db.collections.put(data);
   }
 };