@amityco/ts-sdk-react-native 6.22.1-600ab29.0 → 6.22.1-b0a1854.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amityco/ts-sdk-react-native",
-  "version": "6.22.1-600ab29.0",
+  "version": "6.22.1-b0a1854.0",
   "license": "CC-BY-ND-4.0",
   "author": "amity.co <developers@amity.co> (https://amity.co)",
   "description": "Amity Social Cloud Typescript SDK",
@@ -46,12 +46,14 @@
     "@types/jest": "^27.5.1",
     "@types/node": "^18.6.4",
     "@types/object-hash": "^3.0.6",
+    "@types/react-native": "0.63.4",
     "@types/socket.io-client": "^1.4.34",
     "chalk": "^4.1.2",
     "concurrently": "^6.1.0",
     "form-data": "^4.0.0",
     "jest": "^28.1.0",
     "nock": "^13.3.0",
+    "react-native": "0.63.4",
     "react-native-web": "^0.19.8",
     "rimraf": "^3.0.2",
     "rollup": "^2.77.2",

package/rollup.config.js

@@ -87,6 +87,12 @@ export default [
       name: 'Amity',
       file: pkg.unpkg,
     },
+    external: [
+      ...Object.keys(pkg.dependencies),
+      'react-native',
+      'react-native-web',
+      '@react-native-community/netinfo',
+    ],
     plugins: [
       ...config.plugins,
       replace({

package/src/@types/core/events.ts

@@ -194,6 +194,9 @@ declare global {
         userFeedMarkers: Amity.UserFeedMarkerResponse[];
       };
 
+      'local.subChannelUnread.updated': Amity.SubChannelUnreadInfo;
+      'local.channelUnread.updated': Amity.ChannelUnreadInfo;
+
       'local.story.created': Amity.StoryPayload;
       'local.story.updated': Amity.StoryPayload;
       'local.story.deleted': Amity.StoryPayload;
@@ -206,6 +209,11 @@ declare global {
       'local.story.error': Amity.StoryPayload;
       'local.story.reload': { referenceIds: Amity.Story['referenceId'][] };
 
+      'local.post.updated': Amity.PostPayload;
+
+      'local.comment.created': Amity.CommentPayload;
+      'local.comment.deleted': Amity.CommentPayload;
+
       sessionStateChange: Amity.SessionStates;
       // used by accessTokenExpiryWatcher
       tokenExpired: Amity.SessionStates.TOKEN_EXPIRED;

package/src/@types/domains/channel.ts

@@ -99,6 +99,7 @@ declare global {
        * @deprecated Please use `isMentioned` instead.
        */
       hasMentioned: boolean;
+      markAsRead: () => Promise<boolean>;
     };
 
     type QueryChannels = {

package/src/@types/domains/community.ts

@@ -75,6 +75,22 @@ declare global {
       };
 
     type QueryCommunities = {
+      /** @deprecated use searchCommunities instead */
+      displayName?: string;
+      membership?: 'all' | 'member' | 'notMember';
+      categoryId?: Amity.InternalCategory['categoryId'];
+      includeDeleted?: boolean;
+      tags?: Amity.Taggable['tags'];
+      sortBy?:
+        | 'firstCreated'
+        | 'lastCreated'
+        /** @deprecated sortBy displayName is not available */
+        | 'displayName';
+      page?: string;
+      limit?: number;
+    };
+
+    type SearchQueryCommunities = {
       displayName?: string;
       membership?: 'all' | 'member' | 'notMember';
       categoryId?: Amity.InternalCategory['categoryId'];
@@ -87,16 +103,40 @@ declare global {
 
     type CommunityLiveCollection = Amity.LiveCollectionParams<Omit<QueryCommunities, 'page'>>;
 
+    type SearchCommunityLiveCollection = Amity.LiveCollectionParams<
+      Omit<SearchQueryCommunities, 'page'>
+    >;
+
     type CommunityLiveCollectionCache = Amity.LiveCollectionCache<
       Amity.Community['communityId'],
       Pick<QueryCommunities, 'page'>
     >;
 
+    type SearchCommunityLiveCollectionCache = Amity.LiveCollectionCache<
+      Amity.Community['communityId'],
+      Pick<SearchQueryCommunities, 'page'>
+    >;
+
     type QueryCommunityMembers = {
       communityId: string;
       memberships?: ('banned' | 'member')[];
       roles?: string[];
-      sortBy?: 'firstCreated' | 'lastCreated';
+      sortBy?:
+        | 'firstCreated'
+        | 'lastCreated'
+        /** @deprecated sortBy displayName is not available */
+        | 'displayName';
+      /** @deprecated use searchCommunityMembers instead */
+      search?: Amity.InternalUser['displayName'] | Amity.InternalUser['userId'];
+      page?: string;
+      limit?: number;
+    };
+
+    type QuerySearchCommunityMembers = {
+      communityId: string;
+      memberships?: ('banned' | 'member')[];
+      roles?: string[];
+      sortBy?: 'firstCreated' | 'lastCreated' | 'displayName';
       search?: Amity.InternalUser['displayName'] | Amity.InternalUser['userId'];
       page?: string;
       limit?: number;
@@ -106,9 +146,18 @@ declare global {
       Omit<QueryCommunityMembers, 'page'>
     >;
 
+    type SearchCommunityMemberLiveCollection = Amity.LiveCollectionParams<
+      Omit<QuerySearchCommunityMembers, 'page'>
+    >;
+
     type CommunityMemberLiveCollectionCache = Amity.LiveCollectionCache<
       Amity.Membership<'community'>['userId'],
       Pick<QueryCommunityMembers, 'page'>
     >;
+
+    type SearchCommunityMemberLiveCollectionCache = Amity.LiveCollectionCache<
+      Amity.Community['communityId'],
+      Pick<QuerySearchCommunityMembers, 'page'>
+    >;
   }
 }

package/src/@types/domains/post.ts

@@ -5,7 +5,6 @@ export const PostContentType = Object.freeze({
   VIDEO: 'video',
   LIVESTREAM: 'liveStream',
   POLL: 'poll',
-  CUSTOM: 'custom',
 });
 
 declare global {
@@ -27,7 +26,7 @@ declare global {
       | 'onReactionAdded'
       | 'onReactionRemoved';
 
-    type InternalPost<T extends PostContentType = any> = {
+    type InternalPost<T extends PostContentType | string = any> = {
       postId: string;
       postedUserId: Amity.InternalUser['userId']; // API-FIX: it should be "userId"
       parentId: Amity.InternalPost['postId'];
@@ -60,7 +59,8 @@ declare global {
       };
     };
 
-    type Post<T extends PostContentType = any> = Amity.InternalPost<T> & Amity.PostLinkObject;
+    type Post<T extends PostContentType | string = any> = Amity.InternalPost<T> &
+      Amity.PostLinkObject;
 
     type QueryPosts = {
       targetId: string;

package/src/channelRepository/api/getChannel.ts

@@ -79,7 +79,7 @@ export const getChannel = async (
  */
 getChannel.locally = (
   channelId: Amity.Channel['channelPublicId'],
-): Amity.Cached<Amity.Channel> | undefined => {
+): Amity.Cached<Amity.InternalChannel> | undefined => {
   const client = getActiveClient();
   client.log('channel/getChannel.locally', channelId);
 

package/src/channelRepository/api/getChannelByIds.ts

@@ -8,6 +8,7 @@ import { pushToTombstone } from '~/cache/api/pushToTombstone';
 import { prepareChannelPayload } from '../utils';
 import { fireEvent } from '~/core/events';
 import { prepareUnreadCountInfo } from '../utils/prepateUnreadCountInfo';
+import { LinkedObject } from '~/utils/linkedObject';
 
 /**
  * ```js
@@ -25,7 +26,7 @@ import { prepareUnreadCountInfo } from '../utils/prepateUnreadCountInfo';
  */
 export const getChannelByIds = async (
   channelIds: Amity.Channel['channelPublicId'][],
-): Promise<Amity.Cached<Amity.InternalChannel[]>> => {
+): Promise<Amity.Cached<Amity.Channel[]>> => {
   const client = getActiveClient();
   client.log('channel/getChannelByIds', channelIds);
 
@@ -63,7 +64,7 @@ export const getChannelByIds = async (
   fireEvent('local.channel.fetched', data.channels);
 
   return {
-    data: data.channels,
+    data: data.channels.map(channel => LinkedObject.channel(channel)),
     cachedAt,
   };
 };
@@ -99,7 +100,7 @@ getChannelByIds.locally = (
   const oldest = cached.sort((a, b) => (a.cachedAt! < b.cachedAt! ? -1 : 1))?.[0];
 
   return {
-    data: channels,
+    data: channels.map(channel => LinkedObject.channel(channel)),
     cachedAt: oldest.cachedAt,
   };
 };

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/index.ts

@@ -16,3 +16,6 @@ export * from './renewal';
 export * from './markerSync';
 
 export * from './enableUnreadCount';
+
+export * from './registerPushNotification';
+export * from './unregisterPushNotification';

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/registerPushNotification.ts

@@ -0,0 +1,37 @@
+import { Platform } from 'react-native';
+import { getActiveClient } from './activeClient';
+import { getDeviceId } from '~/core/device';
+import { ASCApiError, ASCInvalidParameterError } from '~/core/errors';
+
+export const registerPushNotification = async (deviceToken: string): Promise<boolean> => {
+  const client = getActiveClient();
+
+  let platform: 'ios' | 'android';
+
+  if (Platform.OS === 'ios' || Platform.OS === 'android') {
+    platform = Platform.OS;
+  } else {
+    throw new ASCInvalidParameterError('Unsupported platform');
+  }
+
+  const deviceId = getDeviceId();
+
+  const {
+    data: { status, error },
+  } = await client.http.post<{ status: 'success' | 'error'; error?: string }>(
+    '/v1/notification',
+    {
+      userId: client.userId,
+      deviceId,
+      platform,
+      token: deviceToken,
+    },
+    { headers: { 'X-API-Key': client.apiKey } },
+  );
+
+  if (error) {
+    throw new ASCApiError(error, Amity.ServerError.BUSINESS_ERROR, Amity.ErrorLevel.ERROR);
+  }
+
+  return status === 'success';
+};

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/api/unregisterPushNotification.ts

@@ -0,0 +1,26 @@
+import { getDeviceId } from '~/core/device';
+import { getActiveClient } from './activeClient';
+import { ASCApiError } from '~/core/errors';
+
+export const unregisterPushNotification = async (): Promise<boolean> => {
+  const client = getActiveClient();
+  const deviceId = getDeviceId();
+
+  const {
+    data: { status, error },
+  } = await client.http.delete<{ status: 'success' | 'error'; error?: string }>(
+    '/v1/notification',
+    {
+      data: {
+        deviceId,
+      },
+      headers: { 'X-API-Key': client.apiKey },
+    },
+  );
+
+  if (error) {
+    throw new ASCApiError(error, Amity.ServerError.BUSINESS_ERROR, Amity.ErrorLevel.ERROR);
+  }
+
+  return status === 'success';
+};

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/client/utils/markerSyncEngine.ts

@@ -18,6 +18,7 @@ import { enableUnreadCount } from '../api/enableUnreadCount';
 
 import { onOnline } from './onOnline';
 import { onUserFeedMarkerUpdated } from '~/marker/events/onUserFeedMarkerUpdated';
+import { getActiveClient } from '~/client/api/activeClient';
 
 const SYNC_TRIGGER_INTERVAL_TIME = 2000;
 const ON_SUB_CHANNEL_DELETE_SYNC_TRIGGER_DELAY = 2000;
@@ -145,7 +146,9 @@ const registerEventListeners = () => {
 
     onMessageCreatedMqtt(message => {
       // only conversation, community and broadcast types can sync
-      if (isUnreadCountSupport(message)) events.push(Amity.MarkerSyncEvent.NEW_MESSAGE);
+      const client = getActiveClient();
+      if (isUnreadCountSupport(message) && message.creatorId !== client.userId)
+        events.push(Amity.MarkerSyncEvent.NEW_MESSAGE);
     }),
 
     onChannelCreated(() => events.push(Amity.MarkerSyncEvent.CHANNEL_CREATED)),

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: [],