@amityco/ts-sdk 7.1.1-ce25d503.0 → 7.1.1-dbdbe662.0

package/dist/messageRepository/events/onMessageCreated.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"onMessageCreated.d.ts","sourceRoot":"","sources":["../../../src/messageRepository/events/onMessageCreated.ts"],"names":[],"mappings":"AAUA;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,oBAAoB,aACrB,MAAM,QAAQ,CAAC,MAAM,eAAe,CAAC,KAC9C,MAAM,YAmER,CAAC;AAEF,eAAO,MAAM,qBAAqB,aACtB,MAAM,QAAQ,CAAC,MAAM,eAAe,CAAC,KAC9C,MAAM,YAoBR,CAAC"}
+{"version":3,"file":"onMessageCreated.d.ts","sourceRoot":"","sources":["../../../src/messageRepository/events/onMessageCreated.ts"],"names":[],"mappings":"AAUA;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,oBAAoB,aACrB,MAAM,QAAQ,CAAC,MAAM,eAAe,CAAC,KAC9C,MAAM,YA0ER,CAAC;AAEF,eAAO,MAAM,qBAAqB,aACtB,MAAM,QAAQ,CAAC,MAAM,eAAe,CAAC,KAC9C,MAAM,YAoBR,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amityco/ts-sdk",
-  "version": "7.1.1-ce25d503.0",
+  "version": "7.1.1-dbdbe662.0",
   "license": "CC-BY-ND-4.0",
   "author": "amity.co <developers@amity.co> (https://amity.co)",
   "description": "Amity Social Cloud Typescript SDK",

package/src/@types/domains/channel.ts

@@ -145,9 +145,9 @@ declare global {
       channelId: Amity.Channel['channelId'];
       unreadCount: number;
       isMentioned: boolean;
-      readToSegment: number;
+      readToSegment: number | null;
       lastSegment: number;
-      lastMentionSegment: number;
+      lastMentionSegment: number | null;
       isDeleted: boolean;
     };
   }

package/src/channelRepository/utils/prepareChannelPayload.ts

@@ -58,21 +58,30 @@ const updateChannelUnread = ({
 }) => {
   for (let i = 0; i < channels.length; i += 1) {
     const cacheKey = ['channelUnread', 'get', channels[i].channelId];
-    const { readToSegment, lastMentionedSegment } = channelUsers.find(
+    const channelUser = channelUsers.find(
       channelUser =>
         channelUser.channelId === channels[i].channelId && channelUser.userId === currentUserId,
-    ) || {
-      readToSegment: 0,
-      lastMentionedSegment: 0,
-    };
+    );
+
+    let unreadCount = 0;
+    let readToSegment = null;
+    let lastMentionedSegment = null;
+    let isMentioned = false;
+
+    if (channelUser) {
+      readToSegment = channelUser.readToSegment;
+      lastMentionedSegment = channelUser.lastMentionedSegment;
+      unreadCount = Math.max(channels[i].messageCount - readToSegment, 0);
+      isMentioned = lastMentionedSegment > readToSegment;
+    }
 
     pushToCache(cacheKey, {
       channelId: channels[i].channelId,
       lastSegment: channels[i].messageCount,
       readToSegment,
       lastMentionedSegment,
-      unreadCount: Math.max(channels[i].messageCount - readToSegment, 0),
-      isMentioned: lastMentionedSegment > readToSegment,
+      unreadCount,
+      isMentioned,
       isDeleted: channels[i].isDeleted,
     });
   }

package/src/client/utils/ReadReceiptSync/readReceiptSyncEngine.ts

@@ -158,7 +158,11 @@ export class MessageReadReceiptSyncEngine {
     const cacheKey = ['channelUnread', 'get', channelId];
     const channelUnread = pullFromCache<Amity.ChannelUnread>(cacheKey)?.data;
 
-    if (channelUnread && segment > channelUnread.readToSegment) {
+    if (
+      typeof channelUnread?.readToSegment === 'number' &&
+      channelUnread &&
+      segment > channelUnread.readToSegment
+    ) {
       channelUnread.readToSegment = segment;
       channelUnread.unreadCount = Math.max(channelUnread.lastSegment - segment, 0);
 

package/src/messageRepository/events/onMessageCreated.ts

@@ -48,7 +48,14 @@ export const onMessageCreatedMqtt = (
           'get',
           message.channelId,
         ])?.data;
-        if (!channelUnread || channelUnread.lastSegment >= message.segment) return;
+
+        if (
+          !channelUnread ||
+          channelUnread.lastSegment >= message.segment ||
+          typeof channelUnread.readToSegment !== 'number' ||
+          typeof channelUnread.lastMentionSegment !== 'number'
+        )
+          return;
 
         const lastSegment = message.segment;
         const isMentionedInMessage = message.mentionedUsers?.some(mention => {