@amityco/ts-sdk 0.0.1-beta.43.1 → 0.0.1-beta.45.0

package/dist/message/api/queryMessages.d.ts

@@ -12,21 +12,5 @@
  * @category Message API
  * @async
  */
-export declare const queryMessages: {
-    (query: Amity.QueryMessages): Promise<Amity.Cached<Amity.Paged<Amity.Message, Amity.Page<string>>>>;
-    /**
-     * ```js
-     * import { queryMessages } from '@amityco/ts-sdk'
-     * const messages = queryMessages.locally!({ channelId })
-     * ```
-     *
-     * Queries a paginable list of {@link Amity.Message} objects from cache
-     *
-     * @param query The query parameters
-     * @returns A page of {@link Amity.Message} objects
-     *
-     * @category Message API
-     */
-    locally(query: Parameters<typeof queryMessages>[0]): Amity.Cached<Amity.Paged<Amity.Message, Amity.Page<string>>> | undefined;
-};
+export declare const queryMessages: (query: Amity.QueryMessages) => Promise<Amity.Cached<Amity.Paged<Amity.Message, Amity.Page<string>>>>;
 //# sourceMappingURL=queryMessages.d.ts.map

package/dist/message/api/queryMessages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queryMessages.d.ts","sourceRoot":"","sources":["../../../src/message/api/queryMessages.ts"],"names":[],"mappings":"AAUA;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,aAAa;YACjB,MAAM,aAAa,GACzB,QAAQ,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,MAAM,OAAO,EAAE,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAuCxE;;;;;;;;;;;;OAYG;mBAEM,WAAW,oBAAoB,CAAC,CAAC,CAAC,CAAC,GACzC,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,MAAM,OAAO,EAAE,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,SAAS;CAlB1E,CAAC"}
+{"version":3,"file":"queryMessages.d.ts","sourceRoot":"","sources":["../../../src/message/api/queryMessages.ts"],"names":[],"mappings":"AAYA;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,aAAa,UACjB,MAAM,aAAa,KACzB,QAAQ,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,MAAM,OAAO,EAAE,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CA0CtE,CAAC"}

