@amityco/ts-sdk-react-native 6.9.1-e6a3d26.0 → 6.10.0

package/dist/utils/tests/dummy/comment.d.ts

@@ -1,5 +1,44 @@
 import { createComment } from '~/commentRepository/api';
-export declare function generateComment(params?: Partial<Amity.InternalComment>): Amity.Comment;
+export declare function generateInternalComment(params?: Partial<Amity.InternalComment>): Amity.InternalComment;
+export declare const generateComment: (params?: Partial<Amity.Comment>) => {
+    target: {
+        type: string;
+        communityId: string;
+        creatorMember: Amity.Membership<"community">;
+    };
+    commentId: string;
+    userId: string;
+    parentId?: string | undefined;
+    rootId: string;
+    childrenNumber: number;
+    children: string[];
+    segmentNumber: number;
+    editedAt: string;
+    attachments?: Amity.Attachment[] | undefined;
+    targetId: string;
+    targetType: "user" | "community" | "content";
+    referenceId: string;
+    referenceType: Amity.CommentReferenceType;
+    dataType?: any;
+    dataTypes?: any[] | undefined;
+    data?: string | Record<string, unknown> | Amity.ContentDataText | Amity.ContentDataFile | Amity.ContentDataImage | Amity.ContentDataVideo | Amity.ContentDataPoll | undefined;
+    metadata?: Record<string, any> | undefined;
+    flagCount: number;
+    hashFlag: {
+        bits: number;
+        hashes: number;
+        hash: string;
+    } | null;
+    reactionsCount: number;
+    reactions: Record<string, number>;
+    myReactions?: string[] | undefined;
+    createdAt: string;
+    updatedAt?: string | undefined;
+    deletedAt?: string | undefined;
+    isDeleted?: boolean | undefined;
+    path: string;
+    mentionees?: Amity.UserMention[] | undefined;
+};
 export declare const comment11: Amity.InternalComment;
 export declare const imageComment11: Amity.InternalComment;
 export declare const textImageComment11: Amity.InternalComment;

