@amityco/ts-sdk-react-native 6.22.1-cbca8f1.0 → 6.23.1-d5c2fe6.0

package/src/channelRepository/api/markAsRead.ts

@@ -1,4 +1,4 @@
-import { getActiveClient } from '~/client/api';
+import { getActiveClient } from '~/client/api/activeClient';
 import { ingestInCache } from '~/cache/api/ingestInCache';
 import { convertChannelMarkerResponse, convertSubChannelMarkerResponse } from '~/utils/marker';
 import { fireEvent } from '~/core/events';
@@ -9,6 +9,8 @@ import { fireEvent } from '~/core/events';
  * const success = await ChannelRepository.markAsRead('channelId')
  * ```
  *
+ * @deprecated Please use the {@link Amity.Channel.markAsRead} method instead
+ *
  * Updating all {@link Amity.SubChannel} in specify {@link Amity.Channel} as read
  *
  * @param channelId the ID of to specify {@link Amity.Channel}
@@ -17,7 +19,9 @@ import { fireEvent } from '~/core/events';
  * @category Channel API
  * @async
  */
-export const markAsRead = async (channelId: Amity.Channel['channelId']): Promise<boolean> => {
+export const markAsRead = async (
+  channelId: Amity.Channel['channelInternalId'],
+): Promise<boolean> => {
   const client = getActiveClient();
   client.log('channel/markAsRead', channelId);
 

package/src/channelRepository/channelMembership/observers/getMembers/ChannelMemberLiveCollectionController.ts

@@ -52,7 +52,7 @@ export class ChannelMemberLiveCollectionController extends LiveCollectionControl
     );
 
     this.callback = callback.bind(this);
-    this.loadPage(true);
+    this.loadPage({ initial: true });
   }
 
   protected setup() {
@@ -104,7 +104,7 @@ export class ChannelMemberLiveCollectionController extends LiveCollectionControl
     if (!this.shouldNotify(data) && origin === 'event') return;
 
     this.callback({
-      onNextPage: () => this.loadPage(false, Amity.LiveCollectionPageDirection.NEXT),
+      onNextPage: () => this.loadPage({ direction: Amity.LiveCollectionPageDirection.NEXT }),
       data,
       hasNextPage: !!this.paginationController.getNextToken(),
       loading,

package/src/channelRepository/channelMembership/observers/getMembers/ChannelMemberQueryStreamController.ts

@@ -72,7 +72,7 @@ export class ChannelMemberQueryStreamController extends QueryStreamController<
   }
 
   reactor(action: string) {
-    return (channel: Amity.Channel, channelMember: Amity.Membership<'channel'>) => {
+    return (channel: Amity.InternalChannel, channelMember: Amity.Membership<'channel'>) => {
       if (this.query.channelId !== channelMember.channelId) return;
 
       const collection = pullFromCache<Amity.ChannelMembersLiveCollectionCache>(
@@ -99,7 +99,10 @@ export class ChannelMemberQueryStreamController extends QueryStreamController<
   subscribeRTE(
     createSubscriber: {
       fn: (
-        reactor: (channel: Amity.Channel, channelMember: Amity.Membership<'channel'>) => void,
+        reactor: (
+          channel: Amity.InternalChannel,
+          channelMember: Amity.Membership<'channel'>,
+        ) => void,
       ) => Amity.Unsubscriber;
       action: string;
     }[],

package/src/channelRepository/events/onChannelMemberRoleAdded.ts

@@ -17,7 +17,7 @@ import { createEventSubscriber } from '~/core/events';
  * @category Channel Events
  */
 export const onChannelMemberRoleAdded = (
-  callback: (channel: Amity.Channel, member: Amity.Membership<'channel'>) => void,
+  callback: (channel: Amity.InternalChannel, member: Amity.Membership<'channel'>) => void,
 ): Amity.Unsubscriber => {
   const client = getActiveClient();
 

package/src/channelRepository/events/onChannelMemberRoleRemoved.ts

@@ -20,7 +20,7 @@ import { prepareChannelPayload } from '../utils';
  * @category Channel Events
  */
 export const onChannelMemberRoleRemoved = (
-  callback: (channel: Amity.Channel, member: Amity.Membership<'channel'>) => void,
+  callback: (channel: Amity.InternalChannel, member: Amity.Membership<'channel'>) => void,
 ): Amity.Unsubscriber => {
   const client = getActiveClient();
 

package/src/channelRepository/observers/getChannel.ts

@@ -33,7 +33,8 @@ import { isEqual } from '~/utils/isEqual';
 import { updateChannelCache } from '../utils/updateChannelCache';
 import { onChannelMarkerUpdated } from '~/marker/events/onChannelMarkerUpdated';
 import { onSubChannelCreated } from '~/subChannelRepository';
-import { onUserFeedMarkerUpdated } from '~/marker/events/onUserFeedMarkerUpdated';
+import { LinkedObject } from '~/utils/linkedObject';
+import { onChannelUnreadUpdatedLocal } from '~/marker/events/onChannelUnreadUpdatedLocal';
 
 /* begin_public_function
   id: channel.get
@@ -72,7 +73,7 @@ export const getChannel = (
 
     const data = {
       ...response,
-      data: getChannelMessagePreviewWithUser(response.data),
+      data: LinkedObject.channel(getChannelMessagePreviewWithUser(response.data)),
     };
 
     const { origin, ...newSnapshot } = data;
@@ -126,7 +127,10 @@ export const getChannel = (
             callback(message);
           };
 
-          return onMessageCreatedMqtt(updateMessagePreview);
+          return onMessageCreatedMqtt(async (message: Amity.InternalMessage) => {
+            await updateMessagePreview(message);
+            callback(message);
+          });
         },
         'channelId',
         'channel',
@@ -267,7 +271,7 @@ export const getChannel = (
         'channel',
       ),
       convertEventPayload(onSubChannelCreated, 'channelId', 'channel'),
-      convertEventPayload(onUserFeedMarkerUpdated, 'entityId', 'channel'),
+      convertEventPayload(onChannelUnreadUpdatedLocal, 'channelId', 'channel'),
     ],
     {
       forceDispatch: true,

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

@@ -47,7 +47,6 @@ import { getActiveClient } from '~/client';
 import { prepareChannelPayload } from '~/channelRepository/utils';
 import { ChannelPaginationNoPageController } from './ChannelPagnationNoPageController';
 import { PaginationController } from '~/core/liveCollection/PaginationController';
-import { onUserFeedMarkerUpdated } from '~/marker/events/onUserFeedMarkerUpdated';
 import { onSubChannelCreated } from '~/subChannelRepository';
 
 import ObjectResolverEngine from '~/client/utils/ObjectResolver/objectResolverEngine';
@@ -55,6 +54,8 @@ import { prepareUnreadCountInfo } from '~/channelRepository/utils/prepateUnreadC
 import { resolveUnreadInfoOnChannelEvent } from '~/channelRepository/utils/resolveUnreadInfoOnChannelEvent';
 import { onChannelResolved } from '~/channelRepository/events/onChannelResolved';
 import { onUserMessageFeedMarkerResolved } from '~/marker/events/onUserMessageFeedMarkerResolved';
+import { LinkedObject } from '~/utils/linkedObject';
+import { onChannelUnreadUpdatedLocal } from '~/marker/events/onChannelUnreadUpdatedLocal';
 
 export class ChannelLiveCollectionController extends LiveCollectionController<
   'channel',
@@ -97,7 +98,7 @@ export class ChannelLiveCollectionController extends LiveCollectionController<
 
     this.paginationController = paginationController;
     this.callback = callback.bind(this);
-    this.loadPage(true);
+    this.loadPage({ initial: true });
   }
 
   protected setup() {
@@ -135,7 +136,8 @@ export class ChannelLiveCollectionController extends LiveCollectionController<
         .map(channelId => pullFromCache<Amity.Channel>(['channel', 'get', channelId])!)
         .filter(Boolean)
         .map(({ data }) => data)
-        .map(getChannelMessagePreviewWithUser) ?? [];
+        .map(getChannelMessagePreviewWithUser)
+        .map(LinkedObject.channel) ?? [];
 
     if (this.paginationController instanceof ChannelPaginationController) {
       data = this.applyFilter(data);
@@ -146,7 +148,7 @@ export class ChannelLiveCollectionController extends LiveCollectionController<
     this.callback({
       onNextPage:
         this.paginationController instanceof ChannelPaginationController
-          ? () => this.loadPage(false, Amity.LiveCollectionPageDirection.NEXT)
+          ? () => this.loadPage({ direction: Amity.LiveCollectionPageDirection.NEXT })
           : undefined,
       data,
       hasNextPage:
@@ -515,10 +517,6 @@ export class ChannelLiveCollectionController extends LiveCollectionController<
         ),
         action: Amity.ChannelActionType.OnUpdate,
       },
-      {
-        fn: convertEventPayload(onUserFeedMarkerUpdated, 'entityId', 'channel'),
-        action: Amity.ChannelActionType.OnUpdate,
-      },
       {
         fn: convertEventPayload(onSubChannelCreated, 'channelId', 'channel'),
         action: Amity.ChannelActionType.OnUpdate,
@@ -551,6 +549,10 @@ export class ChannelLiveCollectionController extends LiveCollectionController<
         },
         action: Amity.ChannelActionType.OnResolve,
       },
+      {
+        fn: convertEventPayload(onChannelUnreadUpdatedLocal, 'channelId', 'channel'),
+        action: Amity.ChannelActionType.OnUpdate,
+      },
     ];
 
     if (this.paginationController instanceof PaginationController) {

package/src/channelRepository/observers/observeChannel.ts

@@ -15,6 +15,7 @@ import {
   onChannelMemberAdded,
   onChannelMemberRemoved,
 } from '../events';
+import { LinkedObject } from '~/utils/linkedObject';
 
 /**
  * ```js