package/dist/message/utils/prepareMessagePayload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prepareMessagePayload.d.ts","sourceRoot":"","sources":["../../../src/message/utils/prepareMessagePayload.ts"],"names":[],"mappings":"AA0BA,wBAAgB,cAAc,CAC5B,OAAO,EAAE,KAAK,CAAC,UAAU,EACzB,MAAM,CAAC,EAAE,KAAK,CAAC,aAAa,GAC3B,KAAK,CAAC,OAAO,CA8Df;AAED,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,KAAK,CAAC,OAAO,EACtB,MAAM,CAAC,EAAE,KAAK,CAAC,aAAa,GAC3B,KAAK,CAAC,OAAO,CASf;AAED,eAAO,MAAM,qBAAqB,YACvB,MAAM,cAAc,KAC5B,QAAQ,MAAM,uBAAuB,CAsBvC,CAAC;AAEF,aAAK,gBAAgB,GAAG,IAAI,CAC1B,KAAK,CAAC,aAAa,EAInB,MAAM,GAAG,QAAQ,GAAG,cAAc,GAAG,MAAM,GAAG,gBAAgB,CAC/D,GAAG;IACF,WAAW,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAC1C,SAAS,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACvC,aAAa,EAAE,KAAK,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;IACnD,OAAO,EAAE;QACP,MAAM,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACvC,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;CACH,CAAC;AAEF,wBAAgB,aAAa,CAAC,EAC5B,YAAY,EACZ,UAAU,EACV,GAAG,IAAI,EACR,EAAE,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAE9C;AAED,wBAAgB,kBAAkB,CAAC,EACjC,IAAI,EACJ,MAAM,EACN,YAAY,EACZ,IAAI,EACJ,cAAc,EACd,GAAG,IAAI,EACR,EAAE,KAAK,CAAC,aAAa,GAAG,gBAAgB,CAiBxC"}
+{"version":3,"file":"prepareMessagePayload.d.ts","sourceRoot":"","sources":["../../../src/message/utils/prepareMessagePayload.ts"],"names":[],"mappings":"AA4BA,wBAAgB,cAAc,CAC5B,OAAO,EAAE,KAAK,CAAC,UAAU,EACzB,MAAM,CAAC,EAAE,KAAK,CAAC,aAAa,GAC3B,KAAK,CAAC,OAAO,CA8Df;AAED,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,KAAK,CAAC,OAAO,EACtB,MAAM,CAAC,EAAE,KAAK,CAAC,aAAa,GAC3B,KAAK,CAAC,OAAO,CASf;AAED,eAAO,MAAM,qBAAqB,YACvB,MAAM,cAAc,KAC5B,QAAQ,MAAM,uBAAuB,CAsBvC,CAAC;AAEF,aAAK,gBAAgB,GAAG,IAAI,CAC1B,KAAK,CAAC,aAAa,EAInB,MAAM,GAAG,QAAQ,GAAG,cAAc,GAAG,MAAM,GAAG,gBAAgB,CAC/D,GAAG;IACF,WAAW,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAC1C,SAAS,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACvC,aAAa,EAAE,KAAK,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;IACnD,OAAO,EAAE;QACP,MAAM,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACvC,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;CACH,CAAC;AAEF,wBAAgB,aAAa,CAAC,EAC5B,YAAY,EACZ,UAAU,EACV,GAAG,IAAI,EACR,EAAE,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAE9C;AAED,wBAAgB,kBAAkB,CAAC,EACjC,IAAI,EACJ,MAAM,EACN,YAAY,EACZ,IAAI,EACJ,cAAc,EACd,GAAG,IAAI,EACR,EAAE,KAAK,CAAC,aAAa,GAAG,gBAAgB,CAiBxC"}

package/dist/post/api/queryPosts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queryPosts.d.ts","sourceRoot":"","sources":["../../../src/post/api/queryPosts.ts"],"names":[],"mappings":"AAYA;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,UAAU;YACd,MAAM,UAAU,GACtB,QAAQ,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,MAAM,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC;IAmDhE;;;;;;;;;;;;OAYG;mBAEM,WAAW,iBAAiB,CAAC,CAAC,CAAC,CAAC,GACtC,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,MAAM,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,GAAG,SAAS;CAlBlE,CAAC"}
+{"version":3,"file":"queryPosts.d.ts","sourceRoot":"","sources":["../../../src/post/api/queryPosts.ts"],"names":[],"mappings":"AAcA;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,UAAU;YACd,MAAM,UAAU,GACtB,QAAQ,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,MAAM,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC;IAmDhE;;;;;;;;;;;;OAYG;mBAEM,WAAW,iBAAiB,CAAC,CAAC,CAAC,CAAC,GACtC,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,MAAM,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,GAAG,SAAS;CAlBlE,CAAC"}

package/dist/post/observers/livePosts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"livePosts.d.ts","sourceRoot":"","sources":["../../../src/post/observers/livePosts.ts"],"names":[],"mappings":"AAmCA;;;;;;;;;;;;;;;;;;;GAmBG;AACH,eAAO,MAAM,SAAS,WACZ,MAAM,kBAAkB,YACtB,MAAM,sBAAsB,CAAC,MAAM,IAAI,CAAC,WACzC,MAAM,oBAAoB,KAClC,MAAM,YAgIR,CAAC"}
+{"version":3,"file":"livePosts.d.ts","sourceRoot":"","sources":["../../../src/post/observers/livePosts.ts"],"names":[],"mappings":"AAoCA;;;;;;;;;;;;;;;;;;;GAmBG;AACH,eAAO,MAAM,SAAS,WACZ,MAAM,kBAAkB,YACtB,MAAM,sBAAsB,CAAC,MAAM,IAAI,CAAC,WACzC,MAAM,oBAAoB,KAClC,MAAM,YAoIR,CAAC"}

