@unicitylabs/sphere-sdk 0.6.10-dev.5 → 0.6.10-dev.7

package/dist/core/index.cjs

@@ -12375,7 +12375,7 @@ var GroupChatModule = class {
     );
     this.trackSubscription(
       createNip29Filter({
-        kinds: [NIP29_KINDS.GROUP_METADATA, NIP29_KINDS.GROUP_MEMBERS, NIP29_KINDS.GROUP_ADMINS],
+        kinds: [NIP29_KINDS.GROUP_METADATA, NIP29_KINDS.GROUP_ADMINS],
         "#d": groupIds
       }),
       { onEvent: (event) => this.handleMetadataEvent(event) }
@@ -12470,8 +12470,6 @@ var GroupChatModule = class {
       group.updatedAt = event.created_at * 1e3;
       this.groups.set(groupId, group);
       this.schedulePersist();
-    } else if (event.kind === NIP29_KINDS.GROUP_MEMBERS) {
-      this.updateMembersFromEvent(groupId, event);
     } else if (event.kind === NIP29_KINDS.GROUP_ADMINS) {
       this.updateAdminsFromEvent(groupId, event);
     }
@@ -12534,25 +12532,6 @@ var GroupChatModule = class {
       this.schedulePersist();
     }
   }
-  updateMembersFromEvent(groupId, event) {
-    const pTags = event.tags.filter((t) => t[0] === "p");
-    const existingMembers = this.members.get(groupId) || [];
-    for (const tag of pTags) {
-      const pubkey = tag[1];
-      const roleFromTag = tag[3];
-      const existing = existingMembers.find((m) => m.pubkey === pubkey);
-      const role = roleFromTag || existing?.role || GroupRole.MEMBER;
-      const member = {
-        pubkey,
-        groupId,
-        role,
-        nametag: existing?.nametag,
-        joinedAt: existing?.joinedAt || event.created_at * 1e3
-      };
-      this.saveMemberToMemory(member);
-    }
-    this.schedulePersist();
-  }
   updateAdminsFromEvent(groupId, event) {
     const pTags = event.tags.filter((t) => t[0] === "p");
     const existingMembers = this.members.get(groupId) || [];
@@ -12630,47 +12609,24 @@ var GroupChatModule = class {
     await this.ensureConnected();
     if (!this.client) return [];
     const groupsMap = /* @__PURE__ */ new Map();
-    const memberCountsMap = /* @__PURE__ */ new Map();
-    await Promise.all([
-      this.oneshotSubscription(
-        new import_nostr_js_sdk4.Filter({ kinds: [NIP29_KINDS.GROUP_METADATA] }),
-        {
-          onEvent: (event) => {
-            const group = this.parseGroupMetadata(event);
-            if (group && group.visibility === GroupVisibility.PUBLIC) {
-              const existing = groupsMap.get(group.id);
-              if (!existing || group.createdAt > existing.createdAt) {
-                groupsMap.set(group.id, group);
-              }
-            }
-          },
-          onComplete: () => {
-          },
-          timeoutMs: 1e4,
-          timeoutLabel: "fetchAvailableGroups(metadata)"
-        }
-      ),
-      this.oneshotSubscription(
-        new import_nostr_js_sdk4.Filter({ kinds: [NIP29_KINDS.GROUP_MEMBERS] }),
-        {
-          onEvent: (event) => {
-            const groupId = this.getGroupIdFromMetadataEvent(event);
-            if (groupId) {
-              const pTags = event.tags.filter((t) => t[0] === "p");
-              memberCountsMap.set(groupId, pTags.length);
+    await this.oneshotSubscription(
+      new import_nostr_js_sdk4.Filter({ kinds: [NIP29_KINDS.GROUP_METADATA] }),
+      {
+        onEvent: (event) => {
+          const group = this.parseGroupMetadata(event);
+          if (group && group.visibility === GroupVisibility.PUBLIC) {
+            const existing = groupsMap.get(group.id);
+            if (!existing || group.createdAt > existing.createdAt) {
+              groupsMap.set(group.id, group);
             }
-          },
-          onComplete: () => {
-          },
-          timeoutMs: 1e4,
-          timeoutLabel: "fetchAvailableGroups(members)"
-        }
-      )
-    ]);
-    for (const [groupId, count] of memberCountsMap) {
-      const group = groupsMap.get(groupId);
-      if (group) group.memberCount = count;
-    }
+          }
+        },
+        onComplete: () => {
+        },
+        timeoutMs: 1e4,
+        timeoutLabel: "fetchAvailableGroups(metadata)"
+      }
+    );
     return Array.from(groupsMap.values());
   }
   async joinGroup(groupId, inviteCode) {
@@ -13475,6 +13431,7 @@ var GroupChatModule = class {
       let name = "Unnamed Group";
       let description;
       let picture;
+      let memberCount;
       let isPrivate = false;
       let writeRestricted = false;
       if (event.content && event.content.trim()) {
@@ -13495,6 +13452,7 @@ var GroupChatModule = class {
         if (tag[0] === "private") isPrivate = true;
         if (tag[0] === "public" && tag[1] === "false") isPrivate = true;
         if (tag[0] === "write-restricted") writeRestricted = true;
+        if (tag[0] === "member_count" && tag[1]) memberCount = parseInt(tag[1], 10) || void 0;
       }
       return {
         id: groupId,
@@ -13502,6 +13460,7 @@ var GroupChatModule = class {
         name,
         description,
         picture,
+        memberCount,
         visibility: isPrivate ? GroupVisibility.PRIVATE : GroupVisibility.PUBLIC,
         writeRestricted: writeRestricted || void 0,
         createdAt: event.created_at * 1e3