Merge pull request #461 from xmtp/ar/fix-isactive-initial

fix: Group is Active
xmtp · Aug 5, 2024 · 4d0adbf · 4d0adbf
2 parents 94867b1 + 9975fe5
commit 4d0adbf
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 26 deletions.
diff --git a/example/src/tests/groupTests.ts b/example/src/tests/groupTests.ts
@@ -1010,6 +1010,8 @@ test('can list groups', async () => {
     `Group 2 url for alix should be www.group2image.com but was ${alixGroup2?.imageUrlSquare}`
   )
 
+  assert(boGroup1?.isGroupActive === true, `Group 1 should be active for bo`)
+
   return true
 })
 
@@ -1343,7 +1345,9 @@ test('can make a group with admin permissions', async () => {
 
   if ((await group.permissionPolicySet()).addMemberPolicy !== 'admin') {
     throw Error(
-      `Group permission level should be admin but was ${(await group.permissionPolicySet()).addMemberPolicy}`
+      `Group permission level should be admin but was ${
+        (await group.permissionPolicySet()).addMemberPolicy
+      }`
     )
   }
 

diff --git a/src/lib/Conversations.ts b/src/lib/Conversations.ts
@@ -7,7 +7,7 @@ import {
   ConversationContainer,
 } from './ConversationContainer'
 import { DecodedMessage } from './DecodedMessage'
-import { Group } from './Group'
+import { Group, GroupParams } from './Group'
 import { CreateGroupOptions } from './types/CreateGroupOptions'
 import { EventTypes } from './types/EventTypes'
 import { PermissionPolicySet } from './types/PermissionPolicySet'
@@ -144,13 +144,7 @@ export default class Conversations<
     XMTPModule.subscribeToGroups(this.client.inboxId)
     const groupsSubscription = XMTPModule.emitter.addListener(
       EventTypes.Group,
-      async ({
-        inboxId,
-        group,
-      }: {
-        inboxId: string
-        group: Group<ContentTypes>
-      }) => {
+      async ({ inboxId, group }: { inboxId: string; group: GroupParams }) => {
         if (this.known[group.id]) {
           return
         }
@@ -293,7 +287,10 @@ export default class Conversations<
         this.known[conversationContainer.topic] = true
         if (conversationContainer.version === ConversationVersion.GROUP) {
           return await callback(
-            new Group(this.client, conversationContainer as Group<ContentTypes>)
+            new Group(
+              this.client,
+              conversationContainer as unknown as GroupParams
+            )
           )
         } else {
           return await callback(

diff --git a/src/lib/Group.ts b/src/lib/Group.ts
@@ -15,6 +15,18 @@ import * as XMTP from '../index'
 
 export type PermissionUpdateOption = 'allow' | 'deny' | 'admin' | 'super_admin'
 
+export interface GroupParams {
+  id: string
+  createdAt: number
+  peerInboxIds: InboxId[]
+  creatorInboxId: InboxId
+  topic: string
+  name: string
+  isActive: boolean
+  imageUrlSquare: string
+  description: string
+}
+
 export class Group<
   ContentTypes extends DefaultContentTypes = DefaultContentTypes,
 > implements ConversationContainer<ContentTypes>
@@ -32,29 +44,15 @@ export class Group<
   description: string
   // pinnedFrameUrl: string
 
-  constructor(
-    client: XMTP.Client<ContentTypes>,
-    params: {
-      id: string
-      createdAt: number
-      peerInboxIds: InboxId[]
-      creatorInboxId: InboxId
-      topic: string
-      name: string
-      isGroupActive: boolean
-      imageUrlSquare: string
-      description: string
-      // pinnedFrameUrl: string
-    }
-  ) {
+  constructor(client: XMTP.Client<ContentTypes>, params: GroupParams) {
     this.client = client
     this.id = params.id
     this.createdAt = params.createdAt
     this.peerInboxIds = params.peerInboxIds
     this.topic = params.topic
     this.creatorInboxId = params.creatorInboxId
     this.name = params.name
-    this.isGroupActive = params.isGroupActive
+    this.isGroupActive = params.isActive
     this.imageUrlSquare = params.imageUrlSquare
     this.description = params.description
     // this.pinnedFrameUrl = params.pinnedFrameUrl