@amityco/ts-sdk-react-native 6.35.2-412ed8b.0 → 6.35.2

package/dist/messagePreview/utils/updateMessagePreviewFromMessage.d.ts

@@ -1,3 +1,5 @@
+export declare const handleMessageCreatedOnSubChannel: (message: Amity.InternalMessage) => Promise<void>;
+export declare const handleMessageUpdatedOnSubChannel: (message: Amity.InternalMessage) => Promise<void>;
 export declare const handleMessageCreated: (message: Amity.InternalMessage) => Promise<void>;
 export declare const handleMessageUpdated: (message: Amity.InternalMessage) => Promise<void>;
 export declare const handleSubChannelUpdated: (subChannel: Amity.SubChannel) => Promise<void>;

package/dist/messagePreview/utils/updateMessagePreviewFromMessage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"updateMessagePreviewFromMessage.d.ts","sourceRoot":"","sources":["../../../src/messagePreview/utils/updateMessagePreviewFromMessage.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,oBAAoB,YAAmB,MAAM,eAAe,kBA2FxE,CAAC;AAEF,eAAO,MAAM,oBAAoB,YAAmB,MAAM,eAAe,kBA8FxE,CAAC;AAEF,eAAO,MAAM,uBAAuB,eAAsB,MAAM,UAAU,kBAgDzE,CAAC"}
+{"version":3,"file":"updateMessagePreviewFromMessage.d.ts","sourceRoot":"","sources":["../../../src/messagePreview/utils/updateMessagePreviewFromMessage.ts"],"names":[],"mappings":"AA+CA,eAAO,MAAM,gCAAgC,YAAmB,MAAM,eAAe,kBAyDpF,CAAC;AAEF,eAAO,MAAM,gCAAgC,YAAmB,MAAM,eAAe,kBAyCpF,CAAC;AAEF,eAAO,MAAM,oBAAoB,YAAmB,MAAM,eAAe,kBAgCxE,CAAC;AAEF,eAAO,MAAM,oBAAoB,YAAmB,MAAM,eAAe,kBA4CxE,CAAC;AAEF,eAAO,MAAM,uBAAuB,eAAsB,MAAM,UAAU,kBAgDzE,CAAC"}

package/dist/subChannelRepository/observers/getSubChannel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getSubChannel.d.ts","sourceRoot":"","sources":["../../../src/subChannelRepository/observers/getSubChannel.ts"],"names":[],"mappings":"AA2BA;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,aAAa,iBACV,MAAM,UAAU,CAAC,cAAc,CAAC,YACpC,MAAM,kBAAkB,CAAC,MAAM,UAAU,CAAC,KACnD,MAAM,YAoLR,CAAC"}
+{"version":3,"file":"getSubChannel.d.ts","sourceRoot":"","sources":["../../../src/subChannelRepository/observers/getSubChannel.ts"],"names":[],"mappings":"AA2BA;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,aAAa,iBACV,MAAM,UAAU,CAAC,cAAc,CAAC,YACpC,MAAM,kBAAkB,CAAC,MAAM,UAAU,CAAC,KACnD,MAAM,YA2IR,CAAC"}

package/dist/subChannelRepository/observers/getSubChannels/SubChannelLiveCollectionController.d.ts

@@ -10,5 +10,6 @@ export declare class SubChannelLiveCollectionController extends LiveCollectionCo
     startSubscription(): Amity.Unsubscriber[];
     notifyChange({ origin, loading, error }: Amity.LiveCollectionNotifyParams): void;
     applyFilter(data: Amity.SubChannel[]): Amity.SubChannel[];
+    isRelatedCollection(subChannelId: string): boolean | undefined;
 }
 //# sourceMappingURL=SubChannelLiveCollectionController.d.ts.map

