@fabriktor/fx 0.0.52 → 0.0.54

package/dist/src/chat/chat.d.ts

@@ -136,7 +136,6 @@ export declare class ChatFX implements ChatFXOperator {
     reactUploadedChat(opts: ReactUploadedChatOptions): Promise<void>;
     private openChatRoomConnections;
     private openGlobalChatRoomsConnection;
-    private allChatRoomMembers;
     private findUser;
     private findChat;
 }

package/dist/src/chat/chat.js

@@ -119,22 +119,37 @@ export class ChatFX {
         const roomIDs = [
             ...new Set(opts.chat_room_ids.map((id) => id.trim())),
         ].filter((id) => id !== "");
-        const entries = await Promise.all(roomIDs.map(async (chatRoomID) => [chatRoomID, await this.allChatRoomMembers(chatRoomID)]));
+        if (roomIDs.length === 0) {
+            return {};
+        }
+        const result = await this.chat.queryChatRoomMembers({
+            query: {
+                chat_room_id: roomIDs,
+            },
+        });
+        const members = result.value ?? [];
+        const membersByRoom = new Map(roomIDs.map((id) => [id, []]));
+        for (const member of members) {
+            membersByRoom.get(member.chat_room_id)?.push(member);
+        }
         const ownerIDs = [
-            ...new Set(entries.flatMap(([, members]) => members.map((member) => member.owner_id))),
+            ...new Set(members.map((member) => member.owner_id)),
         ];
         const userResults = await Promise.allSettled(ownerIDs.map(async (id) => [id, await this.findUser(id)]));
         const usersByID = new Map(userResults.flatMap((result) => result.status === "fulfilled" ? [result.value] : []));
-        return Object.fromEntries(entries.map(([chatRoomID, members]) => [
-            chatRoomID,
-            {
-                members,
-                users: members.flatMap((member) => {
-                    const user = usersByID.get(member.owner_id);
-                    return user ? [user] : [];
-                }),
-            },
-        ]));
+        return Object.fromEntries(roomIDs.map((chatRoomID) => {
+            const roomMembers = membersByRoom.get(chatRoomID) ?? [];
+            return [
+                chatRoomID,
+                {
+                    members: roomMembers,
+                    users: roomMembers.flatMap((member) => {
+                        const user = usersByID.get(member.owner_id);
+                        return user ? [user] : [];
+                    }),
+                },
+            ];
+        }));
     }
     async openChatRoom(opts) {
         const latest = await this.latestChats({
@@ -397,21 +412,6 @@ export class ChatFX {
             },
         };
     }
-    async allChatRoomMembers(chatRoomID) {
-        const out = [];
-        let page = 1;
-        for (;;) {
-            const next = await this.searchChatRoomMembers({
-                chat_room_id: chatRoomID,
-                page,
-            });
-            out.push(...next.results);
-            if (next.done) {
-                return out;
-            }
-            page = next.next_page;
-        }
-    }
     async findUser(id) {
         const out = await this.users.findOneUser({ id });
         const user = out.value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fabriktor/fx",
-  "version": "0.0.52",
+  "version": "0.0.54",
   "description": "![Fabriktor Logo](./img/fabriktor-character.gif)",
   "type": "module",
   "exports": {
@@ -17,7 +17,7 @@
     "typescript": "^6.0.3"
   },
   "dependencies": {
-    "@fabriktor/client": "0.0.51",
+    "@fabriktor/client": "0.0.52",
     "@fabriktor/schema": "0.0.34"
   }
 }