fix: ensure proper content topics

xmtp · Oct 17, 2023 · 54233a2 · 54233a2
1 parent 170f428
commit 54233a2
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/src/conversations/Conversation.ts b/src/conversations/Conversation.ts
@@ -269,7 +269,7 @@ export class ConversationV1<ContentTypes>
         content,
         options?.contentType || ContentTypeText,
         payload,
-        topics[0],
+        this.topic,
         this
       )
     })
@@ -351,7 +351,7 @@ export class ConversationV1<ContentTypes>
       ]
       this.client.contacts.add(this.peerAddress)
     } else {
-      topics = [this.topic]
+      topics = [topic]
     }
     const contentType = options?.contentType || ContentTypeText
     const payload = await this.client.encodeContent(content, options)
@@ -370,7 +370,7 @@ export class ConversationV1<ContentTypes>
       content,
       contentType,
       payload,
-      topics[0], // Just use the first topic for the returned value
+      topic,
       this
     )
   }
@@ -539,12 +539,7 @@ export class ConversationV2<ContentTypes>
     const payload = await this.client.encodeContent(content, options)
     const msg = await this.createMessage(payload, options?.timestamp)
 
-    let topic: string
-    if (options?.ephemeral) {
-      topic = this.ephemeralTopic
-    } else {
-      topic = this.topic
-    }
+    const topic = options?.ephemeral ? this.ephemeralTopic : this.topic
 
     await this.client.publishEnvelopes([
       {
@@ -559,7 +554,7 @@ export class ConversationV2<ContentTypes>
       msg,
       content,
       contentType,
-      this.topic,
+      topic,
       payload,
       this,
       this.client.address
@@ -726,7 +721,7 @@ export class ConversationV2<ContentTypes>
     return new PreparedMessage(env, async () => {
       await this.client.publishEnvelopes([
         {
-          contentTopic: this.topic,
+          contentTopic: topic,
           message: msgBytes,
           timestamp: msg.sent,
         },