@@ -46,11 +47,22 @@ export const observeChannel = <Events extends [Exclude<Amity.ChannelActionType,
     // filter function
     if (result.data?.channelId !== channelId) return;
 
-    if (callback instanceof Function) return callback(result);
+    if (callback instanceof Function)
+      return callback({
+        ...result,
+        data: LinkedObject.channel(result.data),
+      });
 
-    if (action !== 'onFetch') callback.onEvent?.(action, result);
+    if (action !== 'onFetch')
+      callback.onEvent?.(action, {
+        ...result,
+        data: LinkedObject.channel(result.data),
+      });
 
-    callback[action]?.(result);
+    callback[action]?.({
+      ...result,
+      data: LinkedObject.channel(result.data),
+    });
   };
 
   const disposers: Amity.Unsubscriber[] = [];

package/src/channelRepository/observers/observeChannels.ts

@@ -12,6 +12,7 @@ import {
   onChannelMemberAdded,
   onChannelMemberRemoved,
 } from '../events';
+import { LinkedObject } from '~/utils/linkedObject';
 
 /**
  * ```js
@@ -38,11 +39,14 @@ export const observeChannels = (
 
   const disposers: Amity.Unsubscriber[] = [];
 
-  const router = (channel: Amity.Channel, action: Exclude<Amity.ChannelActionType, 'onFetch'>) => {
-    if (callback instanceof Function) return callback(channel);
+  const router = (
+    channel: Amity.InternalChannel,
+    action: Exclude<Amity.ChannelActionType, 'onFetch'>,
+  ) => {
+    if (callback instanceof Function) return callback(LinkedObject.channel(channel));
 
-    callback.onEvent?.(action, channel);
-    callback[action]?.(channel);
+    callback.onEvent?.(action, LinkedObject.channel(channel));
+    callback[action]?.(LinkedObject.channel(channel));
   };
 
   disposers.push(

package/src/client/api/logout.ts

@@ -6,7 +6,7 @@ import { setSessionState } from './setSessionState';
 */
 /**
  * ```js
- * import { disconnectClient } from '@amityco/ts-sdk-react-native'
+ * import { Client } from '@amityco/ts-sdk-react-native';
  * const success = await Client.logout()
  * ```
  *

package/src/client/api/secureLogout.ts

@@ -6,7 +6,7 @@ import { logout } from './logout';
 */
 /**
  * ```js
- * import { Client } from '@amityco/ts-sdk'
+ * import { Client } from '@amityco/ts-sdk-react-native'
  * const success = await Client.secureLogout()
  * ```
  *

package/src/client/utils/ReadReceiptSync/readReceiptSyncEngine.ts

@@ -2,6 +2,7 @@ import { pullFromCache, pushToCache, queryCache } from '~/cache/api';
 import { getActiveClient } from '../../api/activeClient';
 import { markAsReadBySegment } from '~/subChannelRepository/api/markAsReadBySegment';
 import { reCalculateChannelUnreadInfo } from '~/marker/utils/reCalculateChannelUnreadInfo';
+import { fireEvent } from '~/core/events';
 
 export class MessageReadReceiptSyncEngine {
   private client: Amity.Client;
@@ -178,10 +179,12 @@ export class MessageReadReceiptSyncEngine {
       subChannelUnreadInfo.readToSegment = segment;
       subChannelUnreadInfo.unreadCount = Math.max(subChannelUnreadInfo.lastSegment - segment, 0);
 
-      reCalculateChannelUnreadInfo(subChannelUnreadInfo.channelId);
-    }
+      const channelUnreadInfo = reCalculateChannelUnreadInfo(subChannelUnreadInfo.channelId);
+      fireEvent('local.channelUnread.updated', channelUnreadInfo);
 
-    pushToCache(cacheKey, subChannelUnreadInfo);
+      pushToCache(cacheKey, subChannelUnreadInfo);
+      fireEvent('local.subChannelUnread.updated', subChannelUnreadInfo);
+    }
 
     // Step 2: Enqueue the read receipt
     this.enqueueReadReceipt(subChannelId, segment);

package/src/commentRepository/api/createComment.ts

@@ -53,7 +53,7 @@ export const createComment = async (
   if (['post', 'content'].includes(bundle.referenceType)) {
     const post = await getPost(bundle.referenceId);
 
-    fireEvent('post.updated', {
+    fireEvent('local.post.updated', {
       posts: [post.data],
       categories: [],
       comments: [],
@@ -97,7 +97,7 @@ export const createComment = async (
     }
   }
 
-  fireEvent('comment.created', data);
+  fireEvent('local.comment.created', data);
 
   return {
     data: LinkedObject.comment(comments[0]),

package/src/commentRepository/api/deleteComment.ts

@@ -64,8 +64,7 @@ export const deleteComment = async (
   } else {
     const post = await getPost(comment.data.referenceId);
 
-    // @TODO: Need to separate Local / MQTT later
-    fireEvent('post.updated', {
+    fireEvent('local.post.updated', {
       posts: [post.data],
       categories: [],
       comments: [],
@@ -78,8 +77,7 @@ export const deleteComment = async (
     });
   }
 
-  // @TODO: Need to separate Local / MQTT later
-  fireEvent('comment.deleted', {
+  fireEvent('local.comment.deleted', {
     comments: [deleted],
     commentChildren: [],
     files: [],

package/src/commentRepository/events/utils.ts

@@ -39,11 +39,14 @@ export const createCommentEventSubscriber = (
             ]);
 
             if (parentComment?.data) {
-              pushToCache(['comment', 'get', comments[0].parentId], {
-                ...parentComment.data,
-                childrenNumber: parentComment.data.childrenNumber + 1,
-                children: [...new Set([...parentComment.data.children, comments[0].commentId])],
-              });
+              // Skip to update parent childComment if current comment already exists
+              if (!parentComment.data.children.includes(comments[0].commentId)) {
+                pushToCache(['comment', 'get', comments[0].parentId], {
+                  ...parentComment.data,
+                  childrenNumber: parentComment.data.childrenNumber + 1,
+                  children: [...new Set([...parentComment.data.children, comments[0].commentId])],
+                });
+              }
             }
           }
 

package/src/commentRepository/internalApi/createComment.ts

@@ -27,7 +27,7 @@ export const createComment = async (
 
   const post = await getPost(bundle.referenceId);
 
-  fireEvent('post.updated', {
+  fireEvent('local.post.updated', {
     posts: [post.data],
     categories: [],
     comments: [],
@@ -38,7 +38,8 @@ export const createComment = async (
     postChildren: [],
     users: [],
   });
-  fireEvent('comment.created', data);
+
+  fireEvent('local.comment.created', data);
 
   const { comments } = data;
   return {

package/src/commentRepository/internalApi/deleteComment.ts

@@ -33,7 +33,7 @@ export const deleteComment = async (
 
   const post = await getPost(comment.data.referenceId);
 
-  fireEvent('post.updated', {
+  fireEvent('local.post.updated', {
     posts: [post.data],
     categories: [],
     comments: [],
@@ -45,7 +45,7 @@ export const deleteComment = async (
     users: [],
   });
 
-  fireEvent('comment.deleted', {
+  fireEvent('local.comment.deleted', {
     comments: [deleted],
     commentChildren: [],
     files: [],

package/src/communityRepository/api/createCommunity.ts

@@ -2,7 +2,7 @@ import { getActiveClient } from '~/client/api';
 
 import { ingestInCache } from '~/cache/api/ingestInCache';
 import { fireEvent } from '~/core/events';
-
+import { saveCommunityUsers } from '~/communityRepository/utils/saveCommunityUsers';
 import { prepareCommunityPayload, prepareCommunityRequest } from '../utils';
 
 /* begin_public_function
@@ -53,7 +53,10 @@ export const createCommunity = async (
   const data = prepareCommunityPayload(payload);
 
   const cachedAt = client.cache && Date.now();
-  if (client.cache) ingestInCache(data, { cachedAt });
+  if (client.cache) {
+    ingestInCache(data, { cachedAt });
+    saveCommunityUsers(data.communities, data.communityUsers);
+  }
 
   const { communities } = data;
   return {

package/src/communityRepository/api/getCommunities.ts

@@ -3,6 +3,7 @@ import { getActiveClient } from '~/client/api';
 import { pullFromCache } from '~/cache/api';
 import { ingestInCache } from '~/cache/api/ingestInCache';
 
+import { saveCommunityUsers } from '~/communityRepository/utils/saveCommunityUsers';
 import { prepareCommunityPayload } from '../utils';
 
 /**
@@ -36,7 +37,10 @@ export const getCommunities = async (
   const data = prepareCommunityPayload(payload);
 
   const cachedAt = client.cache && Date.now();
-  if (client.cache) ingestInCache(data, { cachedAt });
+  if (client.cache) {
+    ingestInCache(data, { cachedAt });
+    saveCommunityUsers(data.communities, data.communityUsers);
+  }
 
   return {
     data: data.communities,

package/src/communityRepository/api/getCommunity.ts

@@ -3,6 +3,7 @@ import { getActiveClient } from '~/client/api';
 import { pullFromCache } from '~/cache/api';
 import { ingestInCache } from '~/cache/api/ingestInCache';
 
+import { saveCommunityUsers } from '~/communityRepository/utils/saveCommunityUsers';
 import { prepareCommunityPayload } from '../utils';
 
 /**
@@ -33,7 +34,10 @@ export const getCommunity = async (
   const data = prepareCommunityPayload(payload);
 
   const cachedAt = client.cache && Date.now();
-  if (client.cache) ingestInCache(data, { cachedAt });
+  if (client.cache) {
+    ingestInCache(data, { cachedAt });
+    saveCommunityUsers(data.communities, data.communityUsers);
+  }
 
   const { communities } = data;
 

package/src/communityRepository/api/queryCommunities.ts

@@ -1,11 +1,10 @@
 import { getActiveClient } from '~/client/api';
-
-import { toPage, toToken } from '~/core/query';
 import { pushToCache } from '~/cache/api';
 import { ingestInCache } from '~/cache/api/ingestInCache';
 import { getResolver } from '~/core/model';
 
 import { inferIsDeleted } from '~/utils/inferIsDeleted';
+import { saveCommunityUsers } from '~/communityRepository/utils/saveCommunityUsers';
 import { prepareCommunityPayload } from '../utils';
 
 /**
@@ -67,6 +66,7 @@ export const queryCommunities = async (
 
     const cacheKey = ['community', 'query', { ...params, options } as Amity.Serializable];
     pushToCache(cacheKey, { communities: communities.map(getResolver('community')), paging });
+    saveCommunityUsers(data.communities, data.communityUsers);
   }
 
   return { data: communities, cachedAt, paging };

package/src/communityRepository/api/updateCommunity.ts

@@ -3,6 +3,7 @@ import { getActiveClient } from '~/client/api';
 import { ingestInCache } from '~/cache/api/ingestInCache';
 import { fireEvent } from '~/core/events';
 
+import { saveCommunityUsers } from '~/communityRepository/utils/saveCommunityUsers';
 import { prepareCommunityPayload, prepareCommunityRequest } from '../utils';
 
 /* begin_public_function
@@ -44,7 +45,10 @@ export const updateCommunity = async (
   const data = prepareCommunityPayload(payload);
 
   const cachedAt = client.cache && Date.now();
-  if (client.cache) ingestInCache(data, { cachedAt });
+  if (client.cache) {
+    ingestInCache(data, { cachedAt });
+    saveCommunityUsers(data.communities, data.communityUsers);
+  }
 
   const { communities } = data;
 

package/src/communityRepository/communityMembership/events/utils.ts

@@ -11,7 +11,7 @@ import { isNonNullable } from '~/utils';
 function hasPermission(
   member: Amity.Membership<'community'>,
   payload: {
-    users: Amity.InternalUser[];
+    communityUsers: Amity.Membership<'community'>[];
   },
   permission: string,
 ) {
@@ -20,7 +20,7 @@ function hasPermission(
   }
 
   return payload
-    .users!.find(user => user.userId === member.userId)!
+    .communityUsers!.find(user => user.userId === member.userId)!
     .permissions.some(x => x === permission);
 }