remove creator inbox id from wrapper since its not performant

xmtp · Nov 2, 2024 · 787ab2d · 787ab2d
1 parent ad44835
commit 787ab2d
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 22 deletions.
diff --git a/android/src/main/java/expo/modules/xmtpreactnativesdk/XMTPModule.kt b/android/src/main/java/expo/modules/xmtpreactnativesdk/XMTPModule.kt
@@ -752,11 +752,20 @@ class XMTPModule : Module() {
                 val params =
                     ConversationParamsWrapper.conversationParamsFromJson(conversationParams ?: "")
                 val order = getConversationSortOrder(sortOrder ?: "")
+                val start = Date()
                 val conversations =
                     client.conversations.listConversations(order = order, limit = limit)
-                conversations.map { conversation ->
+                val end = Date()
+                logV("LOPI Loaded ${conversations.size} DMs in ${end.time - start.time}ms")
+
+                val start2 = Date()
+                val convos = conversations.map { conversation ->
                     ConversationContainerWrapper.encode(client, conversation, params)
                 }
+                val end2 = Date()
+                logV("LOPI Encoded ${convos.size} DMs in ${end2.time - start2.time}ms")
+
+                convos
             }
         }
 

diff --git a/android/src/main/java/expo/modules/xmtpreactnativesdk/wrappers/DmWrapper.kt b/android/src/main/java/expo/modules/xmtpreactnativesdk/wrappers/DmWrapper.kt
@@ -21,7 +21,6 @@ class DmWrapper {
                 put("version", "DM")
                 put("topic", dm.topic)
                 put("peerInboxId", dm.peerInboxId)
-                if (dmParams.creatorInboxId) put("creatorInboxId", dm.creatorInboxId())
                 if (dmParams.consentState) {
                     put("consentState", consentStateToString(dm.consentState()))
                 }

diff --git a/android/src/main/java/expo/modules/xmtpreactnativesdk/wrappers/GroupWrapper.kt b/android/src/main/java/expo/modules/xmtpreactnativesdk/wrappers/GroupWrapper.kt
@@ -20,7 +20,6 @@ class GroupWrapper {
                 put("createdAt", group.createdAt.time)
                 put("version", "GROUP")
                 put("topic", group.topic)
-                if (groupParams.creatorInboxId) put("creatorInboxId", group.creatorInboxId())
                 if (groupParams.isActive) put("isActive", group.isActive())
                 if (groupParams.addedByInboxId) put("addedByInboxId", group.addedByInboxId())
                 if (groupParams.name) put("name", group.name)
@@ -51,7 +50,6 @@ class GroupWrapper {
 }
 
 class ConversationParamsWrapper(
-    val creatorInboxId: Boolean = true,
     val isActive: Boolean = true,
     val addedByInboxId: Boolean = true,
     val name: Boolean = true,
@@ -65,7 +63,6 @@ class ConversationParamsWrapper(
             if (conversationParams.isEmpty()) return ConversationParamsWrapper()
             val jsonOptions = JsonParser.parseString(conversationParams).asJsonObject
             return ConversationParamsWrapper(
-                if (jsonOptions.has("creatorInboxId")) jsonOptions.get("creatorInboxId").asBoolean else true,
                 if (jsonOptions.has("isActive")) jsonOptions.get("isActive").asBoolean else true,
                 if (jsonOptions.has("addedByInboxId")) jsonOptions.get("addedByInboxId").asBoolean else true,
                 if (jsonOptions.has("name")) jsonOptions.get("name").asBoolean else true,

diff --git a/example/src/tests/groupPerformanceTests.ts b/example/src/tests/groupPerformanceTests.ts
@@ -128,6 +128,7 @@ test('test compare V2 and V3 dms', async () => {
   let dms = await davonV3Client.conversations.listConversations()
   end = Date.now()
   console.log(`Davon loaded ${dms.length} Dms in ${end - start}ms`)
+  const v3Load = end - start
 
   await createDms(davonV3Client, await createV3Clients(5), 1)
 
@@ -152,7 +153,6 @@ test('test compare V2 and V3 dms', async () => {
   dms = await davonV3Client.conversations.listConversations()
   end = Date.now()
   console.log(`Davon loaded ${dms.length} Dms in ${end - start}ms`)
-  const v3Load = end - start
 
   assert(
     v3Load < v2Load,

diff --git a/ios/Wrappers/DmWrapper.swift b/ios/Wrappers/DmWrapper.swift
@@ -20,9 +20,6 @@ struct DmWrapper {
 			"peerInboxId": try await dm.peerInboxId
 		]
 
-		if conversationParams.creatorInboxId {
-			result["creatorInboxId"] = try dm.creatorInboxId()
-		}
 		if conversationParams.consentState {
 			result["consentState"] = ConsentWrapper.consentStateToString(state: try dm.consentState())
 		}

diff --git a/ios/Wrappers/GroupWrapper.swift b/ios/Wrappers/GroupWrapper.swift
@@ -19,9 +19,6 @@ struct GroupWrapper {
 			"topic": group.topic
 		]
 
-		if conversationParams.creatorInboxId {
-			result["creatorInboxId"] = try group.creatorInboxId()
-		}
 		if conversationParams.isActive {
 			result["isActive"] = try group.isActive()
 		}
@@ -60,7 +57,6 @@ struct GroupWrapper {
 }
 
 struct ConversationParamsWrapper {
-	let creatorInboxId: Bool
 	let isActive: Bool
 	let addedByInboxId: Bool
 	let name: Bool
@@ -70,7 +66,6 @@ struct ConversationParamsWrapper {
 	let lastMessage: Bool
 
 	init(
-		creatorInboxId: Bool = true,
 		isActive: Bool = true,
 		addedByInboxId: Bool = true,
 		name: Bool = true,
@@ -79,7 +74,6 @@ struct ConversationParamsWrapper {
 		consentState: Bool = true,
 		lastMessage: Bool = false
 	) {
-		self.creatorInboxId = creatorInboxId
 		self.isActive = isActive
 		self.addedByInboxId = addedByInboxId
 		self.name = name
@@ -97,7 +91,6 @@ struct ConversationParamsWrapper {
 		}
 
 		return ConversationParamsWrapper(
-			creatorInboxId: jsonDict["creatorInboxId"] as? Bool ?? true,
 			isActive: jsonDict["isActive"] as? Bool ?? true,
 			addedByInboxId: jsonDict["addedByInboxId"] as? Bool ?? true,
 			name: jsonDict["name"] as? Bool ?? true,

diff --git a/src/lib/Group.ts b/src/lib/Group.ts
@@ -19,7 +19,6 @@ export interface GroupParams {
   id: string
   createdAt: number
   members: string[]
-  creatorInboxId: InboxId
   topic: string
   name: string
   isActive: boolean
@@ -39,15 +38,13 @@ export class Group<
   createdAt: number
   version = ConversationVersion.GROUP
   topic: string
-  creatorInboxId: InboxId
   name: string
   isGroupActive: boolean
   addedByInboxId: InboxId
   imageUrlSquare: string
   description: string
   state: ConsentState
   lastMessage?: DecodedMessage<ContentTypes>
-  // pinnedFrameUrl: string
 
   constructor(
     client: XMTP.Client<ContentTypes>,
@@ -58,26 +55,32 @@ export class Group<
     this.id = params.id
     this.createdAt = params.createdAt
     this.topic = params.topic
-    this.creatorInboxId = params.creatorInboxId
     this.name = params.name
     this.isGroupActive = params.isActive
     this.addedByInboxId = params.addedByInboxId
     this.imageUrlSquare = params.imageUrlSquare
     this.description = params.description
     this.state = params.consentState
     this.lastMessage = lastMessage
-    // this.pinnedFrameUrl = params.pinnedFrameUrl
   }
 
   /**
    * This method returns an array of inbox ids associated with the group.
    * To get the latest member inbox ids from the network, call sync() first.
-   * @returns {Promise<DecodedMessage<ContentTypes>[]>} A Promise that resolves to an array of DecodedMessage objects.
+   * @returns {Promise<InboxId[]>} A Promise that resolves to an array of InboxId objects.
    */
   async memberInboxIds(): Promise<InboxId[]> {
     return XMTP.listMemberInboxIds(this.client, this.id)
   }
 
+  /**
+   * This method returns a inbox id associated with the creator of the group.
+   * @returns {Promise<InboxId>} A Promise that resolves to a InboxId.
+   */
+  async creatorInboxId(): Promise<InboxId> {
+    return XMTP.creatorInboxId(this.client.inboxId, this.id)
+  }
+
   /**
    * Sends a message to the current group.
    *