@amityco/ts-sdk 7.1.1-279cf96.0 → 7.1.1-295c780.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amityco/ts-sdk",
-  "version": "7.1.1-279cf96.0",
+  "version": "7.1.1-295c780.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

@@ -147,7 +147,7 @@ declare global {
       isMentioned: boolean;
       readToSegment: number | null;
       lastSegment: number;
-      lastMentionSegment: number | null;
+      lastMentionedSegment: number | null;
       isDeleted: boolean;
     };
   }

package/src/channelRepository/utils/prepareChannelPayload.ts

@@ -75,15 +75,17 @@ const updateChannelUnread = ({
       isMentioned = lastMentionedSegment > readToSegment;
     }
 
-    pushToCache(cacheKey, {
+    const cacheChannelUnread: Amity.ChannelUnread = {
       channelId: channels[i].channelId,
       lastSegment: channels[i].messageCount,
       readToSegment,
       lastMentionedSegment,
       unreadCount,
       isMentioned,
-      isDeleted: channels[i].isDeleted,
-    });
+      isDeleted: channels[i].isDeleted || false,
+    };
+
+    pushToCache(cacheKey, cacheChannelUnread);
   }
 };
 

package/src/commentRepository/events/utils.ts

@@ -53,6 +53,36 @@ export const createCommentEventSubscriber = (
               }
             }
           }
+        }
+
+        if (['comment.deleted'].includes(event)) {
+          // NOTE: skip deleting comment to parent comment children if it's the same user since we use the local event to update instead.
+          if (event === 'comment.deleted' && comment.data.userId === client.userId) return;
+
+          if (comments[0].parentId) {
+            const parentComment = pullFromCache<Amity.InternalComment>([
+              'comment',
+              'get',
+              comments[0].parentId,
+            ]);
+
+            if (parentComment?.data) {
+              // Remove deleted comment in parent childComment if still exists
+              if (parentComment.data.children.includes(comments[0].commentId)) {
+                const newParentComment = {
+                  ...parentComment.data,
+                  childrenNumber: parentComment.data.childrenNumber - 1,
+                  children: [
+                    ...new Set([
+                      ...parentComment.data.children.filter(id => id !== comments[0].commentId),
+                    ]),
+                  ],
+                };
+
+                pushToCache(['comment', 'get', comments[0].parentId], newParentComment);
+              }
+            }
+          }
 
           const queries = queryCache<Amity.InternalComment[]>(['comment', 'query'])?.filter(
             ({ key }) => (key[2] as Amity.QueryComments)?.referenceId === comment.data.referenceId,
@@ -135,6 +165,49 @@ export const createLocalCommentEventSubscriber = (
           queries?.map(({ key, data }) => upsertInCache(key, data as any, { cachedAt: -1 }));
         }
 
+        if (['local.comment.deleted'].includes(event)) {
+          if (comments[0].parentId) {
+            const parentComment = pullFromCache<Amity.InternalComment>([
+              'comment',
+              'get',
+              comments[0].parentId,
+            ]);
+
+            if (parentComment?.data) {
+              // Remove deleted comment in parent childComment if still exists
+              if (parentComment.data.children.includes(comments[0].commentId)) {
+                const newParentComment = {
+                  ...parentComment.data,
+                  childrenNumber: parentComment.data.childrenNumber - 1,
+                  children: [
+                    ...new Set([
+                      ...parentComment.data.children.filter(id => id !== comments[0].commentId),
+                    ]),
+                  ],
+                };
+                pushToCache(['comment', 'get', comments[0].parentId], newParentComment);
+
+                setTimeout(() => {
+                  // NOTE: This is workaround solution for emitting event not work properly.
+                  fireEvent('comment.updated', {
+                    comments: [newParentComment],
+                    commentChildren: [],
+                    files: [],
+                    users: [],
+                    communityUsers: [],
+                  });
+                }, 200);
+              }
+            }
+          }
+
+          const queries = queryCache<Amity.InternalComment[]>(['comment', 'query'])?.filter(
+            ({ key }) => (key[2] as Amity.QueryComments)?.referenceId === comment.data.referenceId,
+          );
+
+          queries?.map(({ key, data }) => upsertInCache(key, data as any, { cachedAt: -1 }));
+        }
+
         callback(LinkedObject.comment(comment.data));
       }
     }

package/src/messageRepository/events/onMessageCreated.ts

@@ -53,7 +53,7 @@ export const onMessageCreatedMqtt = (
           !channelUnread ||
           channelUnread.lastSegment >= message.segment ||
           typeof channelUnread.readToSegment !== 'number' ||
-          typeof channelUnread.lastMentionSegment !== 'number'
+          typeof channelUnread.lastMentionedSegment !== 'number'
         )
           return;
 
@@ -67,16 +67,16 @@ export const onMessageCreatedMqtt = (
           );
         });
 
-        const lastMentionSegment = isMentionedInMessage
+        const lastMentionedSegment = isMentionedInMessage
           ? message.segment
-          : channelUnread.lastMentionSegment;
+          : channelUnread.lastMentionedSegment;
 
-        const updatedChannelUnread = {
+        const updatedChannelUnread: Amity.ChannelUnread = {
           ...channelUnread,
           lastSegment,
           unreadCount: Math.max(lastSegment - channelUnread.readToSegment, 0),
-          lastMentionSegment,
-          isMentioned: !(channelUnread.readToSegment >= lastMentionSegment),
+          lastMentionedSegment,
+          isMentioned: !(channelUnread.readToSegment >= lastMentionedSegment),
         };
 
         pushToCache(['channelUnread', 'get', message.channelId], updatedChannelUnread);