@amityco/ts-sdk-react-native 6.13.0 → 6.13.2

package/dist/streamRepository/observers/getStreams.d.ts

@@ -8,6 +8,7 @@
  *
  * @param params for querying streams
  * @param callback the function to call when new data are available
+ * @param config
  * @returns An {@link Amity.Unsubscriber} function to run when willing to stop observing the streams
  *
  * @category Stream Live Collection

package/dist/streamRepository/observers/getStreams.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getStreams.d.ts","sourceRoot":"","sources":["../../../src/streamRepository/observers/getStreams.ts"],"names":[],"mappings":"AA0BA;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,UAAU,WACb,MAAM,oBAAoB,YACxB,MAAM,sBAAsB,CAAC,MAAM,MAAM,CAAC,WAC3C,MAAM,oBAAoB,eAyGpC,CAAC"}
+{"version":3,"file":"getStreams.d.ts","sourceRoot":"","sources":["../../../src/streamRepository/observers/getStreams.ts"],"names":[],"mappings":"AA0BA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,UAAU,WACb,MAAM,oBAAoB,YACxB,MAAM,sBAAsB,CAAC,MAAM,MAAM,CAAC,WAC3C,MAAM,oBAAoB,eAyGpC,CAAC"}

package/dist/userRepository/api/queryUsers.d.ts

@@ -14,7 +14,7 @@
  * @async
  */
 export declare const queryUsers: {
-    (query?: Amity.QueryUsers): Promise<Amity.Cached<Amity.Paged<Amity.InternalUser>>>;
+    (query?: Amity.QueryUsers): Promise<Amity.Cached<Amity.PageToken<Amity.InternalUser>>>;
     /**
      * ```js
      * import { queryUsers } from '@amityco/ts-sdk-react-native'
@@ -29,6 +29,6 @@ export declare const queryUsers: {
      *
      * @category User API
      */
-    locally(query?: Parameters<typeof queryUsers>[0]): Amity.Cached<Amity.Paged<Amity.InternalUser>> | undefined;
+    locally(query?: Parameters<typeof queryUsers>[0]): Amity.Cached<Amity.PageToken<Amity.InternalUser>> | undefined;
 };
 //# sourceMappingURL=queryUsers.d.ts.map

package/dist/userRepository/api/queryUsers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queryUsers.d.ts","sourceRoot":"","sources":["../../../src/userRepository/api/queryUsers.ts"],"names":[],"mappings":"AAUA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,UAAU;aACd,MAAM,UAAU,GACtB,QAAQ,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,MAAM,YAAY,CAAC,CAAC,CAAC;IAiDzD;;;;;;;;;;;;;OAaG;oBAEM,WAAW,iBAAiB,CAAC,CAAC,CAAC,CAAC,GACtC,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,MAAM,YAAY,CAAC,CAAC,GAAG,SAAS;CAlB3D,CAAC"}
+{"version":3,"file":"queryUsers.d.ts","sourceRoot":"","sources":["../../../src/userRepository/api/queryUsers.ts"],"names":[],"mappings":"AAQA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,UAAU;aACd,MAAM,UAAU,GACtB,QAAQ,MAAM,MAAM,CAAC,MAAM,SAAS,CAAC,MAAM,YAAY,CAAC,CAAC,CAAC;IAwD7D;;;;;;;;;;;;;OAaG;oBAEM,WAAW,iBAAiB,CAAC,CAAC,CAAC,CAAC,GACtC,MAAM,MAAM,CAAC,MAAM,SAAS,CAAC,MAAM,YAAY,CAAC,CAAC,GAAG,SAAS;CAlB/D,CAAC"}

package/dist/userRepository/observers/getUsers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getUsers.d.ts","sourceRoot":"","sources":["../../../src/userRepository/observers/getUsers.ts"],"names":[],"mappings":"AAoCA,eAAO,MAAM,WAAW,4CAEd,MAAM,kBAAkB,QAsBjC,CAAC;AAKF;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,QAAQ,WACX,MAAM,kBAAkB,YACtB,MAAM,sBAAsB,CAAC,MAAM,IAAI,CAAC,WACzC,MAAM,oBAAoB,eAgGpC,CAAC"}
+{"version":3,"file":"getUsers.d.ts","sourceRoot":"","sources":["../../../src/userRepository/observers/getUsers.ts"],"names":[],"mappings":"AAoCA,eAAO,MAAM,WAAW,4CAEd,MAAM,kBAAkB,QAsBjC,CAAC;AAKF;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,QAAQ,WACX,MAAM,kBAAkB,YACtB,MAAM,sBAAsB,CAAC,MAAM,IAAI,CAAC,WACzC,MAAM,oBAAoB,eAmGpC,CAAC"}

