@amityco/ts-sdk 6.17.1-e9b6af1.0 → 6.17.2-ea577e1.0

package/src/subChannelRepository/observers/getSubChannel.ts

@@ -5,7 +5,12 @@ import { getSubChannel as _getSubChannel } from '../api/getSubChannel';
 import { onSubChannelDeleted, onSubChannelUpdated } from '../events';
 import { onSubChannelFetched } from '../events/onSubChannelFetched';
 import { pullFromCache, pushToCache } from '~/cache/api';
-import { onMessageCreated, onMessageDeleted, onMessageUpdated } from '~/messageRepository';
+import {
+  onMessageCreatedLocal,
+  onMessageCreatedMqtt,
+  onMessageDeleted,
+  onMessageUpdated,
+} from '~/messageRepository';
 import {
   handleMessageCreated,
   handleMessageUpdated,
@@ -132,7 +137,35 @@ export const getSubChannel = (
 
             callback(message);
           };
-          return onMessageCreated(updateMessagePreview);
+          return onMessageCreatedMqtt(updateMessagePreview);
+        },
+        'subChannelId',
+        'subChannel',
+      ),
+      convertEventPayload(
+        (callback: Amity.Listener<Amity.Message>) => {
+          const updateMessagePreview = async (message: Amity.Message) => {
+            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,
+            });
+
+            callback(message);
+          };
+          return onMessageCreatedLocal(updateMessagePreview);
         },
         'subChannelId',
         'subChannel',

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

@@ -9,7 +9,12 @@ import {
   onSubChannelDeleted,
   onSubChannelUpdated,
 } from '~/subChannelRepository/events';
-import { onMessageCreated, onMessageUpdated, onMessageDeleted } from '~/messageRepository/events';
+import {
+  onMessageUpdated,
+  onMessageDeleted,
+  onMessageCreatedMqtt,
+  onMessageCreatedLocal,
+} from '~/messageRepository/events';
 import { onSubChannelMarkerFetched, onSubChannelMarkerUpdated } from '~/marker/events';
 import { convertEventPayload } from '~/utils/event';
 import { filterByPropEquality, sortByLastActivity } from '~/core/query';
@@ -113,7 +118,53 @@ export class SubChannelLiveCollectionController extends LiveCollectionController
       },
       {
         fn: callback => {
-          return onMessageCreated(async 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;
+
+            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,
+            });
+          });
+        },
+        action: 'onUpdate',
+      },
+      {
+        fn: callback => {
+          return onMessageCreatedLocal(async message => {
             const cacheData = pullFromCache<Amity.SubChannel>([
               'subChannel',
               'get',