@amityco/ts-sdk 6.7.3-cbeeb97.0 → 6.7.3-cf5eee7.0

package/dist/messageRepository/observers/getMessages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getMessages.d.ts","sourceRoot":"","sources":["../../../src/messageRepository/observers/getMessages.ts"],"names":[],"mappings":"AA+BA;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,WAAW,WACd,MAAM,sBAAsB,YAC1B,MAAM,sBAAsB,CAAC,MAAM,OAAO,CAAC,WAC5C,MAAM,oBAAoB,KAClC,MAAM,YA+GR,CAAC"}
+{"version":3,"file":"getMessages.d.ts","sourceRoot":"","sources":["../../../src/messageRepository/observers/getMessages.ts"],"names":[],"mappings":"AAgCA;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,WAAW,WACd,MAAM,sBAAsB,YAC1B,MAAM,sBAAsB,CAAC,MAAM,OAAO,CAAC,WAC5C,MAAM,oBAAoB,KAClC,MAAM,YAwHR,CAAC"}

package/package.json

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

package/src/messageRepository/observers/getMessages.ts

@@ -4,6 +4,7 @@ import { getActiveClient } from '~/client/api';
 import { dropFromCache, pullFromCache, pushToCache } from '~/cache/api';
 import { createQuery, filterByPropEquality, queryOptions, runQuery } from '~/core/query';
 import { onMessageMarked, onMessageMarkerFetched } from '~/marker/events';
+import { uuid } from '~/core/uuid';
 
 import {
   COLLECTION_DEFAULT_CACHING_POLICY,
@@ -68,13 +69,20 @@ export const getMessages = (
   const { policy = COLLECTION_DEFAULT_CACHING_POLICY } = config ?? {};
 
   const disposers: Amity.Unsubscriber[] = [];
-  const cacheKey = ['message', 'collection', params];
+  const cacheKey = ['message', 'collection', params, uuid()];
 
   const responder = (data: Amity.MessageLiveCollectionCache) => {
     let messages: Amity.Message[] =
       data.data
         .map(messageId => pullFromCache<Amity.Message>(['message', 'get', messageId])!)
         .filter(Boolean)
+        .filter(item => {
+          if (!params.tags) return true;
+          return params.tags.find(value => {
+            if (!item.data?.tags) return false;
+            return item.data.tags.includes(value);
+          });
+        })
         .map(({ data }) => data) ?? [];
 
     /*
@@ -94,13 +102,15 @@ export const getMessages = (
     });
   };
 
-  const realtimeRouter = (_: Amity.MessageActionType) => (message: Amity.Message) => {
+  const realtimeRouter = (action: Amity.MessageActionType) => (message: Amity.Message) => {
     const collection = pullFromCache<Amity.MessageLiveCollectionCache>(cacheKey)?.data;
 
     if (params.subChannelId !== message?.subChannelId || !collection) return;
 
-    if (!collection.data.includes(message.messageId)) {
-      collection.data = [...new Set([message.messageId, ...collection.data])];
+    if (!['onFetched', 'onUpdate'].includes(action)) {
+      if (!collection.data.includes(message.messageId)) {
+        collection.data = [...new Set([message.messageId, ...collection.data])];
+      }
     }
 
     pushToCache(cacheKey, collection);