package/package.json

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

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

@@ -56,5 +56,7 @@ declare global {
     };
 
     type Paged<T, K extends Page | PageRaw = Page> = { data: T[] } & Pages<K>;
+
+    type PageToken<T> = { data: T[] } & Amity.Pagination;
   }
 }

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

@@ -92,7 +92,8 @@ declare global {
       isDeleted?: Amity.Channel['isDeleted'];
       tags?: Amity.Taggable['tags'];
       excludeTags?: Amity.Taggable['tags'];
-      page?: Amity.Page;
+      limit?: number;
+      page?: string;
     };
 
     type ChannelLiveCollection = Amity.LiveCollectionParams<Omit<QueryChannels, 'page'>>;

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

@@ -57,7 +57,8 @@ declare global {
       parentId?: Amity.InternalComment['commentId'] | null;
       hasFlag?: boolean;
       includeDeleted?: boolean;
-      page?: Amity.Page;
+      limit?: number;
+      page?: Amity.Token;
       dataTypes?: {
         values: ('image' | 'text')[];
         // matchType is a query format that you can set to any to query any type of comment
@@ -74,7 +75,7 @@ declare global {
 
     type CommentLiveCollectionCache = Amity.LiveCollectionCache<
       Amity.InternalComment['commentId'],
-      Pick<QueryComments, 'page'>
+      { page?: Amity.Token | undefined; limit?: number }
     >;
   }
 }

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

@@ -34,7 +34,8 @@ declare global {
       displayName?: Amity.InternalUser['displayName'];
       filter?: 'all' | 'flagged';
       sortBy?: 'displayName' | 'firstCreated' | 'lastCreated';
-      page?: Amity.Page;
+      limit?: number;
+      page?: string;
     };
 
     type UserLiveCollection = Amity.LiveCollectionParams<Omit<QueryUsers, 'page'>>;

package/src/channelRepsitory/api/queryChannels.ts

@@ -1,9 +1,7 @@
 import { getActiveClient } from '~/client/api';
-
-import { toPage, toToken } from '~/core/query';
 import { getResolver } from '~/core/model';
 
-import { pullFromCache, pushToCache } from '~/cache/api';
+import { pushToCache } from '~/cache/api';
 import { ingestInCache } from '~/cache/api/ingestInCache';
 
 import { prepareChannelPayload } from '../utils';
@@ -25,12 +23,12 @@ import { prepareChannelPayload } from '../utils';
  */
 export const queryChannels = async (
   query?: Amity.QueryChannels,
-): Promise<Amity.Cached<Amity.Paged<Amity.InternalChannel>>> => {
+): Promise<Amity.Cached<Amity.PageToken<Amity.InternalChannel>>> => {
   const client = getActiveClient();
   client.log('channel/queryChannels', query);
 
   // safe decapsulation
-  const { page = { limit: 10 }, displayName, membership, ...params } = query ?? {};
+  const { page = undefined, limit = 10, displayName, membership, ...params } = query ?? {};
 
   // API-FIX: parameters should be querystring.
   // API-FIX: backend doesn't answer Amity.Response
@@ -43,7 +41,7 @@ export const queryChannels = async (
         keyword: displayName,
         filter: membership,
         options: {
-          token: toToken(page, 'skiplimit'),
+          token: page,
         },
       },
     },
@@ -60,16 +58,9 @@ export const queryChannels = async (
   if (client.cache) {
     ingestInCache(data, { cachedAt });
 
-    const cacheKey = [
-      'channel',
-      'query',
-      { ...params, options: { ...page } } as Amity.Serializable,
-    ];
+    const cacheKey = ['channel', 'query', { ...params, options: { limit } } as Amity.Serializable];
     pushToCache(cacheKey, { channels: channels.map(getResolver('channel')), paging });
   }
 
-  const nextPage = toPage(paging.next);
-  const prevPage = toPage(paging.previous);
-
-  return { data: channels, cachedAt, prevPage, nextPage };
+  return { data: channels, cachedAt, paging };
 };

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, upsertInCache } from '~/cache/api';
+import { dropFromCache, pullFromCache, pushToCache } from '~/cache/api';
 import { getActiveClient } from '~/client/api';
 import {
   createQuery,
@@ -22,32 +22,32 @@ import {
 import { CACHE_SHORTEN_LIFESPAN } from '~/cache/utils';
 import { convertEventPayload } from '~/utils/event';
 import { uuid } from '~/core/uuid';
-import {
-  onChannelCreated,
-  onChannelDeleted,
-  onChannelJoined,
-  onChannelLeft,
-  onChannelMemberAdded,
-  onChannelMemberRemoved,
-  onChannelMuted,
-  onChannelUpdated,
-} from '../events';
-import { queryChannels } from '../api/queryChannels';
-import { getChannelMessagePreview } from '../../messagePreview/utils/getChannelMessagePreview';
 import { onMessageCreated } from '~/messageRepository/events/onMessageCreated';
 import { onMessageUpdated } from '~/messageRepository/events/onMessageUpdated';
 import { onMessageDeleted } from '~/messageRepository/events/onMessageDeleted';
 import { onSubChannelUpdated } from '~/subChannelRepository/events/onSubChannelUpdated';
 import { onSubChannelDeleted } from '~/subChannelRepository/events/onSubChannelDeleted';
-import { getChannel } from '../api/getChannel';
-import { getChannelMessagePreviewWithUser } from '../../messagePreview/utils/getChannelMessagePreviewWithUser';
 import {
   handleMessageCreated,
   handleMessageUpdated,
   handleSubChannelUpdated,
 } from '~/messagePreview/utils/updateMessagePreviewFromMessage';
-import { updateChannelCache } from '../utils/updateChannelCache';
 import { onChannelMarkerUpdated } from '~/marker/events/onChannelMarkerUpdated';
+import { getChannel } from '../api/getChannel';
+import { getChannelMessagePreviewWithUser } from '../../messagePreview/utils/getChannelMessagePreviewWithUser';
+import { updateChannelCache } from '../utils/updateChannelCache';
+import { getChannelMessagePreview } from '../../messagePreview/utils/getChannelMessagePreview';
+import {
+  onChannelCreated,
+  onChannelDeleted,
+  onChannelJoined,
+  onChannelLeft,
+  onChannelMemberAdded,
+  onChannelMemberRemoved,
+  onChannelMuted,
+  onChannelUpdated,
+} from '../events';
+import { queryChannels } from '../api/queryChannels';
 
 /* begin_public_function
   id: channel.query
@@ -132,7 +132,7 @@ export const getChannels = (
       case 'displayName':
         /*
          * The server returns channels with empty | null displayName's first before
-         * returning sorted list of channels with displayNames
+         * returning a sorted list of channels with displayNames
          *
          * This section needs to be updated as displayNames can be null as well
          */
@@ -176,21 +176,24 @@ export const getChannels = (
 
     const query = createQuery(queryChannels, {
       ...queryParams,
-      page: (!initial ? collection?.params.page : undefined) ?? { limit },
+      page: !initial ? collection?.params.page : undefined,
+      limit,
     });
 
     runQuery(
       query,
-      ({ data: result, error, loading, nextPage: page }) => {
+      ({ data: result, error, loading, paging }) => {
         const data = {
           loading,
           error,
-          params: { page },
+          params: { page: paging?.next },
           data: channels,
         };
 
         if (result) {
-          data.data = [...new Set([...channels, ...result.map(getResolver('channel'))])];
+          data.data = initial
+            ? result.map(getResolver('channel')) // Replace all collection from BE when initial fetch
+            : [...new Set([...channels, ...result.map(getResolver('channel'))])];
         }
 
         pushToCache(cacheKey, data);

package/src/commentRepository/api/queryComments.ts

@@ -1,6 +1,4 @@
 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';
@@ -23,15 +21,16 @@ import { inferIsDeleted } from '~/utils/inferIsDeleted';
  */
 export const queryComments = async (
   query: Amity.QueryComments,
-): Promise<Amity.Cached<Amity.Paged<Amity.InternalComment>>> => {
+): Promise<Amity.Cached<Amity.PageToken<Amity.InternalComment>>> => {
   const client = getActiveClient();
   client.log('comment/queryComments', query);
 
-  const { page = { limit: 10 }, includeDeleted, ...params } = query;
+  const { limit = 10, includeDeleted, ...params } = query;
 
   const options = {
-    type: params.sortBy || query.page?.limit ? 'pagination' : undefined,
-    token: toToken(page, params.sortBy ? 'skiplimit' : 'afterbefore'),
+    type: params.sortBy || query.limit ? 'pagination' : undefined,
+    limit: query.limit,
+    token: query.page,
   };
   // const filterByParentId = query.parentId !== undefined
 
@@ -60,16 +59,9 @@ export const queryComments = async (
   if (client.cache) {
     ingestInCache(payload as Amity.CommentPayload, { cachedAt });
 
-    const cacheKey = [
-      'comment',
-      'query',
-      { ...params, options: { ...page } } as Amity.Serializable,
-    ];
+    const cacheKey = ['comment', 'query', { ...params, options: { limit } } as Amity.Serializable];
     pushToCache(cacheKey, { comments: comments.map(getResolver('comment')), paging });
   }
 
-  const nextPage = toPage(paging.next);
-  const prevPage = toPage(paging.previous);
-
-  return { data: comments, cachedAt, prevPage, nextPage };
+  return { data: comments, cachedAt, paging };
 };

package/src/commentRepository/observers/getComments.ts

@@ -139,14 +139,16 @@ export const getComments = (
 
     const query = createQuery(queryComments, {
       ...queryParams,
-      page: (!initial ? collection?.params.page : undefined) ?? { limit },
+      limit: queryLimit,
+      page: !initial ? collection?.params.page : undefined,
     });
 
     runQuery(
       query,
-      ({ data: result, error, loading, prevPage, nextPage }) => {
-        // depend on sortBy value we have two different pagination type
-        const page = queryParams.sortBy || params?.limit ? nextPage : prevPage;
+      ({ data: result, error, loading, paging }) => {
+        // depend on sortBy value we have two different pagination types
+        const sorting = queryParams.sortBy || 'lastCreated';
+        const page = sorting === 'lastCreated' ? paging?.next : paging?.previous;
 
         const data = {
           loading,
@@ -156,7 +158,9 @@ export const getComments = (
         };
 
         if (result) {
-          data.data = [...new Set([...comments, ...result.map(getResolver('comment'))])];
+          data.data = initial
+            ? result.map(getResolver('comment')) // Replace a collection list with new data from BE
+            : [...new Set([...comments, ...result.map(getResolver('comment'))])];
         }
 
         pushToCache(cacheKey, data);

package/src/communityRepository/api/queryCommunities.ts

@@ -30,11 +30,11 @@ export const queryCommunities = async (
   client.log('channel/queryCommunities', query);
 
   // safe decapsulation
-  const { page, ...params } = query ?? {};
+  const { page = { limit: 10 }, ...params } = query ?? {};
   const { displayName, membership, includeDeleted, ...restParams } = params ?? {};
 
   // API-FIX: parameters should be querystring.
-  // API-FIX: backend doesnt answer Amity.Response
+  // API-FIX: backend doesn't answer Amity.Response
   // const { data } = await client.http.get<Amity.Response<Amity.PagedResponse<CommunityPayload>>>(
   const { data } = await client.http.get<Amity.CommunityPayload & Amity.Pagination>(
     `/api/v3/communities`,

package/src/communityRepository/communityMembership/observers/tests/getMembers.test.ts

@@ -1,22 +1,22 @@
 import { getPastDate } from '~/core/model';
 import { disableCache, enableCache } from '~/cache/api';
 import {
+  bannedCommunityUser,
   client,
-  connectClient,
-  disconnectClient,
-  pause,
-  user11,
-  user13,
   community11,
   communityUser11,
   communityUser13,
-  withRoleCommunityUser,
-  bannedCommunityUser,
   communityUserQueryResponse,
   communityUserQueryResponsePage2,
+  connectClient,
   convertedCommunityUser1,
   convertedCommunityUser2,
   convertedCommunityUser3,
+  disconnectClient,
+  pause,
+  user11,
+  user13,
+  withRoleCommunityUser,
 } from '~/utils/tests';
 
 // makes it easier to spy on applyFilter
@@ -220,14 +220,14 @@ describe('getMembers > applyFilter', () => {
   ][] = [
     ['it should filter by roles', { communityId, roles: ['test-role'] }, [m1, m2], [m1]],
     [
-      'it should filter by membership:member',
-      { communityId, membership: ['member'] },
+      'it should filter by memberships: member',
+      { communityId, memberships: ['member'] },
       [m1, m2],
       [m1],
     ],
     [
-      'it should filter by membership:banned',
-      { communityId, membership: ['banned'] },
+      'it should filter by memberships: banned',
+      { communityId, memberships: ['banned'] },
       [m1, m2],
       [m2],
     ],

package/src/communityRepository/observers/getCommunities.ts

@@ -148,7 +148,7 @@ export const getCommunities = (
 
     const query = createQuery(queryCommunities, {
       ...queryParams,
-      page: (!initial ? collection?.params.page : undefined) ?? { limit },
+      page: !initial ? collection?.params.page : { limit },
     });
 
     runQuery(

package/src/streamRepository/observers/getStreams.ts

@@ -5,11 +5,11 @@ import { getActiveClient } from '~/client/api';
 
 import {
   createQuery,
-  runQuery,
-  queryOptions,
   filterByPropEquality,
-  sortByLastCreated,
+  queryOptions,
+  runQuery,
   sortByFirstCreated,
+  sortByLastCreated,
 } from '~/core/query';
 
 import {
@@ -34,6 +34,7 @@ import { onStreamRecorded, onStreamStarted, onStreamStopped } from '../events';
  *
  * @param params for querying streams
  * @param callback the function to call when new data are available
+ * @param config
  * @returns An {@link Amity.Unsubscriber} function to run when willing to stop observing the streams
  *
  * @category Stream Live Collection
@@ -70,7 +71,7 @@ export const getStreams = (
     return streams;
   };
 
-  const responder = (data: Amity.UserLiveCollectionCache, isEventModel = false) => {
+  const responder = (data: Amity.StreamLiveCollectionCache, isEventModel = false) => {
     const streams: Amity.Stream[] =
       data.data
         .map(streamId => {
@@ -102,7 +103,7 @@ export const getStreams = (
   };
 
   const onFetch = (initial = false) => {
-    const collection = pullFromCache<Amity.UserLiveCollectionCache>(cacheKey)?.data;
+    const collection = pullFromCache<Amity.StreamLiveCollectionCache>(cacheKey)?.data;
 
     const streams = collection?.data ?? [];
 

package/src/userRepository/api/queryUsers.ts

@@ -1,7 +1,5 @@
 import { getActiveClient } from '~/client/api';
 
-import { toPage, toToken } from '~/core/query';
-
 import { pullFromCache, pushToCache } from '~/cache/api';
 import { ingestInCache } from '~/cache/api/ingestInCache';
 import { getResolver } from '~/core/model';
@@ -25,12 +23,13 @@ import { LinkedObject } from '~/utils/linkedObject';
  */
 export const queryUsers = async (
   query: Amity.QueryUsers = {},
-): Promise<Amity.Cached<Amity.Paged<Amity.InternalUser>>> => {
+): Promise<Amity.Cached<Amity.PageToken<Amity.InternalUser>>> => {
   const client = getActiveClient();
   client.log('user/queryUsers', query);
 
   const {
-    page = { limit: 10 },
+    page,
+    limit = 10,
     displayName,
     filter = 'all',
     sortBy = 'displayName',
@@ -44,7 +43,8 @@ export const queryUsers = async (
       filter,
       sortBy,
       options: {
-        token: toToken(page, 'skiplimit'),
+        token: page,
+        limit,
       },
     },
   });
@@ -59,19 +59,24 @@ export const queryUsers = async (
     ingestInCache(payload as Amity.UserPayload, { cachedAt });
 
     /*
-     * using query as cache key over params because if the keyword, filter, sort
+     * using a query as a cache key over params because if the keyword, filter, sort
      * change the API will NOT cache results, when it should
      */
-    const cacheKey = ['user', 'query', { ...query, options: { ...page } } as Amity.Serializable];
+    const cacheKey = [
+      'user',
+      'query',
+      { ...query, options: { limit, token: page } } as Amity.Serializable,
+    ];
     pushToCache(cacheKey, { users: users.map(getResolver('user')), paging });
   }
 
   fireEvent('user.fetched', data);
 
-  const prevPage = toPage(paging.previous);
-  const nextPage = toPage(paging.next);
-
-  return { data: users.map(user => LinkedObject.user(user)), cachedAt, prevPage, nextPage };
+  return {
+    data: users.map(user => LinkedObject.user(user)),
+    cachedAt,
+    paging,
+  };
 };
 
 /**
@@ -90,20 +95,23 @@ export const queryUsers = async (
  */
 queryUsers.locally = (
   query: Parameters<typeof queryUsers>[0] = {},
-): Amity.Cached<Amity.Paged<Amity.InternalUser>> | undefined => {
+): Amity.Cached<Amity.PageToken<Amity.InternalUser>> | undefined => {
   const client = getActiveClient();
   client.log('user/queryUsers.locally', query);
 
   if (!client.cache) return;
 
-  const { page = { limit: 10 } } = query ?? {};
+  const { limit = 10, page } = query ?? {};
 
   const cacheKey = [
     'user',
     'query',
     {
       ...query,
-      options: { ...page },
+      options: {
+        limit,
+        token: page,
+      },
     } as Amity.Serializable,
   ];
 
@@ -117,10 +125,11 @@ queryUsers.locally = (
       .filter(Boolean)
       .map(({ data }) => data) ?? [];
 
-  const prevPage = toPage(data?.paging.previous);
-  const nextPage = toPage(data?.paging.next);
-
   return users.length > 0 && users.length === data?.users?.length
-    ? { data: users, cachedAt, prevPage, nextPage }
+    ? {
+        data: users.map(LinkedObject.user),
+        cachedAt,
+        paging: data?.paging,
+      }
     : undefined;
 };

package/src/userRepository/observers/getUsers.ts

@@ -20,6 +20,7 @@ import {
   ENABLE_CACHE_MESSAGE,
 } from '~/utils/constants';
 
+import { LinkedObject } from '~/utils/linkedObject';
 import { queryUsers } from '../api/queryUsers';
 import {
   onUserDeleted,
@@ -28,7 +29,6 @@ import {
   onUserUnflagged,
   onUserUpdated,
 } from '../events';
-import { LinkedObject } from '~/utils/linkedObject';
 
 /*
  * Exported for testing
@@ -122,7 +122,7 @@ export const getUsers = (
   };
 
   const realtimeRouter = (_: Amity.UserActionType) => (user: Amity.User) => {
-    const collection = pullFromCache<Amity.CommunityLiveCollectionCache>(cacheKey)?.data;
+    const collection = pullFromCache<Amity.UserLiveCollectionCache>(cacheKey)?.data;
     if (!collection) return;
 
     collection.data = [...new Set([user.userId, ...collection.data])];
@@ -139,21 +139,24 @@ export const getUsers = (
 
     const query = createQuery(queryUsers, {
       ...queryParams,
-      page: (!initial ? collection?.params.page : undefined) ?? { limit },
+      limit,
+      page: !initial ? collection?.params.page : undefined,
     });
 
     runQuery(
       query,
-      ({ data: result, error, loading, nextPage: page }) => {
+      ({ data: result, error, loading, paging }) => {
         const data = {
           loading,
           error,
-          params: { page },
+          params: { page: paging?.next },
           data: users,
         };
 
         if (result) {
-          data.data = [...new Set([...users, ...result.map(getResolver('user'))])];
+          data.data = initial
+            ? result.map(getResolver('user'))
+            : [...new Set([...users, ...result.map(getResolver('user'))])];
         }
 
         pushToCache(cacheKey, data);