package/dist/subChannelRepository/observers/getSubChannels/SubChannelLiveCollectionController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SubChannelLiveCollectionController.d.ts","sourceRoot":"","sources":["../../../../src/subChannelRepository/observers/getSubChannels/SubChannelLiveCollectionController.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,wBAAwB,EAAE,MAAM,gDAAgD,CAAC;AAE1F,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AA6BlF,qBAAa,kCAAmC,SAAQ,wBAAwB,CAC9E,YAAY,EACZ,KAAK,CAAC,wBAAwB,EAC9B,KAAK,CAAC,UAAU,EAChB,8BAA8B,CAC/B;IACC,OAAO,CAAC,qBAAqB,CAAkC;IAE/D,OAAO,CAAC,KAAK,CAAiC;gBAG5C,KAAK,EAAE,KAAK,CAAC,wBAAwB,EACrC,QAAQ,EAAE,KAAK,CAAC,sBAAsB,CAAC,KAAK,CAAC,UAAU,CAAC;IAmB1D,SAAS,CAAC,KAAK;cASC,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,iBAAiB,GAAG,KAAK,CAAC,UAAU;IAIjF,SAAS,CAAC,kBAAkB,CAAC,EAC3B,QAAQ,EACR,SAAS,EACT,OAAO,GACR,EAAE,KAAK,CAAC,sCAAsC,CAAC,YAAY,CAAC;IAI7D,iBAAiB;IAyNjB,YAAY,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC,0BAA0B;IAuBzE,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,UAAU,EAAE;CAWrC"}
+{"version":3,"file":"SubChannelLiveCollectionController.d.ts","sourceRoot":"","sources":["../../../../src/subChannelRepository/observers/getSubChannels/SubChannelLiveCollectionController.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,wBAAwB,EAAE,MAAM,gDAAgD,CAAC;AAE1F,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AA6BlF,qBAAa,kCAAmC,SAAQ,wBAAwB,CAC9E,YAAY,EACZ,KAAK,CAAC,wBAAwB,EAC9B,KAAK,CAAC,UAAU,EAChB,8BAA8B,CAC/B;IACC,OAAO,CAAC,qBAAqB,CAAkC;IAE/D,OAAO,CAAC,KAAK,CAAiC;gBAG5C,KAAK,EAAE,KAAK,CAAC,wBAAwB,EACrC,QAAQ,EAAE,KAAK,CAAC,sBAAsB,CAAC,KAAK,CAAC,UAAU,CAAC;IAmB1D,SAAS,CAAC,KAAK;cASC,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,iBAAiB,GAAG,KAAK,CAAC,UAAU;IAIjF,SAAS,CAAC,kBAAkB,CAAC,EAC3B,QAAQ,EACR,SAAS,EACT,OAAO,GACR,EAAE,KAAK,CAAC,sCAAsC,CAAC,YAAY,CAAC;IAI7D,iBAAiB;IAmJjB,YAAY,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC,0BAA0B;IAuBzE,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,UAAU,EAAE;IAYpC,mBAAmB,CAAC,YAAY,EAAE,MAAM;CAIzC"}

package/dist/utils/dateTime.d.ts

@@ -0,0 +1,2 @@
+export declare const convertDateStringToTimestamp: (dateString: string) => number;
+//# sourceMappingURL=dateTime.d.ts.map

package/dist/utils/dateTime.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dateTime.d.ts","sourceRoot":"","sources":["../../src/utils/dateTime.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,4BAA4B,eAAgB,MAAM,WAE9D,CAAC"}

package/package.json

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

package/src/messagePreview/utils/updateMessagePreviewFromMessage.ts

@@ -1,7 +1,53 @@
 import { pullFromCache, pushToCache } from '~/cache/api';
 import { updateSubChannelCache } from '../../subChannelRepository/utils/updateSubChannelCache';
+import { getSubChannel } from '~/subChannelRepository/api/getSubChannel';
+import { getActiveClient } from '~/client/api/activeClient';
+import { convertDateStringToTimestamp } from '~/utils/dateTime';
+
+const getMessagePreviewSetting = async () => {
+  const client = getActiveClient();
+  return client.getMessagePreviewSetting(false);
+};
+
+const getSubChannelCache = async (subChannelId: string): Promise<Amity.SubChannel> => {
+  let subChannelCache = pullFromCache<Amity.SubChannel>(['subChannel', 'get', subChannelId])?.data;
+
+  if (!subChannelCache) {
+    subChannelCache = (await getSubChannel(subChannelId)).data;
+  }
+
+  return subChannelCache;
+};
+
+const isLastestMessageOnSubchannel = (message: Amity.InternalMessage) => {
+  const cache = pullFromCache<Amity.InternalMessagePreview>([
+    'messagePreviewSubChannel',
+    'get',
+    message.subChannelId,
+  ])?.data;
+  // The message payload from optimistic created event has no segment, so we check createdAt instead.
+  return (
+    !cache ||
+    cache.segment <= message.channelSegment ||
+    convertDateStringToTimestamp(cache.createdAt) <= convertDateStringToTimestamp(message.createdAt)
+  );
+};
+
+const isLastestMessageOnChannel = (message: Amity.InternalMessage) => {
+  const cache = pullFromCache<Amity.InternalMessagePreview>([
+    'messagePreviewChannel',
+    'get',
+    message.channelId,
+  ])?.data;
+  return (
+    !cache ||
+    convertDateStringToTimestamp(cache.createdAt) <= convertDateStringToTimestamp(message.createdAt)
+  );
+};
+
+export const handleMessageCreatedOnSubChannel = async (message: Amity.InternalMessage) => {
+  const messagePreviewSetting = await getMessagePreviewSetting();
 
-export const handleMessageCreated = async (message: Amity.InternalMessage) => {
   const {
     channelId,
     messageId: messagePreviewId,
@@ -15,69 +61,76 @@ export const handleMessageCreated = async (message: Amity.InternalMessage) => {
     isDeleted,
   } = message;
 
-  /**
-   * SubChannel Case
-   *
-   */
+  // 1. get subChannel from cache, if not exist fetch from server
+  const subChannelCache = await getSubChannelCache(subChannelId);
 
-  const messagePreviewSubChannelCache = pullFromCache<Amity.InternalMessagePreview>([
-    'messagePreviewSubChannel',
-    'get',
-    message.subChannelId,
-  ])?.data;
+  // 2. if messagePreviewSetting is NO_MESSAGE_PREVEIW, update only lastActiviy in subChannel cache
+  if (messagePreviewSetting === Amity.MessagePreviewSetting.NO_MESSAGE_PREVIEW) {
+    // 2.1 if the message is the latest message, update lastActivity to be createdAt in subChannel cache
+    if (
+      convertDateStringToTimestamp(subChannelCache.lastActivity) <
+      convertDateStringToTimestamp(createdAt)
+    )
+      updateSubChannelCache(message.subChannelId, subChannelCache as Amity.SubChannel, {
+        lastActivity: createdAt,
+      });
 
-  if (
-    !messagePreviewSubChannelCache ||
-    messagePreviewSubChannelCache.segment <= message.channelSegment
-  ) {
-    const subChannelCache = pullFromCache<Amity.SubChannel>([
-      'subChannel',
-      'get',
-      subChannelId,
-    ])?.data;
+    return;
+  }
 
-    pushToCache(['messagePreviewSubChannel', 'get', message.subChannelId], {
-      channelId,
-      creatorId,
-      messagePreviewId,
-      createdAt,
-      updatedAt,
-      subChannelId,
-      data,
-      dataType,
-      segment,
-      isDeleted,
-      subChannelUpdatedAt: subChannelCache?.updatedAt!,
-      subChannelName: subChannelCache?.displayName,
-    } as Amity.InternalMessagePreview);
+  // 3. if messagePreviewSetting is `NOT` NO_MESSAGE_PREVEIW, update messagePreviewSubChannel and subChannel cache
+  // 3.1 check if the message is the latest message, if not ignore the message.
+  if (!isLastestMessageOnSubchannel(message)) return;
 
-    updateSubChannelCache(message.subChannelId, subChannelCache!, {
-      messagePreviewId,
-    });
-  }
+  // 3.2 if the message is the latest message, update messagePreviewSubChannel and subChannel cache
+  pushToCache(['messagePreviewSubChannel', 'get', message.subChannelId], {
+    channelId,
+    creatorId,
+    messagePreviewId,
+    createdAt,
+    updatedAt,
+    subChannelId,
+    data,
+    dataType,
+    segment,
+    isDeleted,
+    subChannelUpdatedAt: subChannelCache?.updatedAt!,
+    subChannelName: subChannelCache?.displayName,
+  } as Amity.InternalMessagePreview);
 
-  /**
-   * Channel Case
-   */
+  updateSubChannelCache(message.subChannelId, subChannelCache as Amity.SubChannel, {
+    lastActivity: createdAt,
+    messagePreviewId,
+  });
+};
 
-  const messagePreviewChannelCache = pullFromCache<Amity.InternalMessagePreview>([
-    'messagePreviewChannel',
+export const handleMessageUpdatedOnSubChannel = async (message: Amity.InternalMessage) => {
+  const {
+    channelId,
+    messageId: messagePreviewId,
+    creatorId,
+    createdAt,
+    updatedAt,
+    data,
+    dataType,
+    subChannelId,
+    channelSegment: segment,
+    isDeleted,
+  } = message;
+
+  const messagePreviewSubChannelCache = pullFromCache<Amity.InternalMessagePreview>([
+    'messagePreviewSubChannel',
     'get',
-    message.channelId,
+    message.subChannelId,
   ])?.data;
 
+  // if messagePreviewSubChannel is not exist, ignore the message.
   if (
-    !messagePreviewChannelCache ||
-    new Date(messagePreviewChannelCache.createdAt).valueOf() <=
-      new Date(message.createdAt).valueOf()
+    messagePreviewSubChannelCache &&
+    messagePreviewSubChannelCache.messagePreviewId === message.messageId
   ) {
-    const subChannelCache = pullFromCache<Amity.SubChannel>([
-      'subChannel',
-      'get',
-      subChannelId,
-    ])?.data;
-
-    pushToCache(['messagePreviewChannel', 'get', message.channelId], {
+    const subChannelCache = await getSubChannelCache(subChannelId);
+    pushToCache(['messagePreviewSubChannel', 'get', message.subChannelId], {
       channelId,
       creatorId,
       messagePreviewId,
@@ -88,13 +141,13 @@ export const handleMessageCreated = async (message: Amity.InternalMessage) => {
       dataType,
       segment,
       isDeleted,
-      subChannelUpdatedAt: subChannelCache?.updatedAt!,
-      subChannelName: subChannelCache?.displayName,
+      subChannelUpdatedAt: subChannelCache.updatedAt,
+      subChannelName: messagePreviewSubChannelCache.subChannelName,
     } as Amity.InternalMessagePreview);
   }
 };
 
-export const handleMessageUpdated = async (message: Amity.InternalMessage) => {
+export const handleMessageCreated = async (message: Amity.InternalMessage) => {
   const {
     channelId,
     messageId: messagePreviewId,
@@ -108,36 +161,10 @@ export const handleMessageUpdated = async (message: Amity.InternalMessage) => {
     isDeleted,
   } = message;
 
-  /**
-   * SubChannel Case
-   *
-   */
-
-  const messagePreviewSubChannelCache = pullFromCache<Amity.InternalMessagePreview>([
-    'messagePreviewSubChannel',
-    'get',
-    message.subChannelId,
-  ])?.data;
+  if (isLastestMessageOnChannel(message)) {
+    const subChannelCache = await getSubChannelCache(subChannelId);
 
-  if (
-    messagePreviewSubChannelCache &&
-    messagePreviewSubChannelCache.messagePreviewId === message.messageId
-  ) {
-    /**
-     * subChannelCache not have messagePreviewId so update it directly
-     * because this function allow only corresponding subChannel
-     */
-    const subChannelCache = pullFromCache<Amity.SubChannel>([
-      'subChannel',
-      'get',
-      subChannelId,
-    ])?.data;
-
-    updateSubChannelCache(message.subChannelId, subChannelCache!, {
-      messagePreviewId,
-    });
-
-    pushToCache(['messagePreviewSubChannel', 'get', message.subChannelId], {
+    pushToCache(['messagePreviewChannel', 'get', message.channelId], {
       channelId,
       creatorId,
       messagePreviewId,
@@ -148,15 +175,30 @@ export const handleMessageUpdated = async (message: Amity.InternalMessage) => {
       dataType,
       segment,
       isDeleted,
-      subChannelUpdatedAt: message?.updatedAt!,
+      subChannelUpdatedAt: subChannelCache?.updatedAt!,
       subChannelName: subChannelCache?.displayName,
     } as Amity.InternalMessagePreview);
   }
+};
 
+export const handleMessageUpdated = async (message: Amity.InternalMessage) => {
   /**
    * Channel Case
    */
 
+  const {
+    channelId,
+    messageId: messagePreviewId,
+    creatorId,
+    createdAt,
+    updatedAt,
+    data,
+    dataType,
+    subChannelId,
+    channelSegment: segment,
+    isDeleted,
+  } = message;
+
   const messagePreviewChannelCache = pullFromCache<Amity.InternalMessagePreview>([
     'messagePreviewChannel',
     'get',
@@ -167,12 +209,7 @@ export const handleMessageUpdated = async (message: Amity.InternalMessage) => {
     messagePreviewChannelCache &&
     messagePreviewChannelCache.messagePreviewId === message.messageId
   ) {
-    const subChannelCache = pullFromCache<Amity.SubChannel>([
-      'subChannel',
-      'get',
-      subChannelId,
-    ])?.data;
-
+    const subChannelCache = await getSubChannelCache(subChannelId);
     pushToCache(['messagePreviewChannel', 'get', message.channelId], {
       channelId,
       creatorId,
@@ -184,8 +221,8 @@ export const handleMessageUpdated = async (message: Amity.InternalMessage) => {
       dataType,
       segment,
       isDeleted,
-      subChannelUpdatedAt: subChannelCache?.updatedAt!,
-      subChannelName: subChannelCache?.displayName,
+      subChannelUpdatedAt: subChannelCache.updatedAt,
+      subChannelName: messagePreviewChannelCache.subChannelName,
     } as Amity.InternalMessagePreview);
   }
 };

package/src/subChannelRepository/observers/getSubChannel.ts

@@ -12,8 +12,8 @@ import {
   onMessageUpdated,
 } from '~/messageRepository';
 import {
-  handleMessageCreated,
-  handleMessageUpdated,
+  handleMessageCreatedOnSubChannel,
+  handleMessageUpdatedOnSubChannel,
   handleSubChannelUpdated,
 } from '../../messagePreview/utils/updateMessagePreviewFromMessage';
 import { getActiveClient } from '~/client';
@@ -117,28 +117,9 @@ export const getSubChannel = (
       },
       convertEventPayload(
         (callback: Amity.Listener<Amity.InternalMessage>) => {
-          const updateMessagePreview = async (message: Amity.InternalMessage) => {
-            const messagePreviewSetting = await client.getMessagePreviewSetting(false);
-            if (messagePreviewSetting === Amity.MessagePreviewSetting.NO_MESSAGE_PREVIEW) return;
-
-            await handleMessageCreated(message);
-
-            if (message.subChannelId !== subChannelId) return;
-
-            const subChannel = pullFromCache<Amity.SubChannel>([
-              'subChannel',
-              'get',
-              subChannelId,
-            ])?.data;
-            if (!subChannel) return;
-
-            updateSubChannelCache(message.subChannelId, subChannel, {
-              messagePreviewId: message.messageId,
-            });
-          };
-
           return onMessageCreatedMqtt(async (message: Amity.InternalMessage) => {
-            await updateMessagePreview(message);
+            if (message.subChannelId !== subChannelId) return;
+            await handleMessageCreatedOnSubChannel(message);
             callback(message);
           });
         },
@@ -147,28 +128,9 @@ export const getSubChannel = (
       ),
       convertEventPayload(
         (callback: Amity.Listener<Amity.InternalMessage>) => {
-          const updateMessagePreview = async (message: Amity.InternalMessage) => {
-            const messagePreviewSetting = await client.getMessagePreviewSetting(false);
-            if (messagePreviewSetting === Amity.MessagePreviewSetting.NO_MESSAGE_PREVIEW) return;
-
-            await handleMessageCreated(message);
-
-            if (message.subChannelId !== subChannelId) return;
-
-            const subChannel = pullFromCache<Amity.SubChannel>([
-              'subChannel',
-              'get',
-              subChannelId,
-            ])?.data;
-            if (!subChannel) return;
-
-            updateSubChannelCache(message.subChannelId, subChannel, {
-              messagePreviewId: message.messageId,
-            });
-          };
-
           return onMessageCreatedLocal(async (message: Amity.InternalMessage) => {
-            await updateMessagePreview(message);
+            if (message.subChannelId !== subChannelId) return;
+            await handleMessageCreatedOnSubChannel(message);
             callback(message);
           });
         },
@@ -180,11 +142,9 @@ export const getSubChannel = (
           const updateMessagePreview = async (message: Amity.InternalMessage) => {
             const messagePreviewSetting = await client.getMessagePreviewSetting(false);
             if (messagePreviewSetting === Amity.MessagePreviewSetting.NO_MESSAGE_PREVIEW) return;
-
             if (message.subChannelId !== subChannelId) return;
 
-            handleMessageUpdated(message);
-
+            handleMessageUpdatedOnSubChannel(message);
             callback(message);
 
             // TODO: messageFeeds on onMessageUpdated event does not have messagePreviewId and it will save before that cause messagePreview
@@ -201,11 +161,10 @@ export const getSubChannel = (
             if (messagePreviewSetting === Amity.MessagePreviewSetting.NO_MESSAGE_PREVIEW) return;
 
             if (message.subChannelId !== subChannelId) return;
-
             if (
               messagePreviewSetting === Amity.MessagePreviewSetting.MESSAGE_PREVIEW_INCLUDE_DELETED
             )
-              await handleMessageUpdated(message);
+              await handleMessageUpdatedOnSubChannel(message);
 
             if (
               messagePreviewSetting ===

package/src/subChannelRepository/observers/getSubChannels/SubChannelLiveCollectionController.ts

@@ -22,14 +22,14 @@ import { getActiveClient } from '~/client';
 import {
   getSubChannelMessagePreview,
   getSubChannelMessagePreviewWithUser,
-  handleMessageCreated,
-  handleMessageUpdated,
+  handleMessageCreatedOnSubChannel,
+  handleMessageUpdatedOnSubChannel,
 } from '~/messagePreview/utils';
 import { getSubChannel } from '~/subChannelRepository/api/getSubChannel';
-import { updateSubChannelCache } from '~/subChannelRepository/utils/updateSubChannelCache';
 import { prepareSubChannelPayload } from '~/subChannelRepository/utils';
 import { onSubChannelFetched } from '~/subChannelRepository/events/onSubChannelFetched';
 import { onSubChannelUnreadUpdatedLocal } from '~/marker/events/onSubChannelUnreadUpdatedLocal';
+import { convertDateStringToTimestamp } from '~/utils/dateTime';
 
 export class SubChannelLiveCollectionController extends LiveCollectionController<
   'subChannel',
@@ -91,19 +91,18 @@ export class SubChannelLiveCollectionController extends LiveCollectionController
       {
         fn: callback => {
           return onSubChannelUpdated(async (subChannel: Amity.SubChannel) => {
-            const collection = pullFromCache<Amity.SubChannelLiveCollectionCache>(
-              this.cacheKey,
-            )?.data;
-
-            if (!collection || !collection.data.includes(subChannel.subChannelId)) return;
-
+            if (!this.isRelatedCollection(subChannel.subChannelId)) return;
             const client = getActiveClient();
-            const messagePreviewSetting = await client.getMessagePreviewSetting(false);
 
+            const messagePreviewSetting = await client.getMessagePreviewSetting(false);
             if (messagePreviewSetting !== Amity.MessagePreviewSetting.NO_MESSAGE_PREVIEW) {
               const messagePreview = getSubChannelMessagePreview(subChannel.subChannelId);
 
-              if (messagePreview?.subChannelId === subChannel.subChannelId) {
+              if (
+                messagePreview?.subChannelId === subChannel.subChannelId &&
+                convertDateStringToTimestamp(subChannel.updatedAt!) >
+                  convertDateStringToTimestamp(messagePreview.subChannelUpdatedAt)
+              ) {
                 pushToCache(['messagePreviewSubChannel', 'get', subChannel.subChannelId], {
                   ...messagePreview,
                   subChannelName: subChannel.displayName,
@@ -118,98 +117,33 @@ export class SubChannelLiveCollectionController extends LiveCollectionController
         action: 'onUpdate',
       },
       {
-        fn: callback => {
-          const updateMessagePreview = async (message: Amity.InternalMessage) => {
-            const client = getActiveClient();
-            const messagePreviewSetting = await client.getMessagePreviewSetting(false);
-
-            if (messagePreviewSetting === Amity.MessagePreviewSetting.NO_MESSAGE_PREVIEW) return;
-
-            handleMessageCreated(message);
-          };
-          return onMessageCreatedMqtt(async message => {
-            const cacheData = pullFromCache<Amity.SubChannel>([
-              'subChannel',
-              'get',
-              message.subChannelId,
-            ]);
-
-            if (!cacheData) return;
-
-            const collection = pullFromCache<Amity.SubChannelLiveCollectionCache>(
-              this.cacheKey,
-            )?.data;
-
-            if (!collection || !collection.data.includes(message.subChannelId)) return;
-
-            await updateMessagePreview(message);
-
-            const subChannelCache = pullFromCache<Amity.SubChannel>([
-              'subChannel',
-              'get',
-              message.subChannelId,
-            ])?.data;
-            if (!subChannelCache) return;
-
-            updateSubChannelCache(message.subChannelId, subChannelCache, {
-              lastActivity: message.createdAt,
-              messagePreviewId: message.messageId,
-            });
-
-            callback({
-              ...cacheData.data,
-              messagePreviewId: message.messageId,
-              subChannelId: message.subChannelId,
-              lastActivity: message.createdAt,
+        fn: convertEventPayload(
+          (callback: Amity.Listener<Amity.InternalMessage>) => {
+            return onMessageCreatedMqtt(async message => {
+              if (!this.isRelatedCollection(message.subChannelId)) return;
+              //  Update related cache including message preview and subChannel cache (lastActivity, messagePreviewId)
+              await handleMessageCreatedOnSubChannel(message);
+              callback(message);
             });
-          });
-        },
+          },
+          'subChannelId',
+          'subChannel',
+        ),
         action: 'onUpdate',
       },
       {
-        fn: callback => {
-          return onMessageCreatedLocal(async message => {
-            const cacheData = pullFromCache<Amity.SubChannel>([
-              'subChannel',
-              'get',
-              message.subChannelId,
-            ]);
-
-            if (!cacheData) return;
-
-            const collection = pullFromCache<Amity.SubChannelLiveCollectionCache>(
-              this.cacheKey,
-            )?.data;
-
-            if (!collection || !collection.data.includes(message.subChannelId)) return;
-
-            const client = getActiveClient();
-            const messagePreviewSetting = await client.getMessagePreviewSetting(false);
-
-            if (messagePreviewSetting === Amity.MessagePreviewSetting.NO_MESSAGE_PREVIEW) return;
-
-            handleMessageCreated(message);
-
-            const subChannelCache = pullFromCache<Amity.SubChannel>([
-              'subChannel',
-              'get',
-              message.subChannelId,
-            ])?.data;
-            if (!subChannelCache) return;
-
-            updateSubChannelCache(message.subChannelId, subChannelCache, {
-              lastActivity: message.createdAt,
-              messagePreviewId: message.messageId,
-            });
-
-            callback({
-              ...cacheData.data,
-              messagePreviewId: message.messageId,
-              subChannelId: message.subChannelId,
-              lastActivity: message.createdAt,
+        fn: convertEventPayload(
+          (callback: Amity.Listener<Amity.InternalMessage>) => {
+            return onMessageCreatedLocal(async message => {
+              if (!this.isRelatedCollection(message.subChannelId)) return;
+              //  Update related cache including message preview and subChannel cache (lastActivity, messagePreviewId)
+              await handleMessageCreatedOnSubChannel(message);
+              callback(message);
             });
-          });
-        },
+          },
+          'subChannelId',
+          'subChannel',
+        ),
         action: 'onUpdate',
       },
       {
@@ -248,7 +182,7 @@ export class SubChannelLiveCollectionController extends LiveCollectionController
 
               if (!collection || !collection.data.includes(message.subChannelId)) return;
 
-              handleMessageUpdated(message);
+              handleMessageUpdatedOnSubChannel(message);
 
               callback(message);
             };
@@ -268,11 +202,7 @@ export class SubChannelLiveCollectionController extends LiveCollectionController
 
               if (messagePreviewSetting === Amity.MessagePreviewSetting.NO_MESSAGE_PREVIEW) return;
 
-              const collection = pullFromCache<Amity.SubChannelLiveCollectionCache>(
-                this.cacheKey,
-              )?.data;
-
-              if (!collection || !collection.data.includes(message.subChannelId)) return;
+              if (!this.isRelatedCollection(message.subChannelId)) return;
 
               if (
                 messagePreviewSetting ===
@@ -280,7 +210,7 @@ export class SubChannelLiveCollectionController extends LiveCollectionController
               ) {
                 await getSubChannel(message.subChannelId);
               } else {
-                await handleMessageUpdated(message);
+                await handleMessageUpdatedOnSubChannel(message);
               }
 
               callback(message);
@@ -334,4 +264,9 @@ export class SubChannelLiveCollectionController extends LiveCollectionController
 
     return subChannels;
   }
+
+  isRelatedCollection(subChannelId: string) {
+    const collection = pullFromCache<Amity.SubChannelLiveCollectionCache>(this.cacheKey)?.data;
+    return collection && collection.data.includes(subChannelId);
+  }
 }

package/src/utils/dateTime.ts

@@ -0,0 +1,3 @@
+export const convertDateStringToTimestamp = (dateString: string) => {
+  return new Date(dateString).getTime();
+};