package/dist/utils/tests/dummy/comment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"comment.d.ts","sourceRoot":"","sources":["../../../../src/utils/tests/dummy/comment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAMxD,wBAAgB,eAAe,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,KAAK,CAAC,OAAO,CAsCtF;AAED,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,eAAmC,CAAC;AAElE,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,eASjC,CAAC;AAEH,eAAO,MAAM,kBAAkB,EAAE,KAAK,CAAC,eASrC,CAAC;AAEH,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,eAOvC,CAAC;AAEH,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,eAG5B,CAAC;AAEH,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,eAGjC,CAAC;AAEH,eAAO,MAAM,kBAAkB,EAAE,KAAK,CAAC,eAGrC,CAAC;AAEH,eAAO,MAAM,kBAAkB,EAAE,KAAK,CAAC,cAMtC,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,cAMpC,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,cAMvC,CAAC;AAEF,eAAO,MAAM,uBAAuB,EAAE,KAAK,CAAC,cAM3C,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,KAAK,CAAC,cAM7C,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,oBAU/B,CAAC;AAEF,eAAO,MAAM,+BAA+B,EAAE,KAAK,CAAC,cAMnD,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,KAAK,CAAC,cAmBzC,CAAC;AAGF,eAAO,MAAM,mBAAmB;;;;;;;;;CAO/B,CAAC;AAEF,eAAO,MAAM,oBAAoB;;;;;;;;;CAOhC,CAAC;AAEF,eAAO,MAAM,wBAAwB;;;;;;;;;CAOpC,CAAC;AAEF,eAAO,MAAM,0BAA0B;;;;;;;;;CAOtC,CAAC;AAEF,eAAO,MAAM,2BAA2B;;;;;;;;;CAOvC,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;;;;;;CAOlC,CAAC;AAGF,eAAO,MAAM,yBAAyB,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC,CAAC,CAMzE,CAAC;AAEF,eAAO,MAAM,iCAAiC,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC,CAAC,CAOjF,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC,CAAC,CAS1E,CAAC;AAEF,eAAO,MAAM,8BAA8B,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC,CAAC,CAY9E,CAAC;AAEF,eAAO,MAAM,oCAAoC,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC,CAAC,CAYpF,CAAC"}
+{"version":3,"file":"comment.d.ts","sourceRoot":"","sources":["../../../../src/utils/tests/dummy/comment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAMxD,wBAAgB,uBAAuB,CACrC,MAAM,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,GACtC,KAAK,CAAC,eAAe,CA+BvB;AAED,eAAO,MAAM,eAAe,YAAa,QAAQ,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAU9D,CAAC;AAEF,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,eAAmC,CAAC;AAElE,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,eASjC,CAAC;AAEH,eAAO,MAAM,kBAAkB,EAAE,KAAK,CAAC,eASrC,CAAC;AAEH,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,eAOvC,CAAC;AAEH,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,eAG5B,CAAC;AAEH,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,eAGjC,CAAC;AAEH,eAAO,MAAM,kBAAkB,EAAE,KAAK,CAAC,eAGrC,CAAC;AAEH,eAAO,MAAM,kBAAkB,EAAE,KAAK,CAAC,cAMtC,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,cAMpC,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,cAMvC,CAAC;AAEF,eAAO,MAAM,uBAAuB,EAAE,KAAK,CAAC,cAM3C,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,KAAK,CAAC,cAM7C,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,oBAU/B,CAAC;AAEF,eAAO,MAAM,+BAA+B,EAAE,KAAK,CAAC,cAMnD,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,KAAK,CAAC,cAmBzC,CAAC;AAGF,eAAO,MAAM,mBAAmB;;;;;;;;;CAO/B,CAAC;AAEF,eAAO,MAAM,oBAAoB;;;;;;;;;CAOhC,CAAC;AAEF,eAAO,MAAM,wBAAwB;;;;;;;;;CAOpC,CAAC;AAEF,eAAO,MAAM,0BAA0B;;;;;;;;;CAOtC,CAAC;AAEF,eAAO,MAAM,2BAA2B;;;;;;;;;CAOvC,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;;;;;;CAOlC,CAAC;AAGF,eAAO,MAAM,yBAAyB,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC,CAAC,CAMzE,CAAC;AAEF,eAAO,MAAM,iCAAiC,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC,CAAC,CAOjF,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC,CAAC,CAS1E,CAAC;AAEF,eAAO,MAAM,8BAA8B,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC,CAAC,CAY9E,CAAC;AAEF,eAAO,MAAM,oCAAoC,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC,CAAC,CAYpF,CAAC"}

package/package.json

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

package/src/channelRepsitory/observers/getChannels.ts

@@ -1,6 +1,6 @@
 /* eslint-disable no-use-before-define */
 import { getResolver } from '~/core/model';
-import { dropFromCache, pullFromCache, pushToCache } from '~/cache/api';
+import { dropFromCache, pullFromCache, pushToCache, upsertInCache } from '~/cache/api';
 import { getActiveClient } from '~/client/api';
 import {
   createQuery,
@@ -21,6 +21,8 @@ import {
 } from '~/utils/constants';
 import { CACHE_SHORTEN_LIFESPAN } from '~/cache/utils';
 import { convertEventPayload } from '~/utils/event';
+import { uuid } from '~/core/uuid';
+import { onMessageCreated } from '../../messageRepository/events/onMessageCreated';
 import {
   onChannelCreated,
   onChannelDeleted,
@@ -32,7 +34,6 @@ import {
   onChannelUpdated,
 } from '../events';
 import { queryChannels } from '../api/queryChannels';
-import { uuid } from '~/core/uuid';
 
 /* begin_public_function
   id: channel.query
@@ -186,6 +187,20 @@ export const getChannels = (
   };
 
   disposers.push(
+    onMessageCreated(message => {
+      const cacheData = pullFromCache<Amity.Channel>(['channel', 'get', message.channelId]);
+
+      if (!cacheData) return;
+
+      const channelData = {
+        ...cacheData.data,
+        lastActivity: message.createdAt,
+      };
+
+      upsertInCache(['channel', 'get', message.channelId], channelData);
+
+      realtimeRouter('onUpdate')(channelData);
+    }),
     onChannelCreated(realtimeRouter('onCreate')),
     onChannelDeleted(realtimeRouter('onDelete')),
     onChannelUpdated(realtimeRouter('onUpdate')),

package/src/client/api/logout.ts

@@ -22,11 +22,13 @@ export const logout = async (): Promise<boolean> => {
 
   client.log('client/api/disconnectClient');
 
-  await new Promise(resolve => {
-    client.ws.once('disconnect', resolve);
-    client.ws.disconnect();
+  if (client.mqtt.connected) {
     client.mqtt.disconnect();
-  });
+  }
+
+  if (client.ws.connected) {
+    client.ws.disconnect();
+  }
 
   /*
    * for cases when session state is terminated (example on ban) or token expired,
@@ -61,6 +63,6 @@ export const logout = async (): Promise<boolean> => {
     client.cache = { data: {} };
   }
 
-  return !client.ws.connected;
+  return true;
 };
 /* end_public_function */

package/src/commentRepository/events/onCommentCreated.ts

@@ -8,13 +8,12 @@ import { createCommentEventSubscriber } from './utils';
  * })
  * ```
  *
- * Fired when a {@link Amity.InternalComment} has been created
+ * Fired when a {@link Amity.Comment} has been created
  *
  * @param callback The function to call when the event was fired
  * @returns an {@link Amity.Unsubscriber} function to stop listening
  *
- * @category InternalComment Events
+ * @category Comment Events
  */
-export const onCommentCreated = (
-  callback: Amity.Listener<Amity.InternalComment>,
-): Amity.Unsubscriber => createCommentEventSubscriber('comment.created', callback);
+export const onCommentCreated = (callback: Amity.Listener<Amity.Comment>): Amity.Unsubscriber =>
+  createCommentEventSubscriber('comment.created', callback);

package/src/commentRepository/events/onCommentDeleted.ts

@@ -8,13 +8,12 @@ import { createCommentEventSubscriber } from './utils';
  * })
  * ```
  *
- * Fired when a {@link Amity.InternalComment} has been deleted
+ * Fired when a {@link Amity.Comment} has been deleted
  *
  * @param callback The function to call when the event was fired
  * @returns an {@link Amity.Unsubscriber} function to stop listening
  *
- * @category InternalComment Events
+ * @category Comment Events
  */
-export const onCommentDeleted = (
-  callback: Amity.Listener<Amity.InternalComment>,
-): Amity.Unsubscriber => createCommentEventSubscriber('comment.deleted', callback);
+export const onCommentDeleted = (callback: Amity.Listener<Amity.Comment>): Amity.Unsubscriber =>
+  createCommentEventSubscriber('comment.deleted', callback);

package/src/commentRepository/events/onCommentFlagged.ts

@@ -8,13 +8,12 @@ import { createCommentEventSubscriber } from './utils';
  * })
  * ```
  *
- * Fired when a {@link Amity.InternalComment} has been flagged
+ * Fired when a {@link Amity.Comment} has been flagged
  *
  * @param callback The function to call when the event was fired
  * @returns an {@link Amity.Unsubscriber} function to stop listening
  *
- * @category InternalComment Events
+ * @category Comment Events
  */
-export const onCommentFlagged = (
-  callback: Amity.Listener<Amity.InternalComment>,
-): Amity.Unsubscriber => createCommentEventSubscriber('comment.flagged', callback);
+export const onCommentFlagged = (callback: Amity.Listener<Amity.Comment>): Amity.Unsubscriber =>
+  createCommentEventSubscriber('comment.flagged', callback);

package/src/commentRepository/events/onCommentReactionAdded.ts

@@ -3,6 +3,7 @@ import { pullFromCache } from '~/cache/api';
 import { ingestInCache } from '~/cache/api/ingestInCache';
 import { createEventSubscriber } from '~/core/events';
 import { prepareReactionPayloadFormEvent } from '~/reactionRepository/utils';
+import { LinkedObject } from '~/utils/linkedObject';
 
 /**
  * ```js