package/dist/subChannel/api/querySubChannels.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"querySubChannels.d.ts","sourceRoot":"","sources":["../../../src/subChannel/api/querySubChannels.ts"],"names":[],"mappings":"AAWA;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,gBAAgB;YACpB,MAAM,gBAAgB,GAC5B,QAAQ,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,MAAM,UAAU,CAAC,CAAC,CAAC;IA4CvD;;;;;;;;;;;;OAYG;mBAEM,WAAW,uBAAuB,CAAC,CAAC,CAAC,CAAC,GAC5C,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,MAAM,UAAU,CAAC,CAAC,GAAG,SAAS;CAlBzD,CAAC"}
+{"version":3,"file":"querySubChannels.d.ts","sourceRoot":"","sources":["../../../src/subChannel/api/querySubChannels.ts"],"names":[],"mappings":"AAaA;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,gBAAgB;YACpB,MAAM,gBAAgB,GAC5B,QAAQ,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,MAAM,UAAU,CAAC,CAAC,CAAC;IA4CvD;;;;;;;;;;;;OAYG;mBAEM,WAAW,uBAAuB,CAAC,CAAC,CAAC,CAAC,GAC5C,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,MAAM,UAAU,CAAC,CAAC,GAAG,SAAS;CAlBzD,CAAC"}

package/dist/utils/inferIsDeleted.d.ts

@@ -0,0 +1,2 @@
+export declare const inferIsDeleted: (includeDeleted?: boolean) => boolean | undefined;
+//# sourceMappingURL=inferIsDeleted.d.ts.map

package/dist/utils/inferIsDeleted.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"inferIsDeleted.d.ts","sourceRoot":"","sources":["../../src/utils/inferIsDeleted.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,cAAc,oBAAqB,OAAO,KAAG,OAAO,GAAG,SACvB,CAAC"}

package/dist/utils/tests/inferIsDeleted.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=inferIsDeleted.test.d.ts.map

package/dist/utils/tests/inferIsDeleted.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"inferIsDeleted.test.d.ts","sourceRoot":"","sources":["../../../src/utils/tests/inferIsDeleted.test.ts"],"names":[],"mappings":""}

package/package.json

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

package/src/category/api/queryCategories.ts

@@ -6,6 +6,8 @@ import { pullFromCache, pushToCache } from '~/cache/api';
 import { ingestInCache } from '~/cache/api/ingestInCache';
 import { getResolver } from '~/core/model';
 
+import { inferIsDeleted } from '~/utils/inferIsDeleted';
+
 /* begin_public_function
   id: community.category.query
 */
