@amityco/ts-sdk-react-native 6.32.6-35556b2.0 → 6.32.7-289cad7.0

package/dist/marker/events/onUserFeedMarkerUpdated.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"onUserFeedMarkerUpdated.d.ts","sourceRoot":"","sources":["../../../src/marker/events/onUserFeedMarkerUpdated.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,uBAAuB,aACxB,MAAM,QAAQ,CAAC,MAAM,UAAU,CAAC,KACzC,MAAM,YAeR,CAAC"}
+{"version":3,"file":"onUserFeedMarkerUpdated.d.ts","sourceRoot":"","sources":["../../../src/marker/events/onUserFeedMarkerUpdated.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,uBAAuB,aACxB,MAAM,QAAQ,CAAC,MAAM,UAAU,CAAC,KACzC,MAAM,YAiBR,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amityco/ts-sdk-react-native",
-  "version": "6.32.6-35556b2.0",
+  "version": "6.32.7-289cad7.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

@@ -16,7 +16,8 @@ declare global {
       | 'onChannelMemberRoleRemoved';
 
     const enum ChannelActionType {
-      OnResolve = 'onResolve',
+      OnResolveChannel = 'onResolveChannel',
+      OnResolveUnread = 'OnResolveUnread',
       OnFetch = 'onFetch',
       OnCreate = 'onCreate',
       OnUpdate = 'onUpdate',

package/src/channelRepository/api/getChannel.ts

@@ -8,7 +8,7 @@ import { checkIfShouldGoesToTombstone } from '~/cache/utils';
 import { pushToTombstone } from '~/cache/api/pushToTombstone';
 
 import { prepareChannelPayload } from '../utils';
-import { prepareUnreadCountInfo } from '../utils/prepateUnreadCountInfo';
+import { prepareUnreadCountInfo } from '../utils/prepareUnreadCountInfo';
 import { constructChannelDynamicValue } from '../utils/constructChannelDynamicValue';
 
 /**

package/src/channelRepository/api/getChannelByIds.ts

@@ -7,7 +7,7 @@ import { checkIfShouldGoesToTombstone } from '~/cache/utils';
 import { pushToTombstone } from '~/cache/api/pushToTombstone';
 import { prepareChannelPayload } from '../utils';
 import { fireEvent } from '~/core/events';
-import { prepareUnreadCountInfo } from '../utils/prepateUnreadCountInfo';
+import { prepareUnreadCountInfo } from '../utils/prepareUnreadCountInfo';
 import { LinkedObject } from '~/utils/linkedObject';
 import { constructChannelDynamicValue } from '../utils/constructChannelDynamicValue';
 

package/src/channelRepository/observers/getChannels/ChannelLiveCollectionController.ts

@@ -51,7 +51,7 @@ import { PaginationController } from '~/core/liveCollection/PaginationController
 import { onSubChannelCreated } from '~/subChannelRepository';
 
 import ObjectResolverEngine from '~/client/utils/ObjectResolver/objectResolverEngine';
-import { prepareUnreadCountInfo } from '~/channelRepository/utils/prepateUnreadCountInfo';
+import { prepareUnreadCountInfo } from '~/channelRepository/utils/prepareUnreadCountInfo';
 import { resolveUnreadInfoOnChannelEvent } from '~/channelRepository/utils/resolveUnreadInfoOnChannelEvent';
 import { onChannelResolved } from '~/channelRepository/events/onChannelResolved';
 import { onUserMessageFeedMarkerResolved } from '~/marker/events/onUserMessageFeedMarkerResolved';
@@ -250,18 +250,31 @@ export class ChannelLiveCollectionController extends LiveCollectionController<
         fn: convertEventPayload(
           (callback: Amity.Listener<Amity.InternalMessage>) => {
             return onMessageCreatedMqtt(message => {
-              const cacheData = pullFromCache<Amity.Channel>([
+              const objectResolverEngine = ObjectResolverEngine.getInstance();
+
+              const cachedSubChannelUnread = pullFromCache<Amity.SubChannelUnreadInfo>([
+                'subChannelUnreadInfo',
+                'get',
+                message.subChannelId,
+              ])?.data;
+
+              if (!cachedSubChannelUnread)
+                objectResolverEngine.resolve(
+                  message.subChannelId,
+                  Amity.ReferenceType.USER_MESSAGE_FEED_MARKER,
+                );
+
+              const channelCache = pullFromCache<Amity.Channel>([
                 'channel',
                 'get',
                 message.channelId,
               ])?.data;
 
-              if (!cacheData) {
-                const objectResolverEngine = ObjectResolverEngine.getInstance();
+              if (!channelCache) {
                 // channelId from message event payload is channelInternalId
                 objectResolverEngine.resolve(message.channelId, Amity.ReferenceType.CHANNEL);
               } else {
-                updateChannelCache(cacheData, {
+                updateChannelCache(channelCache, {
                   lastActivity: message.createdAt,
                 });
 
@@ -304,7 +317,9 @@ export class ChannelLiveCollectionController extends LiveCollectionController<
       {
         fn: (callback: Amity.Listener<Amity.StaticInternalChannel>) => {
           return onChannelJoined(channel => {
-            resolveUnreadInfoOnChannelEvent(channel, callback);
+            resolveUnreadInfoOnChannelEvent(channel);
+
+            callback(channel);
           });
         },
         action: Amity.ChannelActionType.OnJoin,
@@ -526,22 +541,22 @@ export class ChannelLiveCollectionController extends LiveCollectionController<
       },
       {
         fn: onChannelResolved,
-        action: Amity.ChannelActionType.OnResolve,
+        action: Amity.ChannelActionType.OnResolveChannel,
       },
       {
         fn: (callback: Amity.Listener<Amity.StaticInternalChannel[]>) => {
           const handleUserFeedMarkerResolved = async (
-            marker: Amity.UserMessageFeedMarkerPayload,
+            marker: Amity.Events['local.userMessageFeedMarkers.resolved'],
           ) => {
             if (marker.feedMarkers) {
-              const channelIds = [
-                ...new Set(marker.feedMarkers.map(feedMarker => feedMarker.entityId)),
-              ];
-
-              const channels = channelIds
+              const channels = marker.feedMarkers
                 .map(
-                  channelId =>
-                    pullFromCache<Amity.StaticInternalChannel>(['channel', 'get', channelId])?.data,
+                  feedMarker =>
+                    pullFromCache<Amity.StaticInternalChannel>([
+                      'channel',
+                      'get',
+                      feedMarker.entityId,
+                    ])?.data,
                 )
                 .filter(Boolean) as Amity.StaticInternalChannel[];
 
@@ -550,7 +565,7 @@ export class ChannelLiveCollectionController extends LiveCollectionController<
           };
           return onUserMessageFeedMarkerResolved(handleUserFeedMarkerResolved);
         },
-        action: Amity.ChannelActionType.OnResolve,
+        action: Amity.ChannelActionType.OnResolveUnread,
       },
       {
         fn: convertEventPayload(onChannelUnreadUpdatedLocal, 'channelId', 'channel'),
@@ -564,7 +579,8 @@ export class ChannelLiveCollectionController extends LiveCollectionController<
         {
           fn: (callback: Amity.Listener<Amity.StaticInternalChannel>) => {
             return onChannelCreated(channel => {
-              resolveUnreadInfoOnChannelEvent(channel, callback);
+              resolveUnreadInfoOnChannelEvent(channel);
+              callback(channel);
             });
           },
           action: Amity.ChannelActionType.OnCreate,

package/src/channelRepository/observers/getChannels/ChannelQueryStreamController.ts

@@ -76,7 +76,7 @@ export class ChannelQueryStreamController extends QueryStreamController<
         [
           Amity.ChannelActionType.OnCreate,
           Amity.ChannelActionType.OnJoin,
-          Amity.ChannelActionType.OnResolve,
+          Amity.ChannelActionType.OnResolveChannel,
         ].includes(action)
       ) {
         if (Array.isArray(payload)) {

package/src/channelRepository/utils/resolveUnreadInfoOnChannelEvent.ts

@@ -1,15 +1,12 @@
 import { getActiveClient } from '~/client/api/activeClient';
 import ObjectResolverEngine from '~/client/utils/ObjectResolver/objectResolverEngine';
 
-export const resolveUnreadInfoOnChannelEvent = (
-  channel: Amity.StaticInternalChannel,
-  callback: Amity.Listener<Amity.StaticInternalChannel>,
-) => {
+export const resolveUnreadInfoOnChannelEvent = (channel: Amity.StaticInternalChannel) => {
   const client = getActiveClient();
 
   if (client.isUnreadCountEnabled && client.getMarkerSyncConsistentMode()) {
     const objectResolverEngine = ObjectResolverEngine.getInstance();
 
     objectResolverEngine.resolve(channel.channelId, Amity.ReferenceType.USER_MESSAGE_FEED_MARKER);
-  } else callback(channel);
+  }
 };

package/src/marker/events/onUserFeedMarkerUpdated.ts

@@ -23,6 +23,8 @@ export const onUserFeedMarkerUpdated = (
   const client = getActiveClient();
 
   const filter = (payload: Amity.Events['marker.userFeed-updated']) => {
+    persistUnreadCountInfo(payload);
+
     payload.feedMarkers.forEach(feedMarker => {
       callback(feedMarker);
     });

package/dist/channelRepository/utils/prepateUnreadCountInfo.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"prepateUnreadCountInfo.d.ts","sourceRoot":"","sources":["../../../src/channelRepository/utils/prepateUnreadCountInfo.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,sBAAsB,eAAsB,MAAM,cAAc,kBAgB5E,CAAC"}