@@ -12,21 +13,21 @@ import { prepareReactionPayloadFormEvent } from '~/reactionRepository/utils';
  * })
  * ```
  *
- * Fired when a {@link Amity.InternalComment} has been reacted
+ * Fired when a {@link Amity.Comment} has been reacted
  *
  * @param callback The function to call when the event was fired
  * @returns an {@link Amity.Unsubscriber} function to stop listening
  *
- * @category InternalComment Events
+ * @category Comment Events
  */
 export const onCommentReactionAdded = (
-  callback: Amity.Listener<Amity.InternalComment>,
+  callback: Amity.Listener<Amity.Comment>,
 ): Amity.Unsubscriber => {
   const client = getActiveClient();
 
   const filter = (payload: Amity.CommentPayload & { reactor: Amity.Reactor }) => {
     if (!client.cache) {
-      callback(payload.comments[0]);
+      callback(LinkedObject.comment(payload.comments[0]));
     } else {
       const processed = prepareReactionPayloadFormEvent('comment.addReaction', payload);
       const { reactor, ...commentPayload } = processed;
@@ -39,7 +40,7 @@ export const onCommentReactionAdded = (
         payload.comments[0].commentId,
       ])!;
 
-      callback(comment.data);
+      callback(LinkedObject.comment(comment.data));
     }
   };
 

package/src/commentRepository/events/onCommentReactionRemoved.ts

@@ -3,6 +3,7 @@ import { pullFromCache } from '~/cache/api';
 import { ingestInCache } from '~/cache/api/ingestInCache';
 import { createEventSubscriber } from '~/core/events';
 import { prepareReactionPayloadFormEvent } from '~/reactionRepository/utils';
+import { LinkedObject } from '~/utils/linkedObject';
 
 /**
  * ```js
