From 5811d8cb0ab32f91693a44664670de20f701d7c5 Mon Sep 17 00:00:00 2001
From: Piotr Suwala <piotr.suwala@pubnub.com>
Date: Tue, 16 Jan 2024 16:08:23 +0100
Subject: [PATCH 1/2] feat(lib): fix thread messages streamUpdatesOn

---
 lib/src/entities/message.ts        |  6 ++--
 lib/src/entities/thread-message.ts | 46 ++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/lib/src/entities/message.ts b/lib/src/entities/message.ts
index 318d8675..ce48998e 100644
--- a/lib/src/entities/message.ts
+++ b/lib/src/entities/message.ts
@@ -111,14 +111,14 @@ export class Message {
   }
 
   /** @internal */
-  private clone(params: Partial<MessageFields>) {
+  protected clone(params: Partial<MessageFields>) {
     const { timetoken, content, channelId, userId, actions, meta } = this
     const data = Object.assign({}, { timetoken, content, channelId, userId, actions, meta }, params)
     return new Message(this.chat, data)
   }
 
   /** @internal */
-  private assignAction(action: PubNub.MessageAction) {
+  protected assignAction(action: PubNub.MessageAction) {
     const { actionTimetoken, type, value, uuid } = action
     const newActions = this.actions || {}
     newActions[type] ||= {}
@@ -128,7 +128,7 @@ export class Message {
   }
 
   /** @internal */
-  private filterAction(action: PubNub.MessageAction) {
+  protected filterAction(action: PubNub.MessageAction) {
     const { actionTimetoken, type, value, uuid } = action
     const newActions = this.actions || {}
     newActions[type] ||= {}
diff --git a/lib/src/entities/thread-message.ts b/lib/src/entities/thread-message.ts
index 9f2b4238..eb5cbf7b 100644
--- a/lib/src/entities/thread-message.ts
+++ b/lib/src/entities/thread-message.ts
@@ -3,6 +3,7 @@ import { Chat } from "./chat"
 import { ThreadMessageDTOParams } from "../types"
 import { Channel } from "./channel"
 import { getErrorProxiedEntity } from "../error-logging"
+import PubNub from "pubnub"
 
 export class ThreadMessage extends Message {
   readonly parentChannelId: string
@@ -29,6 +30,51 @@ export class ThreadMessage extends Message {
     return getErrorProxiedEntity(new ThreadMessage(chat, data), chat.errorLogger)
   }
 
+  /** @internal */
+  protected clone(params: Partial<MessageFields>) {
+    const { timetoken, content, channelId, userId, actions, meta, parentChannelId } = this
+    const data = Object.assign(
+      {},
+      { parentChannelId, timetoken, content, channelId, userId, actions, meta },
+      params
+    )
+    return new ThreadMessage(this.chat, data)
+  }
+
+  static streamUpdatesOn(
+    threadMessages: ThreadMessage[],
+    callback: (threadMessages: ThreadMessage[]) => unknown
+  ) {
+    if (!threadMessages.length) throw "Cannot stream message updates on an empty list"
+    const listener = {
+      messageAction: (event: PubNub.MessageActionEvent) => {
+        const threadMessage = threadMessages.find(
+          (msg) => msg.timetoken === event.data.messageTimetoken
+        )
+        if (!threadMessage) return
+        if (threadMessage.channelId !== event.channel) return
+        let actions
+        if (event.event === "added") actions = threadMessage.assignAction(event.data)
+        if (event.event === "removed") actions = threadMessage.filterAction(event.data)
+        const newMessage = threadMessage.clone({ actions })
+        const newMessages = threadMessages.map((msg) =>
+          msg.timetoken === newMessage.timetoken ? newMessage : msg
+        )
+        callback(newMessages)
+      },
+    }
+    const { chat } = threadMessages[0]
+    const removeListener = chat.addListener(listener)
+    const subscriptions = threadMessages
+      .filter((m1, i) => threadMessages.findIndex((m2) => m1.channelId === m2.channelId) === i)
+      .map((message) => chat.subscribe(message.channelId))
+
+    return () => {
+      removeListener()
+      subscriptions.map((unsub) => unsub())
+    }
+  }
+
   async pinToParentChannel() {
     const parentChannel = await this.chat.getChannel(this.parentChannelId)
     if (!parentChannel) {

From 00be2fb6c666cfb8193c9078fe677159d43375e3 Mon Sep 17 00:00:00 2001
From: PubNub Release Bot
 <120067856+pubnub-release-bot@users.noreply.github.com>
Date: Tue, 16 Jan 2024 15:30:50 +0000
Subject: [PATCH 2/2] PubNub SDK v0.5.2 release.

---
 .pubnub.yml      | 7 ++++++-
 lib/package.json | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.pubnub.yml b/.pubnub.yml
index 04939f3d..53c99545 100644
--- a/.pubnub.yml
+++ b/.pubnub.yml
@@ -1,11 +1,16 @@
 ---
 name: pubnub-js-chat
-version: v0.5.1
+version: v0.5.2
 scm: github.com/pubnub/js-chat
 schema: 1
 files:
   - lib/dist/index.js
 changelog:
+  - date: 2024-01-16
+    version: v0.5.2
+    changes:
+      - type: feature
+        text: "Make ThreadMessage.streamUpdatesOn return ThreadMessage[] instead of Message[]."
   - date: 2023-12-18
     version: v0.5.1
     changes:
diff --git a/lib/package.json b/lib/package.json
index 424455e0..7685062b 100644
--- a/lib/package.json
+++ b/lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pubnub/chat",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "PubNub JavaScript Chat SDK",
   "author": "PubNub <support@pubnub.com>",
   "license": "SEE LICENSE IN LICENSE",