Merge pull request #618 from xmtp/rygine/msg-convo

Add conversation reference to messages
xmtp · Jun 7, 2024 · e0dbc98 · e0dbc98
2 parents ae64690 + 617b3bf
commit e0dbc98
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/.changeset/rude-avocados-flow.md b/.changeset/rude-avocados-flow.md
@@ -0,0 +1,5 @@
+---
+"@xmtp/mls-client": patch
+---
+
+Add conversation reference to messages
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,6 +21,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          persist-credentials: false
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:

diff --git a/packages/mls-client/src/Conversation.ts b/packages/mls-client/src/Conversation.ts
@@ -80,7 +80,7 @@ export class Conversation {
 
   stream() {
     const asyncStream = new AsyncStream<NapiMessage, DecodedMessage>(
-      (message) => new DecodedMessage(this.#client, message)
+      (message) => new DecodedMessage(this.#client, this, message)
     )
     const stream = this.#group.stream(asyncStream.callback)
     asyncStream.stopCallback = stream.end.bind(stream)
@@ -126,6 +126,6 @@ export class Conversation {
   messages(options?: NapiListMessagesOptions): DecodedMessage[] {
     return this.#group
       .findMessages(options)
-      .map((message) => new DecodedMessage(this.#client, message))
+      .map((message) => new DecodedMessage(this.#client, this, message))
   }
 }
diff --git a/packages/mls-client/src/DecodedMessage.ts b/packages/mls-client/src/DecodedMessage.ts
@@ -5,6 +5,7 @@ import {
 } from '@xmtp/mls-client-bindings-node'
 import { ContentTypeId } from '@xmtp/xmtp-js'
 import type { Client } from '@/Client'
+import type { Conversation } from '@/Conversation'
 import { nsToDate } from '@/helpers/date'
 
 export type MessageKind = 'application' | 'membership_change'
@@ -14,6 +15,7 @@ export class DecodedMessage {
   #client: Client
   content: any
   contentType: ContentTypeId
+  conversation: Conversation
   conversationId: string
   deliveryStatus: MessageDeliveryStatus
   fallback?: string
@@ -25,8 +27,13 @@ export class DecodedMessage {
   sentAt: Date
   sentAtNs: number
 
-  constructor(client: Client, message: NapiMessage) {
+  constructor(
+    client: Client,
+    conversation: Conversation,
+    message: NapiMessage
+  ) {
     this.#client = client
+    this.conversation = conversation
     this.id = message.id
     this.sentAtNs = message.sentAtNs
     this.sentAt = nsToDate(message.sentAtNs)