@@ -12,21 +13,21 @@ import { prepareReactionPayloadFormEvent } from '~/reactionRepository/utils';
  * })
  * ```
  *
- * Fired when a reaction has been removed from a {@link Amity.InternalComment}
+ * Fired when a reaction has been removed from a {@link Amity.Comment}
  *
  * @param callback The function to call when the event was fired
  * @returns an {@link Amity.Unsubscriber} function to stop listening
  *
- * @category InternalComment Events
+ * @category Comment Events
  */
 export const onCommentReactionRemoved = (
-  callback: Amity.Listener<Amity.InternalComment>,
+  callback: Amity.Listener<Amity.Comment>,
 ): Amity.Unsubscriber => {
   const client = getActiveClient();
 
   const filter = (payload: Amity.CommentPayload & { reactor: Amity.Reactor }) => {
     if (!client.cache) {
-      callback(payload.comments[0]);
+      callback(LinkedObject.comment(payload.comments[0]));
     } else {
       const processed = prepareReactionPayloadFormEvent('comment.removeReaction', payload);
       const { reactor, ...commentPayload } = processed;
@@ -39,7 +40,7 @@ export const onCommentReactionRemoved = (
         payload.comments[0].commentId,
       ])!;
 
-      callback(comment.data);
+      callback(LinkedObject.comment(comment.data));
     }
   };
 

package/src/commentRepository/events/onCommentUnflagged.ts

@@ -8,13 +8,12 @@ import { createCommentEventSubscriber } from './utils';
  * })
  * ```
  *