@@ -36,7 +38,7 @@ export const queryCategories = async (
     {
       params: {
         ...params,
-        isDeleted: includeDeleted === false ? false : undefined,
+        isDeleted: inferIsDeleted(includeDeleted),
         options: {
           token: toToken(page, 'skiplimit'),
         },

package/src/category/observers/liveCategories.ts

@@ -63,7 +63,7 @@ export const liveCategories = (
         .filter(Boolean)
         .map(({ data }) => data) ?? [];
 
-    if (params.includeDeleted === false) {
+    if (!params.includeDeleted) {
       categories = filterByPropEquality(categories, 'isDeleted', false);
     }
 
@@ -96,16 +96,16 @@ export const liveCategories = (
    *};
    */
 
-  const onFetch = () => {
+  const onFetch = (initial = false) => {
     const collection = pullFromCache<Amity.CategoryLiveCollectionCache>(cacheKey)?.data;
 
     const categories = collection?.data ?? [];
 
-    if (categories.length > 0 && !collection?.params.page) return;
+    if (!initial && categories.length > 0 && !collection?.params.page) return;
 
     const query = createQuery(queryCategories, {
       ...queryParams,
-      page: collection?.params.page ?? { limit },
+      page: (!initial ? collection?.params.page : undefined) ?? { limit },
     });
 
     runQuery(
@@ -134,7 +134,7 @@ export const liveCategories = (
     // @TODO -> update once observers added
   });
 
-  onFetch();
+  onFetch(true);
 
   return () => {
     log(`liveCategories(tmpid: ${timestamp}) > dispose`);

package/src/category/observers/tests/liveCategories.test.ts

@@ -22,7 +22,9 @@ const getSnapshot = (params?: Record<string, any>) => {
   };
 };
 
-describe('live Caategories', () => {
+const params = { includeDeleted: true };
+
+describe('live Categories', () => {
   beforeAll(connectClient);
   afterAll(disconnectClient);
 
@@ -37,7 +39,7 @@ describe('live Caategories', () => {
     const callback = jest.fn();
     client.http.get = jest.fn().mockResolvedValue(categoryQueryResponse);
 
-    liveCategories({}, callback);
+    liveCategories(params, callback);
     await pause();
 
     expect(callback).toHaveBeenCalledTimes(2);
@@ -57,9 +59,9 @@ describe('live Caategories', () => {
     const callback = jest.fn();
     client.http.get = jest.fn().mockResolvedValue(categoryQueryResponse);
 
-    liveCategories({}, () => undefined);
+    liveCategories(params, () => undefined);
     await pause();
-    liveCategories({}, callback);
+    liveCategories(params, callback);
     await pause();
 
     expect(callback).toHaveBeenCalledTimes(2);
@@ -116,7 +118,7 @@ describe('live Caategories', () => {
       .mockResolvedValue(categoryQueryResponse)
       .mockResolvedValueOnce(categoryQueryResponsePage2);
 
-    liveCategories({}, callback);
+    liveCategories(params, callback);
     await pause();
 
     expect(callback).toHaveBeenCalled();

package/src/channel/api/tests/removeChannelMembers.test.ts

@@ -91,11 +91,10 @@ describe('removeChannelMembers', () => {
     await pause();
 
     /*
-     * Assertion below is required to check if the event handler is called with the right
-     * params. It's not enough to check if the handler does not throw
+     * Removed assertion for checking what the callback was called with as it's
+     * impossible to guarantee the order in which the events will be fired
      */
-    expect(callback).toHaveBeenNthCalledWith(1, channel1, channelUser);
-    expect(callback).toHaveBeenNthCalledWith(2, channel1, channelUser3);
+    expect(callback).toHaveBeenCalledTimes(2);
 
     unsub();
   });

package/src/channel/observers/liveChannelMembers.ts

@@ -137,16 +137,16 @@ export const liveChannelMembers = (
       responder(collection);
     };
 
-  const onFetch = () => {
+  const onFetch = (initial = false) => {
     const collection = pullFromCache<Amity.ChannelMembersLiveCollectionCache>(cacheKey)?.data;
 
     const channelMembers = collection?.data ?? [];
 
-    if (channelMembers.length > 0 && !collection?.params.page) return;
+    if (!initial && channelMembers.length > 0 && !collection?.params.page) return;
 
     const query = createQuery(queryChannelMembers, {
       ...queryParams,
-      page: collection?.params.page ?? { limit },
+      page: (!initial ? collection?.params.page : undefined) ?? { limit },
     });
 
     runQuery(
@@ -180,7 +180,7 @@ export const liveChannelMembers = (
     onChannelMemberUnbanned(realtimeRouter('onChannelMemberUnbanned')),
   );
 
-  onFetch();
+  onFetch(true);
 
   return () => {
     log(`liveChannelMembers(tmpid: ${timestamp}) > dispose`);

package/src/channel/observers/liveChannels.ts

@@ -146,16 +146,16 @@ export const liveChannels = (
     responder(collection);
   };
 
-  const onFetch = () => {
+  const onFetch = (initial = false) => {
     const collection = pullFromCache<Amity.ChannelLiveCollectionCache>(cacheKey)?.data;
 
     const channels = collection?.data ?? [];
 
-    if (channels.length > 0 && !collection?.params.page) return;
+    if (!initial && channels.length > 0 && !collection?.params.page) return;
 
     const query = createQuery(queryChannels, {
       ...queryParams,
-      page: collection?.params.page ?? { limit },
+      page: (!initial ? collection?.params.page : undefined) ?? { limit },
     });
 
     runQuery(
@@ -192,7 +192,7 @@ export const liveChannels = (
     onMessageCreated(() => null), // watch unread count
   );
 
-  onFetch();
+  onFetch(true);
 
   return () => {
     log(`liveChannels(tmpid: ${timestamp}) > dispose`);

package/src/channel/observers/tests/liveChannels.test.ts

@@ -9,6 +9,7 @@ import {
   client,
   connectClient,
   convertRawChannelPayload,
+  convertChannelFromRaw,
   disconnectClient,
   generateRawChannel,
   generateRawMessage,
@@ -20,7 +21,6 @@ import {
 } from '~/utils/tests';
 
 import { liveChannels } from '../liveChannels';
-import { convertFromRaw } from '../../utils';
 import * as getChannelMarkers from '../../../marker/api/getChannelMarkers';
 
 const getSnapshot = (params?: Record<string, any>) => {
@@ -75,17 +75,11 @@ describe('liveChannels', () => {
     liveChannels({}, callback);
     await pause();
 
-    expect(callback).toHaveBeenCalledTimes(2);
+    // The second `getChannels` call fetches data from the cache,
+    // so there is no loading state and the callback only fires once.
+    expect(callback).toHaveBeenCalledTimes(1);
     expect(callback).toHaveBeenNthCalledWith(
       1,
-      expect.objectContaining(
-        getSnapshot({
-          data: convertRawChannelPayload(channelQueryResponse.data).channels,
-        }),
-      ),
-    );
-    expect(callback).toHaveBeenNthCalledWith(
-      2,
       expect.objectContaining(
         getSnapshot({
           data: convertRawChannelPayload(channelQueryResponse.data).channels,
@@ -99,17 +93,17 @@ describe('liveChannels', () => {
     channelId: 'deleted-channel-id',
     isDeleted: true,
   });
-  const deletedChannel = convertFromRaw(rawDeletedChannel);
+  const deletedChannel = convertChannelFromRaw(rawDeletedChannel);
   const rawTaggedChannel = generateRawChannel({
     channelId: 'tagged-channel-id',
     tags: ['tag1', 'tag2'],
   });
-  const taggedChannel = convertFromRaw(rawTaggedChannel);
+  const taggedChannel = convertChannelFromRaw(rawTaggedChannel);
   const rawTaggedChannel2 = generateRawChannel({
     channelId: 'tagged-channel-id-2',
     tags: ['tag2'],
   });
-  const taggedChannel2 = convertFromRaw(rawTaggedChannel2);
+  const taggedChannel2 = convertChannelFromRaw(rawTaggedChannel2);
 
   const filters: [string, Amity.ChannelLiveCollection, Amity.Channel[]][] = [
     ['deleted', { isDeleted: false }, [channel1, taggedChannel, taggedChannel2]],
@@ -200,13 +194,13 @@ describe('liveChannels', () => {
         'it should add new channel to collection onCreate',
         'channel.created',
         rawNewChannel,
-        [convertFromRaw(rawNewChannel), channel1, channel2],
+        [convertChannelFromRaw(rawNewChannel), channel1, channel2],
       ],
       [
         'it should add new channel to collection onJoin',
         'channel.joined',
         rawNewChannel,
-        [convertFromRaw(rawNewChannel), channel1, channel2],
+        [convertChannelFromRaw(rawNewChannel), channel1, channel2],
       ],
       [
         'it should update channel in collection onUpdate',

package/src/client/api/connectClient.ts

@@ -107,8 +107,8 @@ export const connectClient = async (
      * token expires
      */
     unsubWatcher = client.accessTokenExpiryWatcher(
-      client.token?.issuedAt!,
       client.token?.expiresAt!,
+      client.token?.issuedAt!,
       sessionHandler!,
     );
 

package/src/comment/api/queryComments.ts

@@ -5,6 +5,8 @@ import { pullFromCache, pushToCache } from '~/cache/api';
 import { ingestInCache } from '~/cache/api/ingestInCache';
 import { getResolver } from '~/core/model';
 
+import { inferIsDeleted } from '~/utils/inferIsDeleted';
+
 /* begin_public_function
   id: comment.query
 */
@@ -44,7 +46,7 @@ export const queryComments = async (
     {
       params: {
         ...params,
-        isDeleted: includeDeleted === false ? false : undefined,
+        isDeleted: inferIsDeleted(includeDeleted),
         //      filterByParentId, API-FIX: backend does not support this boolean LOL. what the hell seriously.
         options,
       },

package/src/comment/observers/liveComments.ts

@@ -82,7 +82,7 @@ export const liveComments = (
         .filter(Boolean)
         .map(({ data }) => data) ?? [];
 
-    if (params.includeDeleted === false) {
+    if (!params.includeDeleted) {
       comments = filterByPropEquality(comments, 'isDeleted', false);
     }
 
@@ -120,16 +120,16 @@ export const liveComments = (
     responder(collection);
   };
 
-  const onFetch = () => {
+  const onFetch = (initial = false) => {
     const collection = pullFromCache<Amity.CommentLiveCollectionCache>(cacheKey)?.data;
 
     const comments = collection?.data ?? [];
 
-    if (comments.length > 0 && !collection?.params?.page) return;
+    if (!initial && comments.length > 0 && !collection?.params?.page) return;
 
     const query = createQuery(queryComments, {
       ...queryParams,
-      page: collection?.params?.page ?? { limit },
+      page: (!initial ? collection?.params.page : undefined) ?? { limit },
     });
 
     runQuery(
@@ -167,7 +167,7 @@ export const liveComments = (
     onCommentReactionRemoved(realtimeRouter('onReactionRemoved')),
   );
 
-  onFetch();
+  onFetch(true);
 
   return () => {
     log(`liveComments(tmpid: ${timestamp}) > dispose`);

package/src/community/api/queryCommunities.ts

@@ -5,6 +5,7 @@ import { pushToCache } from '~/cache/api';
 import { ingestInCache } from '~/cache/api/ingestInCache';
 import { getResolver } from '~/core/model';
 
+import { inferIsDeleted } from '~/utils/inferIsDeleted';
 import { prepareCommunityPayload } from '../utils';
 
 /* begin_public_function
@@ -43,7 +44,7 @@ export const queryCommunities = async (
     {
       params: {
         ...restParams,
-        isDeleted: includeDeleted === false ? false : undefined,
+        isDeleted: inferIsDeleted(includeDeleted),
         keyword: displayName,
         filter: membership,
         options: {

package/src/community/api/test/queryCommunity.test.ts

@@ -89,14 +89,14 @@ describe('queryCommunities', () => {
     expect(mockFn.mock.lastCall[1].params.isDeleted).toBe(false);
   });
 
-  test('it should set isDeleted to undefined if includeDeleted is undefined', async () => {
+  test('it should set isDeleted to false if includeDeleted is undefined', async () => {
     const mockFn = jest.fn();
     client.http.get = mockFn.mockResolvedValue(resolvedGetValue);
 
     await queryCommunities(queryCriteriaWithoutPage);
 
     expect(mockFn.mock.lastCall).toHaveLength(2);
-    expect(mockFn.mock.lastCall[1].params.isDeleted).toBeUndefined();
+    expect(mockFn.mock.lastCall[1].params.isDeleted).toBe(false);
   });
 });
 

package/src/community/observers/liveCommunities.ts

@@ -78,7 +78,7 @@ export const liveCommunities = (
 
     communities = filterByPropEquality(communities, 'displayName', params.displayName);
 
-    if (params.includeDeleted === false) {
+    if (!params.includeDeleted) {
       communities = filterByPropEquality(communities, 'isDeleted', false);
     }
 
@@ -138,16 +138,16 @@ export const liveCommunities = (
     responder(collection);
   };
 
-  const onFetch = () => {
+  const onFetch = (initial = false) => {
     const collection = pullFromCache<Amity.CommunityLiveCollectionCache>(cacheKey)?.data;
 
     const communities = collection?.data ?? [];
 
-    if (communities.length > 0 && !collection?.params.page) return;
+    if (!initial && communities.length > 0 && !collection?.params.page) return;
 
     const query = createQuery(queryCommunities, {
       ...queryParams,
-      page: collection?.params.page ?? { limit },
+      page: (!initial ? collection?.params.page : undefined) ?? { limit },
     });
 
     runQuery(
@@ -181,7 +181,7 @@ export const liveCommunities = (
     onCommunityUserChanged(realtimeRouter('onMemberCountChanged')),
   );
 
-  onFetch();
+  onFetch(true);
 
   return () => {
     log(`liveCommunities(tmpid: ${timestamp}) > dispose`);

package/src/community/observers/liveCommunityMembers.ts

@@ -132,16 +132,16 @@ export const liveCommunityMembers = (
       responder(collection);
     };
 
-  const onFetch = () => {
+  const onFetch = (initial = false) => {
     const collection = pullFromCache<Amity.CommunityMemberLiveCollectionCache>(cacheKey)?.data;
 
     const communityMembers = collection?.data ?? [];
 
-    if (communityMembers.length > 0 && !collection?.params.page) return;
+    if (!initial && communityMembers.length > 0 && !collection?.params.page) return;
 
     const query = createQuery(queryCommunityMembers, {
       ...queryParams,
-      page: collection?.params.page ?? { limit },
+      page: (!initial ? collection?.params.page : undefined) ?? { limit },
     });
 
     runQuery(
@@ -178,7 +178,7 @@ export const liveCommunityMembers = (
     onCommunityUserRoleRemoved(realtimeRouter('onMemberCountChanged')),
   );
 
-  onFetch();
+  onFetch(true);
 
   return () => {
     log(`liveCommunityMembers(tmpid: ${timestamp}) > dispose`);

package/src/community/observers/tests/liveCommunities.test.ts

@@ -39,7 +39,7 @@ describe('liveCommunities', () => {
     const callback = jest.fn();
     client.http.get = jest.fn().mockResolvedValue(communityQueryResponse);
 
-    liveCommunities({}, callback);
+    liveCommunities({ includeDeleted: true }, callback);
     await pause();
 
     expect(callback).toHaveBeenCalledTimes(2);
@@ -59,9 +59,9 @@ describe('liveCommunities', () => {
     const callback = jest.fn();
     client.http.get = jest.fn().mockResolvedValue(communityQueryResponse);
 
-    liveCommunities({}, () => undefined);
+    liveCommunities({ includeDeleted: true }, () => undefined);
     await pause();
-    liveCommunities({}, callback);
+    liveCommunities({ includeDeleted: true }, callback);
     await pause();
 
     expect(callback).toHaveBeenCalledTimes(2);
@@ -86,9 +86,9 @@ describe('liveCommunities', () => {
 
   const filters: [string, Amity.CommunityLiveCollection, Amity.Community[]][] = [
     ['not deleted', { includeDeleted: false }, [community2]],
-    ['categoryId', { categoryId: 'test-category-id' }, [community1]],
-    ['displayName', { displayName: 'community 1' }, [community1]],
-    ['tagged', { tags: ['test-community-tag'] }, [community1]],
+    ['categoryId', { categoryId: 'test-category-id', includeDeleted: true }, [community1]],
+    ['displayName', { displayName: 'community 1', includeDeleted: true }, [community1]],
+    ['tagged', { tags: ['test-community-tag'], includeDeleted: true }, [community1]],
   ];
 
   test.each(filters)('it should filter by %s communities', async (filter, params, expected) => {
@@ -121,7 +121,7 @@ describe('liveCommunities', () => {
       .mockResolvedValue(communityQueryResponse)
       .mockResolvedValueOnce(communityQueryResponsePage2);
 
-    liveCommunities({}, callback);
+    liveCommunities({ includeDeleted: true }, callback);
     await pause();
 
     expect(callback).toHaveBeenCalled();

package/src/core/query/filtering.ts

@@ -136,3 +136,41 @@ export const filterByCommunityMembership = <T extends Amity.Community>(
     return !communityUser || communityUser.communityMembership !== 'none';
   });
 };
+
+/**
+ * Filter a post collection by dataType
+ *
+ * @param collection the post to filter
+ * @param dataTypes of the post to be filtered by
+ * @returns a filtered collection with items only matching the criteria
+ *
+ * @hidden
+ */
+export const filterByPostDataTypes = <T extends Amity.Post>(
+  collection: T[],
+  dataTypes: Amity.PostLiveCollection['dataTypes'],
+): T[] => {
+  const filteredPosts: T[] = [];
+
+  collection.forEach(c => {
+    /*
+     * A text post with no children is just a text post
+     */
+    if (c.dataType === 'text' && !c.children.length) return;
+
+    if (c.children.length) {
+      const childPost = pullFromCache<Amity.Post>(['post', 'get', c.children[0]])?.data;
+
+      if (childPost && dataTypes?.includes(childPost?.dataType)) {
+        // @ts-ignore
+        filteredPosts.push(childPost);
+      }
+
+      return;
+    }
+
+    if (dataTypes?.includes(c.dataType)) filteredPosts.push(c);
+  });
+
+  return filteredPosts;
+};

package/src/follow/observers/liveFollowers.ts

@@ -96,16 +96,16 @@ export const liveFollowers = (
     responder(collection);
   };
 
-  const onFetch = () => {
+  const onFetch = (initial = false) => {
     const collection = pullFromCache<Amity.FollowerLiveCollectionCache>(cacheKey)?.data;
 
     const followers = collection?.data ?? [];
 
-    if (followers.length > 0 && !collection?.params?.page) return;
+    if (!initial && followers.length > 0 && !collection?.params?.page) return;
 
     const query = createQuery(queryFollowers, {
       ...queryParams,
-      page: collection?.params?.page ?? { limit },
+      page: (!initial ? collection?.params.page : undefined) ?? { limit },
     });
 
     runQuery(
@@ -140,7 +140,7 @@ export const liveFollowers = (
     onFollowerDeleted(realtimeRouter('onDeleted')),
   );
 
-  onFetch();
+  onFetch(true);
 
   return () => {
     log(`liveFollowers(tmpid: ${timestamp}) > dispose`);

package/src/follow/observers/liveFollowings.ts

@@ -96,16 +96,16 @@ export const liveFollowings = (
     responder(collection);
   };
 
-  const onFetch = () => {
+  const onFetch = (initial = false) => {
     const collection = pullFromCache<Amity.FollowingLiveCollectionCache>(cacheKey)?.data;
 
     const followings = collection?.data ?? [];
 
-    if (followings.length > 0 && !collection?.params?.page) return;
+    if (!initial && followings.length > 0 && !collection?.params?.page) return;
 
     const query = createQuery(queryFollowings, {
       ...queryParams,
-      page: collection?.params?.page ?? { limit },
+      page: (!initial ? collection?.params.page : undefined) ?? { limit },
     });
 
     runQuery(
@@ -140,7 +140,7 @@ export const liveFollowings = (
     onFollowerDeleted(realtimeRouter('onDeleted')),
   );
 
-  onFetch();
+  onFetch(true);
 
   return () => {
     log(`liveFollowings(tmpid: ${timestamp}) > dispose`);