- * Fired when a flag has been removed from a {@link Amity.InternalComment}
+ * Fired when a flag has been removed from a {@link Amity.Comment}
  *
  * @param callback The function to call when the event was fired
  * @returns an {@link Amity.Unsubscriber} function to stop listening
  *
- * @category InternalComment Events
+ * @category Comment Events
  */
-export const onCommentUnflagged = (
-  callback: Amity.Listener<Amity.InternalComment>,
-): Amity.Unsubscriber => createCommentEventSubscriber('comment.unflagged', callback);
+export const onCommentUnflagged = (callback: Amity.Listener<Amity.Comment>): Amity.Unsubscriber =>
+  createCommentEventSubscriber('comment.unflagged', callback);

package/src/commentRepository/events/onCommentUpdated.ts

@@ -8,13 +8,12 @@ import { createCommentEventSubscriber } from './utils';
  * })
  * ```
  *
- * Fired when a {@link Amity.InternalComment} has been updated
+ * Fired when a {@link Amity.Comment} has been updated
  *
  * @param callback The function to call when the event was fired
  * @returns an {@link Amity.Unsubscriber} function to stop listening
  *
- * @category InternalComment Events
+ * @category Comment Events
  */
-export const onCommentUpdated = (
-  callback: Amity.Listener<Amity.InternalComment>,
-): Amity.Unsubscriber => createCommentEventSubscriber('comment.updated', callback);
+export const onCommentUpdated = (callback: Amity.Listener<Amity.Comment>): Amity.Unsubscriber =>
+  createCommentEventSubscriber('comment.updated', callback);

package/src/commentRepository/events/utils.ts

@@ -2,17 +2,18 @@ import { getActiveClient } from '~/client/api';
 import { createEventSubscriber } from '~/core/events';
 import { pullFromCache, queryCache, upsertInCache } from '~/cache/api';
 import { ingestInCache } from '~/cache/api/ingestInCache';
+import { LinkedObject } from '~/utils/linkedObject';
 
 export const createCommentEventSubscriber = (
   event: keyof Amity.MqttCommentEvents,
-  callback: Amity.Listener<Amity.InternalComment>,
+  callback: Amity.Listener<Amity.Comment>,
 ) => {
   const client = getActiveClient();
 
   const filter = (payload: Amity.CommentPayload) => {
     if (!client.cache) {
       // TODO: here we are missing specific properties here!
-      callback(payload.comments[0]);
+      callback(LinkedObject.comment(payload.comments[0]));
     } else {
       ingestInCache(payload);
 
@@ -30,7 +31,7 @@ export const createCommentEventSubscriber = (
         queries?.map(({ key, data }) => upsertInCache(key, data as any, { cachedAt: -1 }));
       }
 
-      callback(comment.data);
+      callback(LinkedObject.comment(comment.data));
     }
   };
 

package/src/commentRepository/observers/getComment.ts

@@ -23,7 +23,7 @@ import {
  * });
  * ```
  *
- * Observe all mutation on a given {@link Amity.InternalComment}
+ * Observe all mutation on a given {@link Amity.Comment}
  *
  * @param commentId the ID of the comment to observe
  * @param callback the function to call when new data are available
@@ -33,7 +33,7 @@ import {
  */
 export const getComment = (
   commentId: Amity.InternalComment['commentId'],
-  callback: Amity.LiveObjectCallback<Amity.InternalComment>,
+  callback: Amity.LiveObjectCallback<Amity.Comment>,
 ): Amity.Unsubscriber => {
   return liveObject(commentId, callback, 'commentId', _getComment, [
     onCommentDeleted,

package/src/commentRepository/observers/getComments.ts

@@ -76,7 +76,11 @@ export const getComments = (
   const cacheKey = [
     'comment',
     'collection',
-    { referenceId: params.referenceType, referenceType: params.referenceId },
+    {
+      referenceId: params.referenceType,
+      referenceType: params.referenceId,
+      parentId: params?.parentId || '',
+    },
   ];
 
   const responder = (data: Amity.CommentLiveCollectionCache) => {

package/src/commentRepository/observers/tests/getComment.test.ts

@@ -1,10 +1,13 @@
 import { disableCache, enableCache } from '~/cache/api';
 import {
   client,
+  communityUser11,
   connectClient,
   disconnectClient,
   generateComment,
+  generateInternalComment,
   pause,
+  user11,
   user12,
 } from '~/utils/tests';
 import { getFutureDate } from '~/core/model';
@@ -12,8 +15,13 @@ import { getFutureDate } from '~/core/model';
 import { getComment } from '../getComment';
 
 describe('getComment', () => {
-  const comment = generateComment();
-  const response = { data: { comments: [comment] } };
+  const response = {
+    data: {
+      comments: [generateInternalComment()],
+      communityUsers: [communityUser11],
+      users: [user11],
+    },
+  };
 
   beforeAll(async () => {
     await connectClient();
@@ -24,7 +32,6 @@ describe('getComment', () => {
   });
 
   beforeEach(enableCache);
-
   afterEach(disableCache);
 
   const events: [string, keyof Amity.MqttCommentEvents][] = [
@@ -35,16 +42,14 @@ describe('getComment', () => {
   ];
 
   test.each(events)('%s', async (test, event) => {
-    const update = {
-      ...comment,
+    const update = generateComment({
       data: { text: 'new-text' },
-      updatedAt: getFutureDate(comment.updatedAt),
-    };
+    });
 
     const callback = jest.fn();
     client.http.get = jest.fn().mockResolvedValue(response);
 
-    getComment(comment.commentId, callback);
+    getComment(update.commentId, callback);
     await pause();
 
     client.emitter.emit(event, {
@@ -71,13 +76,12 @@ describe('getComment', () => {
     ['should get update on comment.addReaction event', 'comment.addReaction'],
     ['should get update on comment.removeReaction event', 'comment.removeReaction'],
   ] as [string, keyof Amity.MqttCommentEvents][])('%s', async (test, event) => {
-    const update = {
-      ...comment,
+    const update = generateComment({
       data: { text: 'new-text' },
-      updatedAt: getFutureDate(comment.updatedAt),
-    };
+    });
+
     const reactor: Amity.Reactor = {
-      createdAt: getFutureDate(comment.updatedAt),
+      createdAt: getFutureDate(update.updatedAt),
       reactionId: 'like',
       reactionName: 'like',
       userId: user12.userId,
@@ -85,7 +89,7 @@ describe('getComment', () => {
     const callback = jest.fn();
     client.http.get = jest.fn().mockResolvedValue(response);
 
-    getComment(comment.commentId, callback);
+    getComment(update.commentId, callback);
     await pause();
 
     client.emitter.emit(event, {

package/src/core/device.ts

@@ -13,7 +13,8 @@ type CrossTabResponse = {
 
 let tabIndex = 0;
 
-if (typeof BroadcastChannel !== 'undefined') {
+// This logic is running on browser only
+if (typeof BroadcastChannel !== 'undefined' && typeof window !== 'undefined') {
   const tabId = uuid();
   const openedTabs: { [key: CrossTabResponse['tabId']]: CrossTabResponse['tabIndex'] } = {};
   const internalBroadcast = new BroadcastChannel('amity_ts_sdk');

package/src/core/events.ts

@@ -94,7 +94,12 @@ export const createEventSubscriber = <T extends keyof Amity.Events>(
 
   const handler = (...payload: Parameters<typeof fn>) => {
     log(`${namespace}(tmpid: ${timestamp}) > trigger`, payload);
-    fn(...payload);
+
+    try {
+      fn(...payload);
+    } catch (e) {
+      log(`${namespace}(tmpid: ${timestamp}) > error`, e);
+    }
   };
 
   emitter.on(event, handler);

package/src/core/query/filtering.ts

@@ -180,29 +180,36 @@ export const filterByPostDataTypes = <T extends Amity.Post>(
   collection: T[],
   dataTypes: Amity.PostLiveCollection['dataTypes'],
 ): T[] => {
-  const filteredPosts: T[] = [];
+  const postIds: T['postId'][] = [];
 
-  collection.forEach(c => {
-    /*
-     * A text post with no children is just a text post
-     */
-    if (c.dataType === 'text' && !c.children.length) return;
+  return collection.reduce((acc: T[], post: T) => {
+    // A text post with no children is just a text post
+    if (post.dataType === 'text' && !post.children.length) return acc;
 
-    if (c.children.length) {
-      const childPost = pullFromCache<Amity.Post>(['post', 'get', c.children[0]])?.data;
+    // Skip if post is already in the collection
+    if (postIds.includes(post.postId)) return acc;
 
-      if (childPost && dataTypes?.includes(childPost?.dataType)) {
-        // @ts-ignore
-        filteredPosts.push(childPost);
-      }
-
-      return;
+    // Check dataType for current post
+    if (dataTypes?.includes(post.dataType)) {
+      acc.push(post);
     }
 
-    if (dataTypes?.includes(c.dataType)) filteredPosts.push(c);
-  });
+    // Check dataType for child post. this function will return all child posts in a same level of parent post (flatten)
+    if (!post.children.length) return acc;
+
+    const childPost = pullFromCache<Amity.Post>(['post', 'get', post.children[0]])?.data;
+    if (!childPost) return acc;
+    // Prevent to insert a duplicate record
+    if (postIds.includes(childPost.postId)) return acc;
+    if (dataTypes?.includes(childPost?.dataType)) return acc;
+
+    postIds.push(childPost.postId);
+
+    // @ts-ignore
+    acc.push(childPost);
 
-  return filteredPosts;
+    return acc;
+  }, []);
 };
 
 /**

package/src/utils/tests/dummy/comment.ts

@@ -1,10 +1,12 @@
 import { createComment } from '~/commentRepository/api';
-import { communityUser11 } from '~/utils/tests';
+import { community11, communityUser11 } from '~/utils/tests';
 import { file11 } from './file';
 import { post11 } from './post';
 import { user11, user12 } from './user';
 
-export function generateComment(params?: Partial<Amity.InternalComment>): Amity.Comment {
+export function generateInternalComment(
+  params?: Partial<Amity.InternalComment>,
+): Amity.InternalComment {
   return {
     path: '',
     referenceType: 'post',
@@ -20,9 +22,9 @@ export function generateComment(params?: Partial<Amity.InternalComment>): Amity.
     updatedAt: '2022-10-31T05:57:45.670Z',
     createdAt: '2022-10-31T05:57:45.661Z',
     segmentNumber: 2,
-    commentId: 'comment11',
-    userId: 'test',
-    referenceId: 'postId11',
+    commentId: 'comment11', // comment11._id
+    userId: 'test', // user11._id
+    referenceId: post11.postId,
     flagCount: 0,
     hashFlag: null,
     children: [],
@@ -31,18 +33,23 @@ export function generateComment(params?: Partial<Amity.InternalComment>): Amity.
     myReactions: [],
     reactionsCount: 0,
     attachments: [],
-    targetId: 'test',
+    targetId: 'community11', // community11._id
     targetType: 'community',
     ...params,
+  };
+}
 
-    // Link Object Section
+export const generateComment = (params?: Partial<Amity.Comment>) => {
+  const basedComment = generateInternalComment(params);
+  return {
+    ...basedComment,
     target: {
       type: 'community',
-      communityId: 'test',
+      communityId: 'community11', // community11._id
       creatorMember: communityUser11 as Amity.Membership<'community'>,
     },
   };
-}
+};
 
 export const comment11: Amity.InternalComment = generateComment();