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

package/dist/index.esm.js

@@ -21499,7 +21499,7 @@ const markAsReadBySegment = async ({ subChannelId, readToSegment, }) => {
     }
 };
 
-const reCalculateChannelUnreadInfo = async (channelId) => {
+const reCalculateChannelUnreadInfo = (channelId) => {
     var _a;
     const cacheKeyChannelUnread = ['channelUnreadInfo', 'get', channelId];
     const cacheChannelUnreadInfo = (_a = pullFromCache(cacheKeyChannelUnread)) === null || _a === void 0 ? void 0 : _a.data;
@@ -21516,10 +21516,12 @@ const reCalculateChannelUnreadInfo = async (channelId) => {
             .reduce((acc, cur) => acc + cur, 0);
         isMentioned = subChannelUnreadsInfo.some(({ data }) => data.isMentioned);
     }
-    pushToCache(cacheKeyChannelUnread, Object.assign(Object.assign({}, (cacheChannelUnreadInfo !== null && cacheChannelUnreadInfo !== void 0 ? cacheChannelUnreadInfo : {
+    const channelUnreadInfo = Object.assign(Object.assign({}, (cacheChannelUnreadInfo !== null && cacheChannelUnreadInfo !== void 0 ? cacheChannelUnreadInfo : {
         channelId,
         createdAt: new Date().toISOString(),
-    })), { updatedAt: new Date().toISOString(), unreadCount: channelUnreads, isMentioned }));
+    })), { updatedAt: new Date().toISOString(), unreadCount: channelUnreads, isMentioned });
+    pushToCache(cacheKeyChannelUnread, channelUnreadInfo);
+    return channelUnreadInfo;
 };
 
 class MessageReadReceiptSyncEngine {
@@ -21664,9 +21666,11 @@ class MessageReadReceiptSyncEngine {
         if (subChannelUnreadInfo && segment > subChannelUnreadInfo.readToSegment) {
             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);
+            fireEvent('local.subChannelUnread.updated', subChannelUnreadInfo);
         }
-        pushToCache(cacheKey, subChannelUnreadInfo);
         // Step 2: Enqueue the read receipt
         this.enqueueReadReceipt(subChannelId, segment);
     }
@@ -24661,9 +24665,9 @@ const enableUnreadCount = () => {
 const onUserFeedMarkerUpdated = (callback) => {
     const client = getActiveClient();
     const filter = (payload) => {
-        // update sub channel unread info and channel unread info in cache
-        persistUnreadCountInfo(payload);
-        callback(payload.feedMarkers[0]);
+        payload.feedMarkers.forEach(feedMarker => {
+            callback(feedMarker);
+        });
     };
     return createEventSubscriber(client, 'feedMarker/onUserFeedMarkerUpdated', 'marker.userFeed-updated', filter);
 };
@@ -25173,7 +25177,7 @@ const createClient = (apiKey, apiRegion = API_REGIONS.SG, { debugSession = DEFAU
 */
 /**
  * ```js
- * import { Client } from '@amityco/ts-sdk'
+ * import { Client } from '@amityco/ts-sdk-react-native'
  * const success = await Client.secureLogout()
  * ```
  *
@@ -25259,7 +25263,7 @@ const onChannelMarkerFetched = (callback) => {
 const onSubChannelMarkerFetched = (callback) => {
     const client = getActiveClient();
     const filter = (payload) => {
-        callback(payload.userFeedMarkers[0]);
+        payload.userFeedMarkers.forEach(callback);
     };
     return createEventSubscriber(client, 'subChannelMarker/onSubChannelMarkerFetched', 'local.subChannelMarker.fetched', filter);
 };
@@ -25529,6 +25533,9 @@ function isEqual(x, y) {
         }));
 }
 
+/**
+ * @deprecated This function is deprecated
+ */
 const liveObject = (id, callback, key, fetcher, eventHandlers, options) => {
     const { forceDispatch, callbackDataSelector, callbackFilter } = Object.assign({ forceDispatch: false, callbackDataSelector: (data) => data }, options);
     const { cache } = getActiveClient();
@@ -29085,7 +29092,10 @@ const createCommentEventSubscriber = (event, callback) => {
                             comments[0].parentId,
                         ]);
                         if (parentComment === null || parentComment === void 0 ? void 0 : parentComment.data) {
-                            pushToCache(['comment', 'get', comments[0].parentId], Object.assign(Object.assign({}, parentComment.data), { childrenNumber: parentComment.data.childrenNumber + 1, children: [...new Set([...parentComment.data.children, comments[0].commentId])] }));
+                            // Skip to update parent childComment if current comment already exists
+                            if (!parentComment.data.children.includes(comments[0].commentId)) {
+                                pushToCache(['comment', 'get', comments[0].parentId], Object.assign(Object.assign({}, parentComment.data), { childrenNumber: parentComment.data.childrenNumber + 1, children: [...new Set([...parentComment.data.children, comments[0].commentId])] }));
+                            }
                         }
                     }
                     const queries = (_a = queryCache(['comment', 'query'])) === null || _a === void 0 ? void 0 : _a.filter(({ key }) => { var _a; return ((_a = key[2]) === null || _a === void 0 ? void 0 : _a.referenceId) === comment.data.referenceId; });
@@ -31514,7 +31524,7 @@ class LiveCollectionController {
             this.notifyChange({ origin: "server" /* Amity.LiveDataOrigin.SERVER */, loading: false, error: e });
         }
     }
-    loadPage(initial = false, direction = "next" /* Amity.LiveCollectionPageDirection.NEXT */) {
+    loadPage({ initial = false, direction = "next" /* Amity.LiveCollectionPageDirection.NEXT */, }) {
         this.setup();
         this.notifyChange({ origin: "local" /* Amity.LiveDataOrigin.LOCAL */, loading: true });
         if (initial) {
@@ -31584,7 +31594,7 @@ class MessageLiveCollectionController extends LiveCollectionController {
         this.query = query;
         this.queryStreamController = new MessageQueryStreamController(this.query, this.cacheKey, this.notifyChange.bind(this), prepareMessagePayload, this.paginationController);
         this.callback = callback.bind(this);
-        this.loadPage(true);
+        this.loadPage({ initial: true });
     }
     setup() {
         var _a;
@@ -31632,8 +31642,8 @@ class MessageLiveCollectionController extends LiveCollectionController {
         if (!this.shouldNotify(data) && origin === 'event')
             return;
         this.callback({
-            onNextPage: () => this.loadPage(false, "next" /* Amity.LiveCollectionPageDirection.NEXT */),
-            onPrevPage: () => this.loadPage(false, "prev" /* Amity.LiveCollectionPageDirection.PREV */),
+            onNextPage: () => this.loadPage({ direction: "next" /* Amity.LiveCollectionPageDirection.NEXT */ }),
+            onPrevPage: () => this.loadPage({ direction: "prev" /* Amity.LiveCollectionPageDirection.PREV */ }),
             data,
             hasNextPage: !!this.paginationController.getNextToken(),
             hasPrevPage: !!this.paginationController.getPrevToken(),
@@ -31915,6 +31925,24 @@ var index$f = /*#__PURE__*/Object.freeze({
   convertQueryParams: convertQueryParams$1
 });
 
+/**
+ * Internal used only
+ *
+ * Fired when an {@link Amity.userMessageFeedMarkers} has been resolved by Object Rsesolver
+ *
+ * @param callback The function to call when the event was fired
+ * @returns an {@link Amity.Unsubscriber} function to stop listening
+ *
+ * @category MessageMarker Events
+ */
+const onSubChannelUnreadUpdatedLocal = (callback) => {
+    const client = getActiveClient();
+    const filter = (payload) => {
+        callback(payload);
+    };
+    return createEventSubscriber(client, 'subChannelMarker/onSubChannelUnreadUpdatedLocal', 'local.subChannelUnread.updated', filter);
+};
+
 /* begin_public_function
   id: subchannel.get
 */
@@ -32067,7 +32095,7 @@ const getSubChannel = (subChannelId, callback) => {
             };
             return onMessageDeleted(updateMessagePreview);
         }, 'subChannelId', 'subChannel'),
-        convertEventPayload(onUserFeedMarkerUpdated, 'feedId', 'subChannel'),
+        convertEventPayload(onSubChannelUnreadUpdatedLocal, 'subChannelId', 'subChannel'),
     ], {
         forceDispatch: true,
     });
@@ -32157,7 +32185,7 @@ class SubChannelLiveCollectionController extends LiveCollectionController {
         this.query = query;
         this.queryStreamController = new SubChannelQueryStreamController(this.query, this.cacheKey, this.notifyChange.bind(this), prepareSubChannelPayload);
         this.callback = callback.bind(this);
-        this.loadPage(true);
+        this.loadPage({ initial: true });
     }
     setup() {
         var _a;
@@ -32334,7 +32362,7 @@ class SubChannelLiveCollectionController extends LiveCollectionController {
                 action: 'onUpdate',
             },
             {
-                fn: convertEventPayload(onUserFeedMarkerUpdated, 'feedId', 'subChannel'),
+                fn: convertEventPayload(onSubChannelUnreadUpdatedLocal, 'subChannelId', 'subChannel'),
                 action: 'onUpdate',
             },
         ]);
@@ -32352,7 +32380,7 @@ class SubChannelLiveCollectionController extends LiveCollectionController {
         if (!this.shouldNotify(data) && origin === 'event')
             return;
         this.callback({
-            onNextPage: () => this.loadPage(false, "next" /* Amity.LiveCollectionPageDirection.NEXT */),
+            onNextPage: () => this.loadPage({ direction: "next" /* Amity.LiveCollectionPageDirection.NEXT */ }),
             data,
             hasNextPage: !!this.paginationController.getNextToken(),
             loading,
@@ -32492,6 +32520,24 @@ var index$e = /*#__PURE__*/Object.freeze({
   stopMessageReceiptSync: stopMessageReceiptSync
 });
 
+/**
+ * Internal used only
+ *
+ * Fired when an {@link Amity.userMessageFeedMarkers} has been resolved by Object Rsesolver
+ *
+ * @param callback The function to call when the event was fired
+ * @returns an {@link Amity.Unsubscriber} function to stop listening
+ *
+ * @category MessageMarker Events
+ */
+const onChannelUnreadUpdatedLocal = (callback) => {
+    const client = getActiveClient();
+    const filter = (payload) => {
+        callback(payload);
+    };
+    return createEventSubscriber(client, 'channelMarker/onChannelUnreadUpdatedLocal', 'local.channelUnread.updated', filter);
+};
+
 /* begin_public_function
   id: channel.get
 */
@@ -32667,7 +32713,7 @@ const getChannel = (channelId, callback) => {
             return onSubChannelUpdated(updateMessagePreview);
         }, 'channelId', 'channel'),
         convertEventPayload(onSubChannelCreated, 'channelId', 'channel'),
-        convertEventPayload(onUserFeedMarkerUpdated, 'entityId', 'channel'),
+        convertEventPayload(onChannelUnreadUpdatedLocal, 'channelId', 'channel'),
     ], {
         forceDispatch: true,
     });
@@ -32827,7 +32873,7 @@ class ChannelLiveCollectionController extends LiveCollectionController {
         }, paginationController);
         this.paginationController = paginationController;
         this.callback = callback.bind(this);
-        this.loadPage(true);
+        this.loadPage({ initial: true });
     }
     setup() {
         var _a;
@@ -32866,7 +32912,7 @@ class ChannelLiveCollectionController extends LiveCollectionController {
             return;
         this.callback({
             onNextPage: this.paginationController instanceof ChannelPaginationController
-                ? () => this.loadPage(false, "next" /* Amity.LiveCollectionPageDirection.NEXT */)
+                ? () => this.loadPage({ direction: "next" /* Amity.LiveCollectionPageDirection.NEXT */ })
                 : undefined,
             data,
             hasNextPage: this.paginationController instanceof ChannelPaginationController
@@ -33146,10 +33192,6 @@ class ChannelLiveCollectionController extends LiveCollectionController {
                 }, 'channelId', 'channel'),
                 action: "onUpdate" /* Amity.ChannelActionType.OnUpdate */,
             },
-            {
-                fn: convertEventPayload(onUserFeedMarkerUpdated, 'entityId', 'channel'),
-                action: "onUpdate" /* Amity.ChannelActionType.OnUpdate */,
-            },
             {
                 fn: convertEventPayload(onSubChannelCreated, 'channelId', 'channel'),
                 action: "onUpdate" /* Amity.ChannelActionType.OnUpdate */,
@@ -33175,6 +33217,10 @@ class ChannelLiveCollectionController extends LiveCollectionController {
                 },
                 action: "onResolve" /* Amity.ChannelActionType.OnResolve */,
             },
+            {
+                fn: convertEventPayload(onChannelUnreadUpdatedLocal, 'channelId', 'channel'),
+                action: "onUpdate" /* Amity.ChannelActionType.OnUpdate */,
+            },
         ];
         if (this.paginationController instanceof PaginationController) {
             return [
@@ -33389,7 +33435,7 @@ class ChannelMemberLiveCollectionController extends LiveCollectionController {
         this.query = query;
         this.queryStreamController = new ChannelMemberQueryStreamController(this.query, this.cacheKey, this.notifyChange.bind(this), prepareChannelPayload);
         this.callback = callback.bind(this);
-        this.loadPage(true);
+        this.loadPage({ initial: true });
     }
     setup() {
         var _a;
@@ -33431,7 +33477,7 @@ class ChannelMemberLiveCollectionController extends LiveCollectionController {
         if (!this.shouldNotify(data) && origin === 'event')
             return;
         this.callback({
-            onNextPage: () => this.loadPage(false, "next" /* Amity.LiveCollectionPageDirection.NEXT */),
+            onNextPage: () => this.loadPage({ direction: "next" /* Amity.LiveCollectionPageDirection.NEXT */ }),
             data,
             hasNextPage: !!this.paginationController.getNextToken(),
             loading,
@@ -33821,12 +33867,30 @@ var index$b = /*#__PURE__*/Object.freeze({
   prepareChannelPayload: prepareChannelPayload
 });
 
+const saveCommunityUsers = (communities, communityUsers) => {
+    if (communities.length === 0 || communityUsers.length === 0)
+        return;
+    communities.forEach(({ communityId }) => {
+        const collection = communityUsers.filter(({ communityId: userCommunityId }) => communityId === userCommunityId);
+        pushToCache(['communityUsers', 'collection', communityId], collection);
+    });
+};
+
 const getMatchPostSetting = (value) => {
     var _a;
     return (_a = Object.keys(CommunityPostSettingMaps).find(key => value.needApprovalOnPostCreation ===
         CommunityPostSettingMaps[key].needApprovalOnPostCreation &&
         value.onlyAdminCanPost === CommunityPostSettingMaps[key].onlyAdminCanPost)) !== null && _a !== void 0 ? _a : DefaultCommunityPostSetting;
 };
+const convertCommunityUsersToUniqueObject = (communityUsers) => {
+    if (!communityUsers)
+        return communityUsers;
+    const result = {};
+    communityUsers.forEach(user => {
+        result[`${user.userId}#${user.communityId}`] = user;
+    });
+    return result;
+};
 const prepareCommunityPayload = (rawPayload) => {
     // Unpack community payload by mapping payload field to postSetting value.
     const communities = rawPayload.communities.map((_a) => {
@@ -33836,7 +33900,18 @@ const prepareCommunityPayload = (rawPayload) => {
                 onlyAdminCanPost,
             }) }, restCommunityPayload));
     });
-    const communityUsers = withUsers(rawPayload.communityUsers);
+    const mergeCommunityUsers = communities.reduce((acc, { communityId }) => {
+        var _a;
+        const users = (_a = pullFromCache([
+            'communityUsers',
+            'collection',
+            communityId,
+        ])) === null || _a === void 0 ? void 0 : _a.data;
+        if (!users)
+            return acc;
+        return Object.assign(Object.assign({}, convertCommunityUsersToUniqueObject(users)), acc);
+    }, convertCommunityUsersToUniqueObject(rawPayload.communityUsers));
+    const communityUsers = withUsers(Object.values(mergeCommunityUsers));
     const communityWithMembershipStatus = updateMembershipStatus(communities, communityUsers);
     return Object.assign(Object.assign({}, rawPayload), { communities: communityWithMembershipStatus, communityUsers });
 };
@@ -33870,8 +33945,10 @@ const getCommunities$1 = async (communityIds) => {
     });
     const data = prepareCommunityPayload(payload);
     const cachedAt = client.cache && Date.now();
-    if (client.cache)
+    if (client.cache) {
         ingestInCache(data, { cachedAt });
+        saveCommunityUsers(data.communities, data.communityUsers);
+    }
     return {
         data: data.communities,
         cachedAt,
@@ -33933,8 +34010,10 @@ const createCommunity = async (bundle) => {
     fireEvent('community.created', payload);
     const data = prepareCommunityPayload(payload);
     const cachedAt = client.cache && Date.now();
-    if (client.cache)
+    if (client.cache) {
         ingestInCache(data, { cachedAt });
+        saveCommunityUsers(data.communities, data.communityUsers);
+    }
     const { communities } = data;
     return {
         data: communities[0],
@@ -33968,8 +34047,10 @@ const updateCommunity = async (communityId, patch) => {
     fireEvent('community.updated', payload);
     const data = prepareCommunityPayload(payload);
     const cachedAt = client.cache && Date.now();
-    if (client.cache)
+    if (client.cache) {
         ingestInCache(data, { cachedAt });
+        saveCommunityUsers(data.communities, data.communityUsers);
+    }
     const { communities } = data;
     return {
         data: communities.find(community => community.communityId === communityId),
@@ -33999,8 +34080,10 @@ const getCommunity$1 = async (communityId) => {
     const { data: payload } = await client.http.get(`/api/v3/communities/${communityId}`);
     const data = prepareCommunityPayload(payload);
     const cachedAt = client.cache && Date.now();
-    if (client.cache)
+    if (client.cache) {
         ingestInCache(data, { cachedAt });
+        saveCommunityUsers(data.communities, data.communityUsers);
+    }
     const { communities } = data;
     return {
         data: communities.find(community => community.communityId === communityId),
@@ -34540,50 +34623,140 @@ const observeCommunity = (communityId, callback) => {
 };
 
 /**
- * ```js
- * import { queryCommunities } from '@amityco/ts-sdk-react-native'
- * const communities = await queryCommunities()
- * ```
- *
- * Queries a paginable list of {@link Amity.Community} objects
- * Search is performed by displayName such as `.startsWith(search)`
- *
- * @param query The query parameters
- * @returns A page of {@link Amity.Community} objects
- *
- * @category Community API
- * @async
+ * TODO: handle cache receive cache option, and cache policy
+ * TODO: check if querybyIds is supported
  */
-const queryCommunities = async (query) => {
-    const client = getActiveClient();
-    client.log('channel/queryCommunities', query);
-    // safe decapsulation
-    const _a = query !== null && query !== void 0 ? query : {}, { page, limit = 10 } = _a, params = __rest(_a, ["page", "limit"]);
-    const _b = params !== null && params !== void 0 ? params : {}, { displayName, membership, includeDeleted } = _b, restParams = __rest(_b, ["displayName", "membership", "includeDeleted"]);
-    const options = (() => {
-        if (page)
-            return { token: page };
-        if (limit)
-            return { limit };
-        return undefined;
-    })();
-    // API-FIX: parameters should be querystring.
-    // 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(`/api/v3/communities`, {
-        params: Object.assign(Object.assign({}, restParams), { isDeleted: inferIsDeleted(includeDeleted), keyword: displayName, filter: membership, options }),
-    });
-    const { paging } = data, payload = __rest(data, ["paging"]);
-    const unpackedPayload = prepareCommunityPayload(payload);
-    const { communities } = unpackedPayload;
-    const cachedAt = client.cache && Date.now();
-    if (client.cache) {
-        ingestInCache(unpackedPayload, { cachedAt });
-        const cacheKey = ['community', 'query', Object.assign(Object.assign({}, params), { options })];
-        pushToCache(cacheKey, { communities: communities.map(getResolver('community')), paging });
+class CommunitiesPaginationController$1 extends PaginationController {
+    async getRequest(queryParams, token) {
+        const { limit = COLLECTION_DEFAULT_PAGINATION_LIMIT } = queryParams, params = __rest(queryParams, ["limit"]);
+        const options = token ? { token } : { limit };
+        const { data: queryResponse } = await this.http.get(`/api/v3/communities`, {
+            params: Object.assign(Object.assign({}, params), { isDeleted: inferIsDeleted(params.includeDeleted), keyword: params.displayName, filter: params.membership, options }),
+        });
+        return queryResponse;
     }
-    return { data: communities, cachedAt, paging };
-};
+}
+
+class CommunitiesQueryStreamController$1 extends QueryStreamController {
+    constructor(query, cacheKey, notifyChange, preparePayload) {
+        super(query, cacheKey);
+        this.notifyChange = notifyChange;
+        this.preparePayload = preparePayload;
+    }
+    async saveToMainDB(response) {
+        const processedPayload = await this.preparePayload(response);
+        const client = getActiveClient();
+        const cachedAt = client.cache && Date.now();
+        if (client.cache) {
+            ingestInCache(processedPayload, { cachedAt });
+        }
+    }
+    appendToQueryStream(response, direction, refresh = false) {
+        var _a, _b;
+        if (refresh) {
+            pushToCache(this.cacheKey, {
+                data: response.communities.map(getResolver('community')),
+            });
+        }
+        else {
+            const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+            const communities = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
+            pushToCache(this.cacheKey, Object.assign(Object.assign({}, collection), { data: [...new Set([...communities, ...response.communities.map(getResolver('community'))])] }));
+        }
+    }
+    reactor(action) {
+        return (community) => {
+            var _a;
+            const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+            if (!collection)
+                return;
+            pushToCache(this.cacheKey, collection);
+            this.notifyChange({ origin: "event" /* Amity.LiveDataOrigin.EVENT */, loading: false });
+        };
+    }
+    subscribeRTE(createSubscriber) {
+        return createSubscriber.map(subscriber => subscriber.fn(this.reactor(subscriber.action)));
+    }
+}
+
+var EnumCommunityActions$1;
+(function (EnumCommunityActions) {
+    EnumCommunityActions["OnCommunityCreated"] = "onCommunityCreated";
+    EnumCommunityActions["OnCommunityDeleted"] = "onCommunityDeleted";
+    EnumCommunityActions["OnCommunityUpdated"] = "onCommunityUpdated";
+})(EnumCommunityActions$1 || (EnumCommunityActions$1 = {}));
+
+/* eslint-disable no-use-before-define */
+class SearchCommunityLiveCollectionController extends LiveCollectionController {
+    constructor(query, callback) {
+        const queryStreamId = hash(query);
+        const cacheKey = ['community', 'collection', queryStreamId];
+        const paginationController = new CommunitiesPaginationController$1(query);
+        super(paginationController, queryStreamId, cacheKey, callback);
+        this.query = query;
+        this.queryStreamController = new CommunitiesQueryStreamController$1(this.query, this.cacheKey, this.notifyChange.bind(this), prepareCommunityPayload);
+        this.callback = callback.bind(this);
+        this.loadPage({ initial: true });
+    }
+    setup() {
+        var _a;
+        const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+        if (!collection) {
+            pushToCache(this.cacheKey, {
+                data: [],
+                params: {},
+            });
+        }
+    }
+    async persistModel(queryPayload) {
+        await this.queryStreamController.saveToMainDB(queryPayload);
+    }
+    persistQueryStream({ response, direction, refresh, }) {
+        this.queryStreamController.appendToQueryStream(response, direction, refresh);
+    }
+    startSubscription() {
+        return this.queryStreamController.subscribeRTE([
+            { fn: onCommunityDeleted, action: EnumCommunityActions$1.OnCommunityDeleted },
+            { fn: onCommunityUpdated, action: EnumCommunityActions$1.OnCommunityUpdated },
+        ]);
+    }
+    notifyChange({ origin, loading, error }) {
+        var _a, _b;
+        const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+        if (!collection)
+            return;
+        const data = this.applyFilter((_b = collection.data
+            .map(id => pullFromCache(['community', 'get', id]))
+            .filter(Boolean)
+            .map(({ data }) => data)) !== null && _b !== void 0 ? _b : []);
+        if (!this.shouldNotify(data) && origin === 'event')
+            return;
+        this.callback({
+            onNextPage: () => this.loadPage({ direction: "next" /* Amity.LiveCollectionPageDirection.NEXT */ }),
+            data,
+            hasNextPage: !!this.paginationController.getNextToken(),
+            loading,
+            error,
+        });
+    }
+    applyFilter(data) {
+        const { userId } = getActiveClient();
+        let communities = data;
+        if (this.query.includeDeleted) {
+            communities = filterByPropEquality(communities, 'isDeleted', false);
+        }
+        if (this.query.categoryId) {
+            communities = communities.filter(c => { var _a; return (_a = c.categoryIds) === null || _a === void 0 ? void 0 : _a.includes(this.query.categoryId); });
+        }
+        if (this.query.tags) {
+            communities = communities.filter(c => { var _a; return (_a = c.tags) === null || _a === void 0 ? void 0 : _a.some(t => { var _a; return (_a = this.query.tags) === null || _a === void 0 ? void 0 : _a.includes(t); }); });
+        }
+        if (this.query.membership && userId) {
+            communities = filterByCommunityMembership(communities, this.query.membership, userId);
+        }
+        return communities;
+    }
+}
 
 /* begin_public_function
   id: community.query
@@ -34593,7 +34766,7 @@ const queryCommunities = async (query) => {
  * import { CommunityRepository } from '@amityco/ts-sdk-react-native'
  *
  * let communities = []
- * const unsub = CommunityRepository.getCommunities({
+ * const unsub = CommunityRepository.searchCommunities({
  *   displayName: Amity.Community['displayName'],
  * }, response => merge(communities, response.data))
  * ```
@@ -34606,99 +34779,215 @@ const queryCommunities = async (query) => {
  *
  * @category Community Live Collection
  */
-const getCommunities = (params, callback, config) => {
-    const { log, cache, userId } = getActiveClient();
+const searchCommunities = (params, callback, config) => {
+    const { log, cache } = getActiveClient();
     if (!cache) {
         console.log(ENABLE_CACHE_MESSAGE);
     }
     const timestamp = Date.now();
-    log(`getCommunities(tmpid: ${timestamp}) > listen`);
-    const { limit: queryLimit } = params, queryParams = __rest(params, ["limit"]);
-    const limit = queryLimit !== null && queryLimit !== void 0 ? queryLimit : COLLECTION_DEFAULT_PAGINATION_LIMIT;
-    const { policy = COLLECTION_DEFAULT_CACHING_POLICY } = config !== null && config !== void 0 ? config : {};
-    const disposers = [];
-    const cacheKey = ['community', 'collection', queryParams];
-    const responder = (data) => {
-        var _a, _b;
-        let communities = (_a = data.data
-            .map(communityId => pullFromCache(['community', 'get', communityId]))
-            .filter(Boolean)
-            .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
-        communities = filterByStringComparePartially(communities, 'displayName', params.displayName);
-        if (!params.includeDeleted) {
-            communities = filterByPropEquality(communities, 'isDeleted', false);
-        }
-        if (params.categoryId) {
-            communities = communities.filter(c => { var _a; return (_a = c.categoryIds) === null || _a === void 0 ? void 0 : _a.includes(params.categoryId); });
-        }
-        if (params.tags) {
-            communities = communities.filter(c => { var _a; return (_a = c.tags) === null || _a === void 0 ? void 0 : _a.some(t => { var _a; return (_a = params.tags) === null || _a === void 0 ? void 0 : _a.includes(t); }); });
-        }
-        if (params.membership && userId) {
-            communities = filterByCommunityMembership(communities, params.membership, userId);
+    log(`searchCommunities(tmpid: ${timestamp}) > listen`);
+    const searchCommunitiesLiveCollection = new SearchCommunityLiveCollectionController(params, callback);
+    const disposers = searchCommunitiesLiveCollection.startSubscription();
+    const cacheKey = searchCommunitiesLiveCollection.getCacheKey();
+    disposers.push(() => dropFromCache(cacheKey));
+    return () => {
+        log(`searchCommunities(tmpid: ${timestamp}) > dispose`);
+        disposers.forEach(fn => fn());
+    };
+};
+/* end_public_function */
+
+/**
+ * TODO: handle cache receive cache option, and cache policy
+ * TODO: check if querybyIds is supported
+ */
+class CommunitiesPaginationController extends PaginationController {
+    async getRequest(queryParams, token) {
+        const { limit = COLLECTION_DEFAULT_PAGINATION_LIMIT } = queryParams, params = __rest(queryParams, ["limit"]);
+        const options = token ? { token } : { limit };
+        const { data: queryResponse } = await this.http.get(`/api/v3/communities`, {
+            params: Object.assign(Object.assign({}, params), { isDeleted: inferIsDeleted(params.includeDeleted), keyword: params.displayName, filter: params.membership, options }),
+        });
+        return queryResponse;
+    }
+}
+
+var EnumCommunityActions;
+(function (EnumCommunityActions) {
+    EnumCommunityActions["OnCommunityCreated"] = "onCommunityCreated";
+    EnumCommunityActions["OnCommunityDeleted"] = "onCommunityDeleted";
+    EnumCommunityActions["OnCommunityUpdated"] = "onCommunityUpdated";
+})(EnumCommunityActions || (EnumCommunityActions = {}));
+
+class CommunitiesQueryStreamController extends QueryStreamController {
+    constructor(query, cacheKey, notifyChange, preparePayload) {
+        super(query, cacheKey);
+        this.notifyChange = notifyChange;
+        this.preparePayload = preparePayload;
+    }
+    async saveToMainDB(response) {
+        const processedPayload = await this.preparePayload(response);
+        const client = getActiveClient();
+        const cachedAt = client.cache && Date.now();
+        if (client.cache) {
+            ingestInCache(processedPayload, { cachedAt });
+            saveCommunityUsers(response.communities, response.communityUsers);
         }
-        const sortBy = params.sortBy || 'lastCreated';
-        if (sortBy === 'lastCreated' || sortBy === 'firstCreated') {
-            communities = communities.sort(sortBy === 'lastCreated' ? sortByLastCreated : sortByFirstCreated);
+    }
+    appendToQueryStream(response, direction, refresh = false) {
+        var _a, _b;
+        if (refresh) {
+            pushToCache(this.cacheKey, {
+                data: response.communities.map(getResolver('community')),
+            });
         }
-        /*
-         * The server returns communities with empty | null displayName's first before
-         * returning sorted list of communities with displayNames
-         *
-         * This section needs to be updated as displayNames can be null as well
-         */
-        if (sortBy === 'displayName') {
-            communities = communities
-                // this needs to be aligned with the backend data type
-                .map(c => (c.displayName ? c : Object.assign(Object.assign({}, c), { displayName: '' })))
-                // @ts-ignore
-                .sort(sortByDisplayName);
+        else {
+            const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+            const communities = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
+            pushToCache(this.cacheKey, Object.assign(Object.assign({}, collection), { data: [...new Set([...communities, ...response.communities.map(getResolver('community'))])] }));
         }
-        callback({
-            onNextPage: onFetch,
-            data: communities,
-            hasNextPage: !!((_b = data.params) === null || _b === void 0 ? void 0 : _b.page),
-            loading: data.loading,
-            error: data.error,
-        });
-    };
-    const realtimeRouter = (_) => (community) => {
+    }
+    reactor(action) {
+        return (community) => {
+            var _a;
+            const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+            if (!collection)
+                return;
+            if (this.query.displayName && action === EnumCommunityActions.OnCommunityCreated) {
+                return;
+            }
+            /*
+             * Simply update a collection and let responder decide what to do with data
+             */
+            collection.data = [...new Set([community.communityId, ...collection.data])];
+            pushToCache(this.cacheKey, collection);
+            this.notifyChange({ origin: "event" /* Amity.LiveDataOrigin.EVENT */, loading: false });
+        };
+    }
+    subscribeRTE(createSubscriber) {
+        return createSubscriber.map(subscriber => subscriber.fn(this.reactor(subscriber.action)));
+    }
+}
+
+/* eslint-disable no-use-before-define */
+class CommunityLiveCollectionController extends LiveCollectionController {
+    constructor(query, callback) {
+        const queryStreamId = hash(query);
+        const cacheKey = ['community', 'collection', queryStreamId];
+        const paginationController = new CommunitiesPaginationController(query);
+        super(paginationController, queryStreamId, cacheKey, callback);
+        this.query = query;
+        this.queryStreamController = new CommunitiesQueryStreamController(this.query, this.cacheKey, this.notifyChange.bind(this), prepareCommunityPayload);
+        this.callback = callback.bind(this);
+        this.loadPage({ initial: true });
+    }
+    setup() {
         var _a;
-        const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+        const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+        if (!collection) {
+            pushToCache(this.cacheKey, {
+                data: [],
+                params: {},
+            });
+        }
+    }
+    async persistModel(queryPayload) {
+        await this.queryStreamController.saveToMainDB(queryPayload);
+    }
+    persistQueryStream({ response, direction, refresh, }) {
+        this.queryStreamController.appendToQueryStream(response, direction, refresh);
+    }
+    startSubscription() {
+        return this.queryStreamController.subscribeRTE([
+            { fn: onCommunityCreated, action: EnumCommunityActions.OnCommunityCreated },
+            { fn: onCommunityDeleted, action: EnumCommunityActions.OnCommunityDeleted },
+            { fn: onCommunityUpdated, action: EnumCommunityActions.OnCommunityUpdated },
+        ]);
+    }
+    notifyChange({ origin, loading, error }) {
+        var _a, _b;
+        const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
         if (!collection)
             return;
-        /*
-         * Simply update collection and let responder decide what to do with data
-         */
-        collection.data = [...new Set([community.communityId, ...collection.data])];
-        pushToCache(cacheKey, collection);
-        responder(collection);
-    };
-    const onFetch = (initial = false) => {
-        var _a, _b;
-        const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-        const communities = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
-        if (!initial && communities.length > 0 && !(collection === null || collection === void 0 ? void 0 : collection.params.page))
+        const data = this.applyFilter((_b = collection.data
+            .map(id => pullFromCache(['community', 'get', id]))
+            .filter(Boolean)
+            .map(({ data }) => data)) !== null && _b !== void 0 ? _b : []);
+        if (!this.shouldNotify(data) && origin === 'event')
             return;
-        const query = createQuery(queryCommunities, Object.assign(Object.assign({}, queryParams), { limit: initial ? limit : undefined, page: !initial ? collection === null || collection === void 0 ? void 0 : collection.params.page : undefined }));
-        runQuery(query, ({ data: result, error, loading, paging }) => {
-            const data = {
-                loading,
-                error,
-                params: { page: paging === null || paging === void 0 ? void 0 : paging.next },
-                data: communities,
-            };
-            if (result) {
-                data.data = initial
-                    ? result.map(getResolver('community'))
-                    : [...new Set([...communities, ...result.map(getResolver('community'))])];
-            }
-            pushToCache(cacheKey, data);
-            responder(data);
-        }, queryOptions(policy, CACHE_SHORTEN_LIFESPAN));
-    };
-    disposers.push(onCommunityCreated(realtimeRouter()), onCommunityDeleted(realtimeRouter()), onCommunityUpdated(realtimeRouter()), onCommunityJoined(realtimeRouter()), onCommunityLeft(realtimeRouter()), onCommunityUserChanged(realtimeRouter()));
-    onFetch(true);
+        this.callback({
+            onNextPage: () => this.loadPage({ direction: "next" /* Amity.LiveCollectionPageDirection.NEXT */ }),
+            data,
+            hasNextPage: !!this.paginationController.getNextToken(),
+            loading,
+            error,
+        });
+    }
+    applyFilter(data) {
+        const { userId } = getActiveClient();
+        let communities = data;
+        if (this.query.includeDeleted) {
+            communities = filterByPropEquality(communities, 'isDeleted', false);
+        }
+        if (this.query.categoryId) {
+            communities = communities.filter(c => { var _a; return (_a = c.categoryIds) === null || _a === void 0 ? void 0 : _a.includes(this.query.categoryId); });
+        }
+        if (this.query.tags) {
+            communities = communities.filter(c => { var _a; return (_a = c.tags) === null || _a === void 0 ? void 0 : _a.some(t => { var _a; return (_a = this.query.tags) === null || _a === void 0 ? void 0 : _a.includes(t); }); });
+        }
+        if (this.query.membership && userId) {
+            communities = filterByCommunityMembership(communities, this.query.membership, userId);
+        }
+        if (!this.query.displayName) {
+            const sortFn = (() => {
+                switch (this.query.sortBy) {
+                    case 'firstCreated':
+                        return sortByFirstCreated;
+                    case 'lastCreated':
+                        return sortByLastCreated;
+                    case 'displayName':
+                        return sortByDisplayName;
+                    default:
+                        return sortByLastCreated;
+                }
+            })();
+            communities = communities.sort(sortFn);
+        }
+        return communities;
+    }
+}
+
+/* begin_public_function
+  id: community.query
+*/
+/**
+ * ```js
+ * import { CommunityRepository } from '@amityco/ts-sdk-react-native'
+ *
+ * let communities = []
+ * const unsub = CommunityRepository.getCommunities({
+ *   displayName: Amity.Community['displayName'],
+ * }, response => merge(communities, response.data))
+ * ```
+ *
+ * Observe all mutations on a list of {@link Amity.Community}s
+ *
+ * @param params for querying communities
+ * @param callback the function to call when new data are available
+ * @returns An {@link Amity.Unsubscriber} function to run when willing to stop observing the communities
+ *
+ * @category Community Live Collection
+ */
+const getCommunities = (params, callback, config) => {
+    const { log, cache } = getActiveClient();
+    if (!cache) {
+        console.log(ENABLE_CACHE_MESSAGE);
+    }
+    const timestamp = Date.now();
+    log(`getCommunities(tmpid: ${timestamp}) > listen`);
+    const communitiesLiveCollection = new CommunityLiveCollectionController(params, callback);
+    const disposers = communitiesLiveCollection.startSubscription();
+    const cacheKey = communitiesLiveCollection.getCacheKey();
     disposers.push(() => dropFromCache(cacheKey));
     return () => {
         log(`getCommunities(tmpid: ${timestamp}) > dispose`);
@@ -35227,208 +35516,238 @@ const removeMembers = async (communityId, userIds) => {
 /* end_public_function */
 
 /**
- * ```js
- * import { queryCommunityMembers } from '@amityco/ts-sdk-react-native'
- * const communityMembers = await queryCommunityMembers({ communityId: 'foo' })
- * ```
- *
- * Queries a paginable list of {@link Amity.CommunityUser} objects
- *
- * @param query The query parameters
- * @returns A page of {@link Amity.CommunityUser} objects
- *
- * @category Community API
- * @async
- * */
-const queryCommunityMembers = async (query) => {
-    const client = getActiveClient();
-    client.log('community/queryCommunityMembers', query);
-    const _a = query !== null && query !== void 0 ? query : {}, { page, limit } = _a, params = __rest(_a, ["page", "limit"]);
-    const options = (() => {
-        if (page)
-            return { token: page };
-        if (limit)
-            return { limit };
-        return undefined;
-    })();
-    const { data: queryPayload } = await client.http.get(`/api/v3/communities/${params.communityId}/users`, {
-        params: Object.assign(Object.assign({}, params), { options }),
-    });
-    const { paging } = queryPayload, payload = __rest(queryPayload, ["paging"]);
-    const preparedPayload = prepareMembershipPayload(payload, 'communityUsers');
-    const { communityUsers } = preparedPayload;
-    const cachedAt = client.cache && Date.now();
-    if (client.cache) {
-        ingestInCache(preparedPayload, { cachedAt });
-        const cacheKey = ['communityUsers', 'query', Object.assign(Object.assign({}, params), { options })];
-        pushToCache(cacheKey, {
-            communityUsers: communityUsers.map(({ communityId, userId }) => getResolver('communityUsers')({ communityId, userId })),
-            paging,
-        });
-    }
-    return { data: communityUsers, cachedAt, paging };
-};
-/**
- * ```js
- * import { queryCommunityMembers } from '@amityco/ts-sdk-react-native'
- * const communityMembers = await queryCommunityMembers(query)
- * ```
- *
- * Queries a paginable list of {@link Amity.InternalPost} objects from cache
- *
- * @param query The query parameters
- * @returns posts
- *
- * @category Post API
- */
-queryCommunityMembers.locally = (query) => {
-    var _a, _b;
-    const client = getActiveClient();
-    client.log('community/queryCommunityMembers', query);
-    if (!client.cache)
-        return;
-    const _c = query !== null && query !== void 0 ? query : {}, { page, limit } = _c, params = __rest(_c, ["page", "limit"]);
-    const options = (() => {
-        if (page)
-            return { token: page };
-        if (limit)
-            return { limit };
-        return undefined;
-    })();
-    const cacheKey = ['communityUsers', 'query', Object.assign(Object.assign({}, params), { options })];
-    const { data, cachedAt } = (_a = pullFromCache(cacheKey)) !== null && _a !== void 0 ? _a : {};
-    if (!(data === null || data === void 0 ? void 0 : data.communityUsers.length))
-        return;
-    const communityUsers = data.communityUsers
-        .map(key => pullFromCache(['communityUsers', 'get', key]))
-        .filter(Boolean)
-        .map(({ data }) => data);
-    const { paging } = data;
-    return communityUsers.length === ((_b = data === null || data === void 0 ? void 0 : data.communityUsers) === null || _b === void 0 ? void 0 : _b.length)
-        ? { data: communityUsers, cachedAt, paging }
-        : undefined;
-};
-
-/*
- * Exported for testing
- * @hidden
+ * TODO: handle cache receive cache option, and cache policy
+ * TODO: check if querybyIds is supported
  */
-const applyFilter = (data, params) => {
-    let communityMembers = filterByPropIntersection(data, 'roles', params.roles);
-    if (params.memberships) {
-        communityMembers = communityMembers.filter(({ communityMembership }) => {
-            const membership = params.memberships;
-            return membership.includes(communityMembership);
+class CommunityMembersPaginationController extends PaginationController {
+    async getRequest(queryParams, token) {
+        const { limit = COLLECTION_DEFAULT_PAGINATION_LIMIT } = queryParams, params = __rest(queryParams, ["limit"]);
+        const options = token ? { token } : { limit };
+        const { data: queryResponse } = await this.http.get(`/api/v3/communities/${params.communityId}/users`, {
+            params: Object.assign(Object.assign({}, params), { options }),
         });
+        return queryResponse;
     }
-    if (params.search) {
-        communityMembers = filterBySearchTerm(communityMembers, params.search);
+}
+
+class CommunityMembersQueryStreamController extends QueryStreamController {
+    constructor(query, cacheKey, notifyChange, preparePayload) {
+        super(query, cacheKey);
+        this.notifyChange = notifyChange;
+        this.preparePayload = preparePayload;
     }
-    const sortBy = params.sortBy ? params.sortBy : 'lastCreated';
-    communityMembers = communityMembers.sort(sortBy === 'lastCreated' ? sortByLastCreated : sortByFirstCreated);
-    return communityMembers;
-};
-/* begin_public_function
-  id: community.membership.query
-*/
-/**
- * ```js
- * import { getMembers } from '@amityco/ts-sdk-react-native'
- *
- * let communityMembers = []
- * const unsub = getMembers({
- *   communityId: Amity.Community['communityId'],
- * }, response => merge(communityMembers, response.data))
- * ```
- *
- * Observe all mutations on a list of {@link Amity.CommunityUser}s
- *
- * @param params for querying community users
- * @param callback the function to call when new data are available
- * @returns An {@link Amity.Unsubscriber} function to run when willing to stop observing the community users
- *
- * @category Community Live Collection
- */
-const getMembers = (params, callback, config) => {
-    const { log, cache } = getActiveClient();
-    if (!cache) {
-        console.log(ENABLE_CACHE_MESSAGE);
+    async saveToMainDB(response) {
+        const processedPayload = await this.preparePayload(response);
+        const client = getActiveClient();
+        const cachedAt = client.cache && Date.now();
+        if (client.cache) {
+            ingestInCache(processedPayload, { cachedAt });
+        }
     }
-    const timestamp = Date.now();
-    log(`getMembers(tmpid: ${timestamp}) > listen`);
-    const { limit: queryLimit } = params, queryParams = __rest(params, ["limit"]);
-    const limit = queryLimit !== null && queryLimit !== void 0 ? queryLimit : COLLECTION_DEFAULT_PAGINATION_LIMIT;
-    const { policy = COLLECTION_DEFAULT_CACHING_POLICY } = config !== null && config !== void 0 ? config : {};
-    const disposers = [];
-    const cacheKey = ['communityUsers', 'collection', queryParams];
-    const cacheByCommunityIdKey = [
-        'communityUsers',
-        'collection',
-        { communityId: params.communityId },
-    ];
-    const responder = (data, isEventModel = false) => {
+    appendToQueryStream(response, direction, refresh = false) {
         var _a, _b;
-        const communityMembers = (_a = data.data
-            .map(id => pullFromCache(['communityUsers', 'get', id]))
-            .filter(Boolean)
-            .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
-        callback({
-            onNextPage: onFetch,
-            data: isEventModel ? applyFilter(communityMembers, params) : communityMembers,
-            hasNextPage: !!((_b = data.params) === null || _b === void 0 ? void 0 : _b.page),
-            loading: data.loading,
-            error: data.error,
-        });
-    };
-    const realtimeRouter = (_) => (_, communityMembers) => {
-        var _a;
-        const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-        if (!collection) {
-            return;
+        if (refresh) {
+            pushToCache(this.cacheKey, {
+                data: response.communityUsers.map(({ communityId, userId }) => getResolver('communityUsers')({ communityId, userId })),
+            });
+        }
+        else {
+            const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+            const communityUsers = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
+            pushToCache(this.cacheKey, Object.assign(Object.assign({}, collection), { data: [
+                    ...new Set([
+                        ...communityUsers,
+                        ...response.communityUsers.map(({ communityId, userId }) => getResolver('communityUsers')({ communityId, userId })),
+                    ]),
+                ] }));
         }
-        const communityMemberCacheIds = communityMembers
-            .map(communityMember => {
-            if (params.communityId !== communityMember.communityId) {
+    }
+    reactor(action) {
+        return (community, communityMembers) => {
+            var _a;
+            const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+            if (!collection)
                 return;
-            }
-            const communityMemberCacheId = getResolver('communityUsers')({
-                communityId: params.communityId,
-                userId: communityMember.userId,
+            communityMembers.forEach(communityMember => {
+                const communityMemberCacheId = getResolver('communityUsers')({
+                    communityId: this.query.communityId,
+                    userId: communityMember.userId,
+                });
+                if (communityMember.communityMembership === 'none') {
+                    collection.data = collection.data.filter(m => m !== communityMemberCacheId);
+                }
+                else if (!collection.data.includes(communityMemberCacheId)) {
+                    collection.data = [communityMemberCacheId, ...collection.data];
+                }
             });
-            return communityMemberCacheId;
-        })
-            .filter(isNonNullable);
-        collection.data = [...new Set([...communityMemberCacheIds, ...collection.data])];
-        pushToCache(cacheKey, collection);
-        pushToCache(cacheByCommunityIdKey, collection);
-        responder(collection, true);
-    };
-    const onFetch = (initial = false) => {
+            pushToCache(this.cacheKey, collection);
+            this.notifyChange({ origin: "event" /* Amity.LiveDataOrigin.EVENT */, loading: false });
+        };
+    }
+    subscribeRTE(createSubscriber) {
+        return createSubscriber.map(subscriber => subscriber.fn(this.reactor(subscriber.action)));
+    }
+}
+
+var EnumCommunityMemberActions;
+(function (EnumCommunityMemberActions) {
+    EnumCommunityMemberActions["OnCommunityJoined"] = "onCommunityJoined";
+    EnumCommunityMemberActions["OnCommunityLeft"] = "onCommunityLeft";
+    EnumCommunityMemberActions["OnCommunityUserBanned"] = "onCommunityUserBanned";
+    EnumCommunityMemberActions["OnCommunityUserChanged"] = "onCommunityUserChanged";
+    EnumCommunityMemberActions["OnCommunityUserRoleAdded"] = "onCommunityUserRoleAdded";
+    EnumCommunityMemberActions["OnCommunityUserRoleRemoved"] = "onCommunityUserRoleRemoved";
+    EnumCommunityMemberActions["OnCommunityUserUnbanned"] = "onCommunityUserUnbanned";
+})(EnumCommunityMemberActions || (EnumCommunityMemberActions = {}));
+
+/* eslint-disable no-use-before-define */
+class CommunityMembersLiveCollectionController extends LiveCollectionController {
+    constructor(query, callback) {
+        const queryStreamId = hash(query);
+        const cacheKey = ['communityUsers', 'collection', queryStreamId];
+        const paginationController = new CommunityMembersPaginationController(query);
+        super(paginationController, queryStreamId, cacheKey, callback);
+        this.query = query;
+        this.queryStreamController = new CommunityMembersQueryStreamController(this.query, this.cacheKey, this.notifyChange.bind(this), prepareCommunityPayload);
+        this.callback = callback.bind(this);
+        this.loadPage({ initial: true });
+    }
+    setup() {
+        var _a;
+        const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+        if (!collection) {
+            pushToCache(this.cacheKey, {
+                data: [],
+                params: {},
+            });
+        }
+    }
+    async persistModel(queryPayload) {
+        await this.queryStreamController.saveToMainDB(queryPayload);
+    }
+    persistQueryStream({ response, direction, refresh, }) {
+        this.queryStreamController.appendToQueryStream(response, direction, refresh);
+    }
+    startSubscription() {
+        return this.queryStreamController.subscribeRTE([
+            { fn: onCommunityJoined, action: EnumCommunityMemberActions.OnCommunityJoined },
+            { fn: onCommunityLeft, action: EnumCommunityMemberActions.OnCommunityLeft },
+            { fn: onCommunityUserBanned, action: EnumCommunityMemberActions.OnCommunityUserBanned },
+            { fn: onCommunityUserChanged, action: EnumCommunityMemberActions.OnCommunityUserChanged },
+            { fn: onCommunityUserRoleAdded, action: EnumCommunityMemberActions.OnCommunityUserRoleAdded },
+            {
+                fn: onCommunityUserRoleRemoved,
+                action: EnumCommunityMemberActions.OnCommunityUserRoleRemoved,
+            },
+            { fn: onCommunityUserUnbanned, action: EnumCommunityMemberActions.OnCommunityUserUnbanned },
+        ]);
+    }
+    notifyChange({ origin, loading, error }) {
         var _a, _b;
-        const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-        const communityMembers = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
-        if (!initial && communityMembers.length > 0 && !(collection === null || collection === void 0 ? void 0 : collection.params.page))
+        const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+        if (!collection)
             return;
-        const query = createQuery(queryCommunityMembers, Object.assign(Object.assign({}, queryParams), { limit: initial ? limit : undefined, page: !initial ? collection === null || collection === void 0 ? void 0 : collection.params.page : undefined }));
-        runQuery(query, ({ data: result, error, loading, paging }) => {
-            const data = {
-                loading,
-                error,
-                params: { page: paging === null || paging === void 0 ? void 0 : paging.next },
-                data: communityMembers,
-            };
-            if (result) {
-                data.data = [
-                    ...new Set([...communityMembers, ...result.map(getResolver('communityUsers'))]),
-                ];
-            }
-            pushToCache(cacheKey, data);
-            pushToCache(cacheByCommunityIdKey, data);
-            responder(data);
-        }, queryOptions(policy));
-    };
-    disposers.push(onCommunityLeft(realtimeRouter()), onCommunityJoined(realtimeRouter()), onCommunityUserBanned(realtimeRouter()), onCommunityUserUnbanned(realtimeRouter()), onCommunityUserChanged(realtimeRouter()), onCommunityUserRoleAdded(realtimeRouter()), onCommunityUserRoleRemoved(realtimeRouter()));
-    onFetch(true);
+        const data = this.applyFilter((_b = collection.data
+            .map(id => pullFromCache(['communityUsers', 'get', id]))
+            .filter(isNonNullable)
+            .map(({ data }) => data)) !== null && _b !== void 0 ? _b : []);
+        if (!this.shouldNotify(data) && origin === 'event')
+            return;
+        this.callback({
+            onNextPage: () => this.loadPage({ direction: "next" /* Amity.LiveCollectionPageDirection.NEXT */ }),
+            data,
+            hasNextPage: !!this.paginationController.getNextToken(),
+            loading,
+            error,
+        });
+    }
+    applyFilter(data) {
+        let communityMembers = filterByPropIntersection(data, 'roles', this.query.roles);
+        if (this.query.memberships) {
+            communityMembers = communityMembers.filter(({ communityMembership }) => {
+                const memberships = this.query.memberships || [];
+                return memberships.includes(communityMembership);
+            });
+        }
+        if (this.query.search) {
+            communityMembers = filterBySearchTerm(communityMembers, this.query.search);
+        }
+        const sortBy = this.query.sortBy ? this.query.sortBy : 'lastCreated';
+        switch (sortBy) {
+            case 'lastCreated':
+                communityMembers = communityMembers.sort(sortByLastCreated);
+                break;
+            case 'firstCreated':
+                communityMembers = communityMembers.sort(sortByFirstCreated);
+                break;
+            case 'displayName':
+                communityMembers = communityMembers.sort((memberA, memberB) => {
+                    if (!memberA.user || !memberB.user)
+                        return 0;
+                    return sortByDisplayName(memberA.user, memberB.user);
+                });
+                break;
+        }
+        return communityMembers;
+    }
+}
+
+/*
+ * Exported for testing
+ * @hidden
+ */
+const applyFilter = (data, params) => {
+    let communityMembers = filterByPropIntersection(data, 'roles', params.roles);
+    if (params.memberships) {
+        communityMembers = communityMembers.filter(({ communityMembership }) => {
+            const membership = params.memberships;
+            return membership.includes(communityMembership);
+        });
+    }
+    if (params.search) {
+        communityMembers = filterBySearchTerm(communityMembers, params.search);
+    }
+    const sortBy = params.sortBy ? params.sortBy : 'lastCreated';
+    communityMembers = communityMembers.sort(sortBy === 'lastCreated' ? sortByLastCreated : sortByFirstCreated);
+    return communityMembers;
+};
+/* begin_public_function
+  id: community.membership.query
+*/
+/**
+ * ```js
+ * import { getMembers } from '@amityco/ts-sdk-react-native'
+ *
+ * let communityMembers = []
+ * const unsub = getMembers({
+ *   communityId: Amity.Community['communityId'],
+ * }, response => merge(communityMembers, response.data))
+ * ```
+ *
+ * Observe all mutations on a list of {@link Amity.CommunityUser}s
+ *
+ * @param params for querying community users
+ * @param callback the function to call when new data are available
+ * @returns An {@link Amity.Unsubscriber} function to run when willing to stop observing the community users
+ *
+ * @category Community Live Collection
+ */
+const getMembers = (params, callback, config) => {
+    const { log, cache } = getActiveClient();
+    if (!cache) {
+        console.log(ENABLE_CACHE_MESSAGE);
+    }
+    const timestamp = Date.now();
+    log(`getMembers(tmpid: ${timestamp}) > listen`);
+    const communityMemberLiveCollection = new CommunityMembersLiveCollectionController(params, resp => {
+        console.log('resp', resp);
+        callback(resp);
+    });
+    const disposers = communityMemberLiveCollection.startSubscription();
+    const cacheKey = communityMemberLiveCollection.getCacheKey();
+    disposers.push(() => {
+        dropFromCache(cacheKey);
+    });
     return () => {
         log(`getMembers(tmpid: ${timestamp}) > dispose`);
         disposers.forEach(fn => fn());
@@ -35468,6 +35787,7 @@ var index$8 = /*#__PURE__*/Object.freeze({
   onCommunityUpdated: onCommunityUpdated,
   onCommunityDeleted: onCommunityDeleted,
   observeCommunity: observeCommunity,
+  searchCommunities: searchCommunities,
   getCommunities: getCommunities,
   getCommunity: getCommunity,
   getTrendingCommunities: getTrendingCommunities,
@@ -36054,7 +36374,7 @@ const updatePost = async (postId, patch) => {
     const cachedAt = client.cache && Date.now();
     if (client.cache)
         ingestInCache(data, { cachedAt });
-    fireEvent('post.updated', data);
+    fireEvent('local.post.updated', data);
     const { posts } = data;
     return {
         data: LinkedObject.post(posts.find(post => post.postId === postId)),
@@ -36091,7 +36411,7 @@ const editPost = async (postId, patch) => {
     const cachedAt = client.cache && Date.now();
     if (client.cache)
         ingestInCache(data, { cachedAt });
-    fireEvent('post.updated', data);
+    fireEvent('local.post.updated', data);
     const { posts } = data;
     return {
         data: LinkedObject.post(posts.find(post => post.postId === postId)),
@@ -36465,347 +36785,63 @@ const observePost = (postId, callback, policy = 'cache_then_server') => {
 };
 
 /* begin_public_function
-  id: post.get
+  id: comment.get_by_ids
 */
 /**
  * ```js
- * import { PostRepository } from '@amityco/ts-sdk-react-native';
+ * import { CommentRepository } from '@amityco/ts-sdk-react-native'
+ * const comments = await CommentRepository.getCommentByIds(['foo', 'bar'])
+ * ```
  *
- * let post;
+ * Fetches a collection of {@link Amity.Comment} objects
  *
- * const unsub = PostRepository.getPost(postId, response => {
- *   post = response.data;
- * });
+ * @param commentIds the IDs of the {@link Amity.Comment} to fetch
+ * @returns the associated collection of {@link Amity.Comment} objects
+ *
+ * @category Comment API
+ * @async
+ */
+const getCommentByIds = async (commentIds) => {
+    const client = getActiveClient();
+    client.log('comment/getCommentByIds', commentIds);
+    const encodedCommentIds = commentIds.map(commentId => encodeURIComponent(commentId));
+    let data;
+    try {
+        // API-FIX: endpoint should not be /list, parameters should be querystring.
+        const response = await client.http.get(`/api/v3/comments/list`, {
+            params: { commentIds: encodedCommentIds },
+        });
+        data = response.data;
+    }
+    catch (error) {
+        commentIds.forEach(commentId => {
+            if (checkIfShouldGoesToTombstone(error === null || error === void 0 ? void 0 : error.code)) {
+                pushToTombstone('comment', commentId);
+            }
+        });
+        throw error;
+    }
+    const cachedAt = client.cache && Date.now();
+    if (client.cache)
+        ingestInCache(data, { cachedAt });
+    return {
+        data: data.comments.map(comment => LinkedObject.comment(comment)),
+        cachedAt,
+    };
+};
+/* end_public_function */
+/**
+ * ```js
+ * import { getCommentByIds } from '@amityco/ts-sdk-react-native'
+ * const comments = getCommentByIds.locally(['foo', 'bar'])
  * ```
  *
- * Observe all mutation on a given {@link Amity.Post}
+ * Fetches a collection of {@link Amity.Comment} objects from cache
  *
- * @param postId the ID of the message to observe
- * @param callback the function to call when new data are available
- * @returns An {@link Amity.Unsubscriber} function to run when willing to stop observing the sub channel
+ * @param commentIds the IDs of the {@link Amity.Comment} to fetch
+ * @returns the associated collection of {@link Amity.Comment} objects
  *
- * @category Post Live Object
- */
-const getPost = (postId, callback) => {
-    return liveObject(postId, callback, 'postId', getPost$1, [
-        onPostApproved,
-        onPostDeclined,
-        (callback) => {
-            return onPostDeleted((post) => {
-                var _a;
-                let targetPost = post;
-                // check if the deleted post is a child of the target post
-                if (post.parentPostId === postId && post.isDeleted) {
-                    const parentPost = (_a = pullFromCache([
-                        'post',
-                        'get',
-                        post.parentPostId,
-                    ])) === null || _a === void 0 ? void 0 : _a.data;
-                    if (parentPost) {
-                        parentPost.children = parentPost.children.filter(childId => childId !== post.postId);
-                        pushToCache(['post', 'get', parentPost.postId], parentPost);
-                        // if the deleted post is a child of the target post, then the target post is the parent post
-                        targetPost = parentPost;
-                    }
-                }
-                callback(targetPost);
-            });
-        },
-        onPostFlagged,
-        (callback) => {
-            return onPostReactionAdded((post) => {
-                callback(LinkedObject.post(post));
-            });
-        },
-        (callback) => {
-            return onPostReactionRemoved((post) => {
-                callback(LinkedObject.post(post));
-            });
-        },
-        onPostUnflagged,
-        onPostUpdated,
-    ]);
-};
-/* end_public_function */
-
-/**
- * ```js
- * import { queryPosts } from '@amityco/ts-sdk-react-native'
- * const { data: posts, prevPage, nextPage } = await queryPosts({ targetId, targetType })
- * ```
- *
- * Queries a paginable list of {@link Amity.Post} objects
- *
- * @param query The query parameters
- * @returns posts
- *
- * @category Post API
- * @async
- */
-const queryPosts = async (query) => {
-    const client = getActiveClient();
-    client.log('post/queryPosts', query);
-    const { page, limit = 10, includeDeleted } = query, params = __rest(query, ["page", "limit", "includeDeleted"]);
-    const { dataTypes, matchingOnlyParentPost } = params;
-    const options = (() => {
-        if (page)
-            return { token: page };
-        if (limit)
-            return { limit };
-        return undefined;
-    })();
-    // API-FIX: parameters should be querystring. (1)
-    // API-FIX: backend should answer Amity.Response (2)
-    // const { data } = await client.http.get<Amity.Response<Amity.PagedResponse<Amity.PostPayload>>>(
-    const { data } = await client.http.get(`/api/v4/posts`, {
-        params: Object.assign(Object.assign({}, params), { isDeleted: inferIsDeleted(includeDeleted), 
-            /*
-             * when creating post like image, file, video BE will create 2 posts
-             * 1. parent post to store text with dataType=text
-             * 2. child post to store dataTypes post data
-             *
-             * By default, BE queries only parent post
-             */
-            matchingOnlyParentPost: matchingOnlyParentPost !== null && matchingOnlyParentPost !== void 0 ? matchingOnlyParentPost : !(dataTypes === null || dataTypes === void 0 ? void 0 : dataTypes.length), options }),
-    });
-    // API-FIX: backend should answer Amity.Response (2)
-    // const { paging, posts } = unwrapPayload(data)
-    // unpacking
-    const { paging } = data, payload = __rest(data, ["paging"]);
-    const paperedPayload = prepareMembershipPayload(payload, 'communityUsers');
-    const { posts } = payload;
-    const cachedAt = client.cache && Date.now();
-    if (client.cache) {
-        ingestInCache(paperedPayload, { cachedAt });
-        const cacheKey = ['post', 'query', Object.assign(Object.assign({}, params), { options })];
-        pushToCache(cacheKey, { posts: posts.map(getResolver('post')), paging });
-    }
-    return { data: posts.map(LinkedObject.post), cachedAt, paging };
-};
-
-/* begin_public_function
-  id: post.query
-*/
-/**
- * ```js
- * import { PostRepository } from '@amityco/ts-sdk-react-native'
- *
- * let posts = []
- * const unsub = PostRepository.getPosts({
- *   targetType: Amity.PostTargetType,
- *   targetId: Amity.Post['targetId'],
- * }, response => merge(posts, response.data))
- * ```
- *
- * Observe all mutations on a list of {@link Amity.Post} for a given target object
- *
- * @param params.targetType the type of the target
- * @param params.targetId the ID of the target
- * @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 messages
- *
- * @category Posts Live Collection
- */
-const getPosts = (params, callback, config) => {
-    const { log, cache } = getActiveClient();
-    if (!cache) {
-        console.log(ENABLE_CACHE_MESSAGE);
-    }
-    const timestamp = Date.now();
-    log(`getPosts(tmpid: ${timestamp}) > listen`);
-    const { limit: queryLimit } = params, queryParams = __rest(params, ["limit"]);
-    const limit = queryLimit !== null && queryLimit !== void 0 ? queryLimit : COLLECTION_DEFAULT_PAGINATION_LIMIT;
-    const { policy = COLLECTION_DEFAULT_CACHING_POLICY } = config !== null && config !== void 0 ? config : {};
-    const disposers = [];
-    const cacheKey = [
-        'post',
-        'collection',
-        { targetId: params.targetId, targetType: params.targetType },
-    ];
-    const responder = (data) => {
-        var _a, _b, _c;
-        let posts = (_a = data.data
-            .map(postId => pullFromCache(['post', 'get', postId]))
-            .filter(Boolean)
-            .map(({ data }) => LinkedObject.post(data))) !== null && _a !== void 0 ? _a : [];
-        const sortBy = params.sortBy ? params.sortBy : 'lastCreated';
-        posts = posts.sort(sortBy === 'lastCreated' ? sortByLastCreated : sortByFirstCreated);
-        if (!params.includeDeleted) {
-            posts = filterByPropEquality(posts, 'isDeleted', false);
-        }
-        if (params.tags) {
-            posts = posts.filter(p => { var _a; return (_a = p.tags) === null || _a === void 0 ? void 0 : _a.some(t => { var _a; return (_a = params.tags) === null || _a === void 0 ? void 0 : _a.includes(t); }); });
-        }
-        if (params.targetType === 'community' && params.feedType) {
-            posts = filterByFeedType(posts, params.feedType);
-        }
-        if ((_b = params.dataTypes) === null || _b === void 0 ? void 0 : _b.length) {
-            posts = filterByPostDataTypes(posts, params.dataTypes);
-        }
-        callback({
-            onNextPage: onFetch,
-            data: posts,
-            hasNextPage: !!((_c = data.params) === null || _c === void 0 ? void 0 : _c.page),
-            loading: data.loading,
-            error: data.error,
-        });
-    };
-    const realtimeRouter = (action) => (post) => {
-        var _a, _b;
-        const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-        if (!collection)
-            return;
-        if (post.parentPostId && post.isDeleted) {
-            const parentPost = (_b = pullFromCache([
-                'post',
-                'get',
-                post.parentPostId,
-            ])) === null || _b === void 0 ? void 0 : _b.data;
-            if (!parentPost || (parentPost === null || parentPost === void 0 ? void 0 : parentPost.targetId) !== params.targetId)
-                return;
-            parentPost.children = parentPost.children.filter(childId => childId !== post.postId);
-            pushToCache(['post', 'get', parentPost.postId], parentPost);
-        }
-        else {
-            if (params.targetId !== post.targetId)
-                return;
-            if (params.targetType !== post.targetType)
-                return;
-        }
-        /*
-         * This is not ideal, but currently this is the only way to update the
-         * collection on post declined
-         */
-        if (action === 'onDeclined') {
-            collection.data = collection.data.filter(postId => postId !== post.postId);
-        }
-        else {
-            collection.data = [...new Set([post.postId, ...collection.data])];
-        }
-        pushToCache(cacheKey, collection);
-        responder(collection);
-    };
-    const onFetch = (initial = false) => {
-        var _a, _b, _c;
-        const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-        const posts = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
-        if (!initial && posts.length > 0 && !((_c = collection === null || collection === void 0 ? void 0 : collection.params) === null || _c === void 0 ? void 0 : _c.page))
-            return;
-        const query = createQuery(queryPosts, Object.assign(Object.assign({}, queryParams), { limit: initial ? limit : undefined, page: !initial ? collection === null || collection === void 0 ? void 0 : collection.params.page : undefined }));
-        runQuery(query, ({ data: result, error, loading, paging }) => {
-            const data = {
-                loading,
-                error,
-                params: { page: paging === null || paging === void 0 ? void 0 : paging.next },
-                data: posts,
-            };
-            if (result) {
-                data.data = initial
-                    ? result.map(getResolver('post'))
-                    : [...new Set([...posts, ...result.map(getResolver('post'))])];
-            }
-            pushToCache(cacheKey, data);
-            responder(data);
-        }, queryOptions(policy, CACHE_SHORTEN_LIFESPAN));
-    };
-    disposers.push(onPostCreated(realtimeRouter('onCreate')), onPostApproved(realtimeRouter('onApproved')), onPostDeclined(realtimeRouter('onDeclined')), onPostDeleted(realtimeRouter('onDelete')), onPostUpdated(realtimeRouter('onUpdate')), onPostFlagged(realtimeRouter('onFlagged')), onPostUnflagged(realtimeRouter('onUnflagged')), onPostReactionAdded(realtimeRouter('onReactionAdded')), onPostReactionRemoved(realtimeRouter('onReactionRemoved')));
-    onFetch(true);
-    disposers.push(() => dropFromCache(cacheKey));
-    return () => {
-        log(`getPosts(tmpid: ${timestamp}) > dispose`);
-        disposers.forEach(fn => fn());
-    };
-};
-/* end_public_function */
-
-var index$5 = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  getPostByIds: getPostByIds,
-  createPost: createPost,
-  updatePost: updatePost,
-  editPost: editPost,
-  deletePost: deletePost,
-  softDeletePost: softDeletePost,
-  hardDeletePost: hardDeletePost,
-  approvePost: approvePost,
-  declinePost: declinePost,
-  flagPost: flagPost,
-  unflagPost: unflagPost,
-  isPostFlaggedByMe: isPostFlaggedByMe,
-  onPostCreated: onPostCreated,
-  onPostUpdated: onPostUpdated,
-  onPostDeleted: onPostDeleted,
-  onPostApproved: onPostApproved,
-  onPostDeclined: onPostDeclined,
-  onPostFlagged: onPostFlagged,
-  onPostUnflagged: onPostUnflagged,
-  onPostReactionAdded: onPostReactionAdded,
-  onPostReactionRemoved: onPostReactionRemoved,
-  observePosts: observePosts,
-  observePost: observePost,
-  getPost: getPost,
-  getPosts: getPosts
-});
-
-/* begin_public_function
-  id: comment.get_by_ids
-*/
-/**
- * ```js
- * import { CommentRepository } from '@amityco/ts-sdk-react-native'
- * const comments = await CommentRepository.getCommentByIds(['foo', 'bar'])
- * ```
- *
- * Fetches a collection of {@link Amity.Comment} objects
- *
- * @param commentIds the IDs of the {@link Amity.Comment} to fetch
- * @returns the associated collection of {@link Amity.Comment} objects
- *
- * @category Comment API
- * @async
- */
-const getCommentByIds = async (commentIds) => {
-    const client = getActiveClient();
-    client.log('comment/getCommentByIds', commentIds);
-    const encodedCommentIds = commentIds.map(commentId => encodeURIComponent(commentId));
-    let data;
-    try {
-        // API-FIX: endpoint should not be /list, parameters should be querystring.
-        const response = await client.http.get(`/api/v3/comments/list`, {
-            params: { commentIds: encodedCommentIds },
-        });
-        data = response.data;
-    }
-    catch (error) {
-        commentIds.forEach(commentId => {
-            if (checkIfShouldGoesToTombstone(error === null || error === void 0 ? void 0 : error.code)) {
-                pushToTombstone('comment', commentId);
-            }
-        });
-        throw error;
-    }
-    const cachedAt = client.cache && Date.now();
-    if (client.cache)
-        ingestInCache(data, { cachedAt });
-    return {
-        data: data.comments.map(comment => LinkedObject.comment(comment)),
-        cachedAt,
-    };
-};
-/* end_public_function */
-/**
- * ```js
- * import { getCommentByIds } from '@amityco/ts-sdk-react-native'
- * const comments = getCommentByIds.locally(['foo', 'bar'])
- * ```
- *
- * Fetches a collection of {@link Amity.Comment} objects from cache
- *
- * @param commentIds the IDs of the {@link Amity.Comment} to fetch
- * @returns the associated collection of {@link Amity.Comment} objects
- *
- * @category Comment API
+ * @category Comment API
  */
 getCommentByIds.locally = (commentIds) => {
     var _a;
@@ -36856,7 +36892,7 @@ const createComment = async (bundle) => {
         ingestInCache(data, { cachedAt });
     if (['post', 'content'].includes(bundle.referenceType)) {
         const post = await getPost$1(bundle.referenceId);
-        fireEvent('post.updated', {
+        fireEvent('local.post.updated', {
             posts: [post.data],
             categories: [],
             comments: [],
@@ -36894,7 +36930,7 @@ const createComment = async (bundle) => {
             }
         }
     }
-    fireEvent('comment.created', data);
+    fireEvent('local.comment.created', data);
     return {
         data: LinkedObject.comment(comments[0]),
         cachedAt,
@@ -37050,8 +37086,7 @@ const deleteComment = async (commentId, permanent = false) => {
     }
     else {
         const post = await getPost$1(comment.data.referenceId);
-        // @TODO: Need to separate Local / MQTT later
-        fireEvent('post.updated', {
+        fireEvent('local.post.updated', {
             posts: [post.data],
             categories: [],
             comments: [],
@@ -37063,8 +37098,7 @@ const deleteComment = async (commentId, permanent = false) => {
             users: [],
         });
     }
-    // @TODO: Need to separate Local / MQTT later
-    fireEvent('comment.deleted', {
+    fireEvent('local.comment.deleted', {
         comments: [deleted],
         commentChildren: [],
         files: [],
@@ -37376,125 +37410,421 @@ const getComment = (commentId, callback) => {
 };
 /* end_public_function */
 
-const convertToInternalComment = (commentPayload) => {
-    const { comments } = commentPayload;
-    return Object.assign(Object.assign({}, commentPayload), { comments: comments.map(comment => {
-            if (comment.hasOwnProperty('myReactions'))
-                return comment;
-            // Sometimes `myReactions` field will not come with BE response because that field is empty
-            // We need to put it with an empty array manually to make it show up in client side
-            return Object.assign({ myReactions: [] }, comment);
-        }) });
-};
-
-const queryComments = async (query) => {
+const convertToInternalComment = (commentPayload) => {
+    const { comments } = commentPayload;
+    return Object.assign(Object.assign({}, commentPayload), { comments: comments.map(comment => {
+            if (comment.hasOwnProperty('myReactions'))
+                return comment;
+            // Sometimes `myReactions` field will not come with BE response because that field is empty
+            // We need to put it with an empty array manually to make it show up in client side
+            return Object.assign({ myReactions: [] }, comment);
+        }) });
+};
+
+const queryComments = async (query) => {
+    const client = getActiveClient();
+    client.log('comment/queryComments', query);
+    const { limit = 10, includeDeleted } = query, params = __rest(query, ["limit", "includeDeleted"]);
+    const options = {
+        type: params.sortBy || query.limit ? 'pagination' : undefined,
+        limit: query.limit,
+        token: query.page,
+    };
+    // const filterByParentId = query.parentId !== undefined
+    // API-FIX: parameters should be querystring. (1)
+    // API-FIX: backend should answer Amity.Response (2)
+    // const { data } = await client.http.get<Amity.Response<Amity.PagedResponse<Amity.CommentPayload>>>(
+    const { data } = await client.http.get(`/api/v3/comments`, {
+        params: Object.assign(Object.assign({}, params), { isDeleted: inferIsDeleted(includeDeleted), 
+            //      filterByParentId, API-FIX: backend does not support this boolean LOL. what the hell seriously.
+            options }),
+    });
+    // API-FIX: backend should answer Amity.Response (2)
+    // const { paging, comments } = unwrapPayload(data)
+    const { paging } = data, payload = __rest(data, ["paging"]);
+    const processedData = convertToInternalComment(payload);
+    const { comments } = processedData;
+    const cachedAt = client.cache && Date.now();
+    if (client.cache) {
+        ingestInCache(processedData, { cachedAt });
+        const cacheKey = ['comment', 'query', Object.assign(Object.assign({}, params), { options: { limit } })];
+        pushToCache(cacheKey, { comments: comments.map(getResolver('comment')), paging });
+    }
+    return { data: comments, cachedAt, paging };
+};
+
+/* begin_public_function
+  id: comment.query
+*/
+/**
+ * ```js
+ * import { getComments } from '@amityco/ts-sdk-react-native'
+ *
+ * let comments = []
+ * const unsub = getComments({
+ *   referenceType: Amity.InternalComment['referenceType'];
+ *   referenceId: Amity.InternalComment['referenceId'];
+ * }, response => merge(comments, response.data))
+ * ```
+ *
+ * Observe all mutations on a list of {@link Amity.InternalComment} for a given target object
+ *
+ * @param referenceType the type of the target
+ * @param referenceId the ID of the target
+ * @param callback the function to call when new data are available
+ * @returns An {@link Amity.Unsubscriber} function to run when willing to stop observing the messages
+ *
+ * @category Comments Live Collection
+ */
+const getComments = (params, callback, config) => {
+    const { log, cache } = getActiveClient();
+    if (!cache) {
+        console.log('For using Live Collection feature you need to enable Cache!');
+    }
+    const timestamp = Date.now();
+    log(`getComments(tmpid: ${timestamp}) > listen`);
+    const { limit: queryLimit } = params, queryParams = __rest(params, ["limit"]);
+    const { policy = COLLECTION_DEFAULT_CACHING_POLICY } = config !== null && config !== void 0 ? config : {};
+    const disposers = [];
+    const sortBy = params.sortBy ? params.sortBy : 'lastCreated';
+    const cacheKey = [
+        'comment',
+        'collection',
+        {
+            referenceId: params.referenceType,
+            referenceType: params.referenceId,
+            parentId: (params === null || params === void 0 ? void 0 : params.parentId) || '',
+            sortBy,
+        },
+    ];
+    const responder = (data) => {
+        var _a, _b;
+        let comments = (_a = data.data
+            .map(commentId => pullFromCache(['comment', 'get', commentId]))
+            .filter(({ data }) => data.parentId === (params === null || params === void 0 ? void 0 : params.parentId))
+            .filter(Boolean)
+            .map(({ data }) => LinkedObject.comment(data))) !== null && _a !== void 0 ? _a : [];
+        if (!params.includeDeleted) {
+            comments = filterByPropEquality(comments, 'isDeleted', false);
+        }
+        comments = comments.sort(sortBy === 'lastCreated' ? sortByLastCreated : sortByFirstCreated);
+        callback({
+            onNextPage: onFetch,
+            data: comments,
+            hasNextPage: !!((_b = data.params) === null || _b === void 0 ? void 0 : _b.page),
+            loading: data.loading,
+            error: data.error,
+        });
+    };
+    const realtimeRouter = (action) => (comment) => {
+        var _a;
+        const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+        if (params.referenceId !== comment.referenceId ||
+            params.referenceType !== comment.referenceType ||
+            !collection) {
+            return;
+        }
+        if (action === 'onCreate') {
+            collection.data = [...new Set([comment.commentId, ...collection.data])];
+        }
+        else if (action === 'onDelete') {
+            collection.data = collection.data.filter(p => p !== comment.commentId);
+        }
+        pushToCache(cacheKey, collection);
+        responder(collection);
+    };
+    const onFetch = (initial = false) => {
+        var _a, _b, _c;
+        const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+        const comments = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
+        if (!initial && comments.length > 0 && !((_c = collection === null || collection === void 0 ? void 0 : collection.params) === null || _c === void 0 ? void 0 : _c.page))
+            return;
+        const query = createQuery(queryComments, Object.assign(Object.assign({}, queryParams), { limit: queryLimit, page: !initial ? collection === null || collection === void 0 ? void 0 : collection.params.page : undefined }));
+        runQuery(query, ({ data: result, error, loading, paging }) => {
+            const page = paging === null || paging === void 0 ? void 0 : paging.next;
+            const data = {
+                loading,
+                error,
+                params: { page },
+                data: comments,
+            };
+            if (result) {
+                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);
+            responder(data);
+        }, queryOptions(policy, CACHE_SHORTEN_LIFESPAN));
+    };
+    disposers.push(onCommentCreated(realtimeRouter('onCreate')), onCommentUpdated(realtimeRouter('onUpdate')), onCommentDeleted(realtimeRouter('onDelete')), onCommentFlagged(realtimeRouter('onFlagged')), onCommentUnflagged(realtimeRouter('onUnflagged')), onCommentReactionAdded(realtimeRouter('onReactionAdded')), onCommentReactionRemoved(realtimeRouter('onReactionRemoved')));
+    onFetch(true);
+    disposers.push(() => dropFromCache(cacheKey));
+    return () => {
+        log(`getComments(tmpid: ${timestamp}) > dispose`);
+        disposers.forEach(fn => fn());
+    };
+};
+/* end_public_function */
+
+var index$5 = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  getCommentByIds: getCommentByIds,
+  createComment: createComment,
+  updateComment: updateComment,
+  deleteComment: deleteComment,
+  softDeleteComment: softDeleteComment,
+  hardDeleteComment: hardDeleteComment,
+  flagComment: flagComment,
+  unflagComment: unflagComment,
+  isCommentFlaggedByMe: isCommentFlaggedByMe,
+  onCommentCreated: onCommentCreated,
+  onCommentUpdated: onCommentUpdated,
+  onCommentDeleted: onCommentDeleted,
+  onCommentFlagged: onCommentFlagged,
+  onCommentUnflagged: onCommentUnflagged,
+  onCommentReactionAdded: onCommentReactionAdded,
+  onCommentReactionRemoved: onCommentReactionRemoved,
+  observeComments: observeComments,
+  observeComment: observeComment,
+  getComment: getComment,
+  getComments: getComments
+});
+
+/* begin_public_function
+  id: post.get
+*/
+/**
+ * ```js
+ * import { PostRepository } from '@amityco/ts-sdk-react-native';
+ *
+ * let post;
+ *
+ * const unsub = PostRepository.getPost(postId, response => {
+ *   post = response.data;
+ * });
+ * ```
+ *
+ * Observe all mutation on a given {@link Amity.Post}
+ *
+ * @param postId the ID of the message to observe
+ * @param callback the function to call when new data are available
+ * @returns An {@link Amity.Unsubscriber} function to run when willing to stop observing the sub channel
+ *
+ * @category Post Live Object
+ */
+const getPost = (postId, callback) => {
+    return liveObject(postId, callback, 'postId', getPost$1, [
+        onPostApproved,
+        onPostDeclined,
+        (callback) => {
+            return onPostDeleted((post) => {
+                var _a;
+                let targetPost = post;
+                // check if the deleted post is a child of the target post
+                if (post.parentPostId === postId && post.isDeleted) {
+                    const parentPost = (_a = pullFromCache([
+                        'post',
+                        'get',
+                        post.parentPostId,
+                    ])) === null || _a === void 0 ? void 0 : _a.data;
+                    if (parentPost) {
+                        parentPost.children = parentPost.children.filter(childId => childId !== post.postId);
+                        pushToCache(['post', 'get', parentPost.postId], parentPost);
+                        // if the deleted post is a child of the target post, then the target post is the parent post
+                        targetPost = parentPost;
+                    }
+                }
+                callback(targetPost);
+            });
+        },
+        onPostFlagged,
+        (callback) => {
+            return onPostReactionAdded((post) => {
+                callback(LinkedObject.post(post));
+            });
+        },
+        (callback) => {
+            return onPostReactionRemoved((post) => {
+                callback(LinkedObject.post(post));
+            });
+        },
+        onPostUnflagged,
+        onPostUpdated,
+        convertEventPayload((callback) => {
+            return onCommentCreated(async (comment) => {
+                if (comment.referenceId === postId) {
+                    await getPost$1(postId);
+                    callback(comment);
+                }
+            });
+        }, 'referenceId', 'post'),
+        convertEventPayload((callback) => {
+            return onCommentDeleted(async (comment) => {
+                if (comment.referenceId === postId) {
+                    await getPost$1(postId);
+                    callback(comment);
+                }
+            });
+        }, 'referenceId', 'post'),
+    ]);
+};
+/* end_public_function */
+
+/**
+ * ```js
+ * import { queryPosts } from '@amityco/ts-sdk-react-native'
+ * const { data: posts, prevPage, nextPage } = await queryPosts({ targetId, targetType })
+ * ```
+ *
+ * Queries a paginable list of {@link Amity.Post} objects
+ *
+ * @param query The query parameters
+ * @returns posts
+ *
+ * @category Post API
+ * @async
+ */
+const queryPosts = async (query) => {
     const client = getActiveClient();
-    client.log('comment/queryComments', query);
-    const { limit = 10, includeDeleted } = query, params = __rest(query, ["limit", "includeDeleted"]);
-    const options = {
-        type: params.sortBy || query.limit ? 'pagination' : undefined,
-        limit: query.limit,
-        token: query.page,
-    };
-    // const filterByParentId = query.parentId !== undefined
+    client.log('post/queryPosts', query);
+    const { page, limit = 10, includeDeleted } = query, params = __rest(query, ["page", "limit", "includeDeleted"]);
+    const { dataTypes, matchingOnlyParentPost } = params;
+    const options = (() => {
+        if (page)
+            return { token: page };
+        if (limit)
+            return { limit };
+        return undefined;
+    })();
     // API-FIX: parameters should be querystring. (1)
     // API-FIX: backend should answer Amity.Response (2)
-    // const { data } = await client.http.get<Amity.Response<Amity.PagedResponse<Amity.CommentPayload>>>(
-    const { data } = await client.http.get(`/api/v3/comments`, {
+    // const { data } = await client.http.get<Amity.Response<Amity.PagedResponse<Amity.PostPayload>>>(
+    const { data } = await client.http.get(`/api/v4/posts`, {
         params: Object.assign(Object.assign({}, params), { isDeleted: inferIsDeleted(includeDeleted), 
-            //      filterByParentId, API-FIX: backend does not support this boolean LOL. what the hell seriously.
-            options }),
+            /*
+             * when creating post like image, file, video BE will create 2 posts
+             * 1. parent post to store text with dataType=text
+             * 2. child post to store dataTypes post data
+             *
+             * By default, BE queries only parent post
+             */
+            matchingOnlyParentPost: matchingOnlyParentPost !== null && matchingOnlyParentPost !== void 0 ? matchingOnlyParentPost : !(dataTypes === null || dataTypes === void 0 ? void 0 : dataTypes.length), options }),
     });
     // API-FIX: backend should answer Amity.Response (2)
-    // const { paging, comments } = unwrapPayload(data)
+    // const { paging, posts } = unwrapPayload(data)
+    // unpacking
     const { paging } = data, payload = __rest(data, ["paging"]);
-    const processedData = convertToInternalComment(payload);
-    const { comments } = processedData;
+    const paperedPayload = prepareMembershipPayload(payload, 'communityUsers');
+    const { posts } = payload;
     const cachedAt = client.cache && Date.now();
     if (client.cache) {
-        ingestInCache(processedData, { cachedAt });
-        const cacheKey = ['comment', 'query', Object.assign(Object.assign({}, params), { options: { limit } })];
-        pushToCache(cacheKey, { comments: comments.map(getResolver('comment')), paging });
+        ingestInCache(paperedPayload, { cachedAt });
+        const cacheKey = ['post', 'query', Object.assign(Object.assign({}, params), { options })];
+        pushToCache(cacheKey, { posts: posts.map(getResolver('post')), paging });
     }
-    return { data: comments, cachedAt, paging };
+    return { data: posts.map(LinkedObject.post), cachedAt, paging };
 };
 
 /* begin_public_function
-  id: comment.query
+  id: post.query
 */
 /**
  * ```js
- * import { getComments } from '@amityco/ts-sdk-react-native'
+ * import { PostRepository } from '@amityco/ts-sdk-react-native'
  *
- * let comments = []
- * const unsub = getComments({
- *   referenceType: Amity.InternalComment['referenceType'];
- *   referenceId: Amity.InternalComment['referenceId'];
- * }, response => merge(comments, response.data))
+ * let posts = []
+ * const unsub = PostRepository.getPosts({
+ *   targetType: Amity.PostTargetType,
+ *   targetId: Amity.Post['targetId'],
+ * }, response => merge(posts, response.data))
  * ```
  *
- * Observe all mutations on a list of {@link Amity.InternalComment} for a given target object
+ * Observe all mutations on a list of {@link Amity.Post} for a given target object
  *
- * @param referenceType the type of the target
- * @param referenceId the ID of the target
+ * @param params.targetType the type of the target
+ * @param params.targetId the ID of the target
  * @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 messages
  *
- * @category Comments Live Collection
+ * @category Posts Live Collection
  */
-const getComments = (params, callback, config) => {
+const getPosts = (params, callback, config) => {
     const { log, cache } = getActiveClient();
     if (!cache) {
-        console.log('For using Live Collection feature you need to enable Cache!');
+        console.log(ENABLE_CACHE_MESSAGE);
     }
     const timestamp = Date.now();
-    log(`getComments(tmpid: ${timestamp}) > listen`);
+    log(`getPosts(tmpid: ${timestamp}) > listen`);
     const { limit: queryLimit } = params, queryParams = __rest(params, ["limit"]);
+    const limit = queryLimit !== null && queryLimit !== void 0 ? queryLimit : COLLECTION_DEFAULT_PAGINATION_LIMIT;
     const { policy = COLLECTION_DEFAULT_CACHING_POLICY } = config !== null && config !== void 0 ? config : {};
     const disposers = [];
-    const sortBy = params.sortBy ? params.sortBy : 'lastCreated';
     const cacheKey = [
-        'comment',
+        'post',
         'collection',
-        {
-            referenceId: params.referenceType,
-            referenceType: params.referenceId,
-            parentId: (params === null || params === void 0 ? void 0 : params.parentId) || '',
-            sortBy,
-        },
+        { targetId: params.targetId, targetType: params.targetType },
     ];
     const responder = (data) => {
-        var _a, _b;
-        let comments = (_a = data.data
-            .map(commentId => pullFromCache(['comment', 'get', commentId]))
-            .filter(({ data }) => data.parentId === (params === null || params === void 0 ? void 0 : params.parentId))
+        var _a, _b, _c;
+        let posts = (_a = data.data
+            .map(postId => pullFromCache(['post', 'get', postId]))
             .filter(Boolean)
-            .map(({ data }) => LinkedObject.comment(data))) !== null && _a !== void 0 ? _a : [];
+            .map(({ data }) => LinkedObject.post(data))) !== null && _a !== void 0 ? _a : [];
+        const sortBy = params.sortBy ? params.sortBy : 'lastCreated';
+        posts = posts.sort(sortBy === 'lastCreated' ? sortByLastCreated : sortByFirstCreated);
         if (!params.includeDeleted) {
-            comments = filterByPropEquality(comments, 'isDeleted', false);
+            posts = filterByPropEquality(posts, 'isDeleted', false);
+        }
+        if (params.tags) {
+            posts = posts.filter(p => { var _a; return (_a = p.tags) === null || _a === void 0 ? void 0 : _a.some(t => { var _a; return (_a = params.tags) === null || _a === void 0 ? void 0 : _a.includes(t); }); });
+        }
+        if (params.targetType === 'community' && params.feedType) {
+            posts = filterByFeedType(posts, params.feedType);
+        }
+        if ((_b = params.dataTypes) === null || _b === void 0 ? void 0 : _b.length) {
+            posts = filterByPostDataTypes(posts, params.dataTypes);
         }
-        comments = comments.sort(sortBy === 'lastCreated' ? sortByLastCreated : sortByFirstCreated);
         callback({
             onNextPage: onFetch,
-            data: comments,
-            hasNextPage: !!((_b = data.params) === null || _b === void 0 ? void 0 : _b.page),
+            data: posts,
+            hasNextPage: !!((_c = data.params) === null || _c === void 0 ? void 0 : _c.page),
             loading: data.loading,
             error: data.error,
         });
     };
-    const realtimeRouter = (action) => (comment) => {
-        var _a;
+    const realtimeRouter = (action) => (post) => {
+        var _a, _b;
         const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-        if (params.referenceId !== comment.referenceId ||
-            params.referenceType !== comment.referenceType ||
-            !collection) {
+        if (!collection)
             return;
+        if (post.parentPostId && post.isDeleted) {
+            const parentPost = (_b = pullFromCache([
+                'post',
+                'get',
+                post.parentPostId,
+            ])) === null || _b === void 0 ? void 0 : _b.data;
+            if (!parentPost || (parentPost === null || parentPost === void 0 ? void 0 : parentPost.targetId) !== params.targetId)
+                return;
+            parentPost.children = parentPost.children.filter(childId => childId !== post.postId);
+            pushToCache(['post', 'get', parentPost.postId], parentPost);
         }
-        if (action === 'onCreate') {
-            collection.data = [...new Set([comment.commentId, ...collection.data])];
+        else {
+            if (params.targetId !== post.targetId)
+                return;
+            if (params.targetType !== post.targetType)
+                return;
         }
-        else if (action === 'onDelete') {
-            collection.data = collection.data.filter(p => p !== comment.commentId);
+        /*
+         * This is not ideal, but currently this is the only way to update the
+         * collection on post declined
+         */
+        if (action === 'onDeclined') {
+            collection.data = collection.data.filter(postId => postId !== post.postId);
+        }
+        else {
+            collection.data = [...new Set([post.postId, ...collection.data])];
         }
         pushToCache(cacheKey, collection);
         responder(collection);
@@ -37502,32 +37832,49 @@ const getComments = (params, callback, config) => {
     const onFetch = (initial = false) => {
         var _a, _b, _c;
         const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-        const comments = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
-        if (!initial && comments.length > 0 && !((_c = collection === null || collection === void 0 ? void 0 : collection.params) === null || _c === void 0 ? void 0 : _c.page))
+        const posts = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
+        if (!initial && posts.length > 0 && !((_c = collection === null || collection === void 0 ? void 0 : collection.params) === null || _c === void 0 ? void 0 : _c.page))
             return;
-        const query = createQuery(queryComments, Object.assign(Object.assign({}, queryParams), { limit: queryLimit, page: !initial ? collection === null || collection === void 0 ? void 0 : collection.params.page : undefined }));
+        const query = createQuery(queryPosts, Object.assign(Object.assign({}, queryParams), { limit: initial ? limit : undefined, page: !initial ? collection === null || collection === void 0 ? void 0 : collection.params.page : undefined }));
         runQuery(query, ({ data: result, error, loading, paging }) => {
-            const page = paging === null || paging === void 0 ? void 0 : paging.next;
             const data = {
                 loading,
                 error,
-                params: { page },
-                data: comments,
+                params: { page: paging === null || paging === void 0 ? void 0 : paging.next },
+                data: posts,
             };
             if (result) {
                 data.data = initial
-                    ? result.map(getResolver('comment')) // Replace a collection list with new data from BE
-                    : [...new Set([...comments, ...result.map(getResolver('comment'))])];
+                    ? result.map(getResolver('post'))
+                    : [...new Set([...posts, ...result.map(getResolver('post'))])];
             }
             pushToCache(cacheKey, data);
             responder(data);
         }, queryOptions(policy, CACHE_SHORTEN_LIFESPAN));
     };
-    disposers.push(onCommentCreated(realtimeRouter('onCreate')), onCommentUpdated(realtimeRouter('onUpdate')), onCommentDeleted(realtimeRouter('onDelete')), onCommentFlagged(realtimeRouter('onFlagged')), onCommentUnflagged(realtimeRouter('onUnflagged')), onCommentReactionAdded(realtimeRouter('onReactionAdded')), onCommentReactionRemoved(realtimeRouter('onReactionRemoved')));
+    disposers.push(onPostCreated(realtimeRouter('onCreate')), onPostApproved(realtimeRouter('onApproved')), onPostDeclined(realtimeRouter('onDeclined')), onPostDeleted(realtimeRouter('onDelete')), onPostUpdated(realtimeRouter('onUpdate')), onPostFlagged(realtimeRouter('onFlagged')), onPostUnflagged(realtimeRouter('onUnflagged')), onPostReactionAdded(realtimeRouter('onReactionAdded')), onPostReactionRemoved(realtimeRouter('onReactionRemoved')), convertEventPayload((callback) => {
+        return onCommentCreated(async (comment) => {
+            var _a;
+            const currentCollection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+            if (!currentCollection || currentCollection.data.includes(comment.referenceId))
+                return;
+            await getPost$1(comment.referenceId);
+            callback(comment);
+        });
+    }, 'referenceId', 'post')(realtimeRouter('onUpdate')), convertEventPayload((callback) => {
+        return onCommentDeleted(async (comment) => {
+            var _a;
+            const currentCollection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+            if (!currentCollection || currentCollection.data.includes(comment.referenceId))
+                return;
+            await getPost$1(comment.referenceId);
+            callback(comment);
+        });
+    }, 'referenceId', 'post')(realtimeRouter('onUpdate')));
     onFetch(true);
     disposers.push(() => dropFromCache(cacheKey));
     return () => {
-        log(`getComments(tmpid: ${timestamp}) > dispose`);
+        log(`getPosts(tmpid: ${timestamp}) > dispose`);
         disposers.forEach(fn => fn());
     };
 };
@@ -37535,26 +37882,31 @@ const getComments = (params, callback, config) => {
 
 var index$4 = /*#__PURE__*/Object.freeze({
   __proto__: null,
-  getCommentByIds: getCommentByIds,
-  createComment: createComment,
-  updateComment: updateComment,
-  deleteComment: deleteComment,
-  softDeleteComment: softDeleteComment,
-  hardDeleteComment: hardDeleteComment,
-  flagComment: flagComment,
-  unflagComment: unflagComment,
-  isCommentFlaggedByMe: isCommentFlaggedByMe,
-  onCommentCreated: onCommentCreated,
-  onCommentUpdated: onCommentUpdated,
-  onCommentDeleted: onCommentDeleted,
-  onCommentFlagged: onCommentFlagged,
-  onCommentUnflagged: onCommentUnflagged,
-  onCommentReactionAdded: onCommentReactionAdded,
-  onCommentReactionRemoved: onCommentReactionRemoved,
-  observeComments: observeComments,
-  observeComment: observeComment,
-  getComment: getComment,
-  getComments: getComments
+  getPostByIds: getPostByIds,
+  createPost: createPost,
+  updatePost: updatePost,
+  editPost: editPost,
+  deletePost: deletePost,
+  softDeletePost: softDeletePost,
+  hardDeletePost: hardDeletePost,
+  approvePost: approvePost,
+  declinePost: declinePost,
+  flagPost: flagPost,
+  unflagPost: unflagPost,
+  isPostFlaggedByMe: isPostFlaggedByMe,
+  onPostCreated: onPostCreated,
+  onPostUpdated: onPostUpdated,
+  onPostDeleted: onPostDeleted,
+  onPostApproved: onPostApproved,
+  onPostDeclined: onPostDeclined,
+  onPostFlagged: onPostFlagged,
+  onPostUnflagged: onPostUnflagged,
+  onPostReactionAdded: onPostReactionAdded,
+  onPostReactionRemoved: onPostReactionRemoved,
+  observePosts: observePosts,
+  observePost: observePost,
+  getPost: getPost,
+  getPosts: getPosts
 });
 
 /* begin_public_function
@@ -37955,7 +38307,7 @@ const queryStreams = async (query) => {
 */
 /**
  * ```js
- * import { StreamRepository } from '@amityco/ts-sdk-react-native'
+ * import { StreamRepository } from '@amityco/ts-sdk'
  * const streams = await StreamRepository.getStreams()
  * ```
  *
@@ -38386,7 +38738,7 @@ var index$2 = /*#__PURE__*/Object.freeze({
   getPoll: getPoll
 });
 
-const privateKey = "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDHo80SecH7FuF2\nhFYnb+l26/VN8UMLXAQFLnxciNTEwkGVFMpdezlH8rU2HtUJL4RETogbAOLVY0XM\njs6sPn8G1nALmh9qeDpUtVqFOVtBHxEZ910TLOtQiunjqJKO5nWdqZ71EC3OFluR\niGQkO84BiIFbv37ub7xl3S8XarbtKoLcyVpkDHi+1wx1pgCAn6gtBUgckPL5NR8j\nLseabl3HAXQfhTCKo4tmOFM2Dxwl1IUMmIJrJg/aIU/U0tj/1Eoo7mG0JcNWX19l\nW3EecCbi0ncCJOrkUdwlBrcjaMayaX/ubEwyUeTGiLdyc4L3GRLHjyK8xgVNXRMH\nbZWJ2a5NAgMBAAECggEASxuE+35zTFO/XydKgmvIGcWL9FbgMlXb7Vcf0nBoG945\nbiz0NVc2paraIhJXc608xbYF3qLmtAE1MVBI0ORyRdBHNxY024l/6H6SH60Ed+uI\nM4ysp5ourY6Vj+DLwpdRiI9YDjqYAQDIUmhNxJP7XPhOMoZI6st+xZQBM34ic/bv\nAMSJm9OZphSp3+qXVkFZztr2mxD2EZSJJLYxi8BCdgM2qhazalbcJ6zDKHCZWVWm\n8RRxDGldyMb/237JxETzP40tAlzOZDmBAbUgEnurDJ93RVDIE3rbZUshwgeQd18a\nem096mWgvB1AIKYgsTAR3pw+V19YWAjq/glP6fz8wQKBgQD/oQq+ukKF0PRgBeM5\ngeTjSwsdGppQLmf5ndujvoiz/TpdjDEPu6R8kigQr1rG2t4K/yfdZoI8RdmJD1al\n3Q7N9hofooSy4rj6E3txzWZCHJjHad2cnCp/O26HiReGAl7wTcfTmNdiFHhZQzm5\nJBkvWAiwuvQMNfEbnXxw6/vIDwKBgQDH7fX8gsc77JLvAWgp1MaQN/sbqVb6JeT1\nFQfR8E/WFCSmzQBtNzd5KgYuCeelwr/8DyYytvN2BzCYZXp73gI1jF3YlW5jVn74\nOY6TwQ095digwo6Z0yuxopdIOApKgAkL9PRKgNrqAf3NAyMua6lOGifzjDojC3KU\nfylQmxMn4wKBgHp2B9O/H0dEBw5JQ8W0+JX6yWQz7mEjGiR2/1W+XXb8hQ1zr709\nw1r6Gb+EghRpnZ3fBpYGGbYOMFx8wKHM+N6qW3F0ReX8v2juFGE8aRSa5oYBrWzt\nU16Idjbv8hj84cZ1PJmdyvDtpYn9rpWHOZl4rxEbPvbqkIsOMyNVqdT5AoGAOSge\nmwIIU2le2FVeohbibXiToWTYKMuMmURZ5/r72AgKMmWJKbAPe+Q3wBG01/7FRBpQ\noU8Ma0HC8s6QJbliiEyIx9JwrJWd1vkdecBHONrtA4ibm/5zD2WcOllLF+FitLhi\n3qnX6+6F0IaFGFBPJrTzlv0P4dTz/OAdv52V7GECgYEA2TttOKBAqWllgOaZOkql\nLVMJVmgR7s6tLi1+cEP8ZcapV9aRbRzTAKXm4f8AEhtlG9F9kCOvHYCYGi6JaiWJ\nZkHjeex3T+eE6Di6y5Bm/Ift5jtVhJ4jCVwHOKTMej79NPUFTJfv8hCo29haBDv6\nRXFrv+T21KCcw8k3sJeJWWQ=\n-----END PRIVATE KEY-----";
+const privateKey = "-----BEGIN PRIVATE KEY-----\nMIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDAARz+hmBgi8pJ\nQb8LeY41gtHhk+ACMwRfhsn7GqpqRQNG2qU0755mzZuVDUqjQMGSo8THJB7O+OJs\nflbZRkFXlFoFOVNw1UpNOgwEQZ6wB9oRwzepTJAfF1sVhm/o/ixvXh1zDFNDy6yZ\npXyiiJHUVxqyjllZhxnwdvjoVtDs6hW6awG09bB9nh/TTejlUKXoAgzqVwu/1QMu\nUVViET495elEe19aUarEy+oL2iKeXCEvqda/pWNBdbieFyJvvZ08HN8dPuT88wq2\njZLEAth1vrwQ2IAa4ktaLcBQdLJgIkrbDvAiVZ8lQAjS/bq5vXQikTGvoPlC5bbn\nvuOM/3eLAgMBAAECggEAVZ+peHAghq2QVj71nX5lxsNCKaCyYwixSJBpfouTt7Rz\nE6PpzMOXFi1W1o+I22jDakuSM2SOQKqI/u0QefB0r0O/KVk5NrZHXk0mkrdYtxOp\nUgaGyf8UvmjB+8VqHrNKyZdk9qtmbnNj01kTTcAtmE4H39zPR7eR/8Rul94vaZbs\nwCnKJS3mLT3JxyGug6lxanveKkjG+CKC1nJQYWaxCJxaFSzbwXQPvDhB+TvrIbee\npd5v4EAyEJohpr+T9oDGGJkb/KARBZCtwLyB976PKJwwBA8MRVL1i5QwawuMiMq5\nUtnOnbGKtCeFzaLbNU0Qi8bqyims84EQxC6DOu1fkQKBgQDdvsoBsEhsOXV7hlIJ\naEd0eSJZVkdqimxH8uGoMM2FeNaOrcB6yBXqTSP0R3OIyf8eaY6yjRvP30ZNXcll\n/gD3O1Mu6YmWQdt1W2WA6pKOsUuPXasf0pdOF7IiFZKlSabz5YHXFqwVuqm8loaj\nsXel3YWqPVdHiankE7tz+3ssnQKBgQDdqi4TNdD1MdEpihx19jr0QjUiXW3939FK\nqp30HESPEGDGQzXdmJgif9HhZb+cJSuWaHEbjgBrYahvgCF+y6LbEpOD+D/dmT+s\nDEAQaR84sah6dokwPjV8fjBSrcVFjCS+doxv0d3p/9OUEeyUhFrY03nxtIEYkLIE\n/Zvn37b4RwKBgQCLENVFe9XfsaVhQ5r9dV2iyTlmh7qgMZG5CbTFs12hQGhm8McO\n+Z7s41YSJCFr/yq1WwP4LJDtrBw99vyQr1zRsG35tNLp3gGRNzGQSQyC2uQFVHw2\np+7mNewsfhUK/gbrXNsyFnDz6635rPlhfbII3sWuP2wWXFqkxE9CbMwR7QKBgQC6\nawDMzxmo2/iYArrkyevSuEuPVxvFwpF1RgAI6C0QVCnPE38dmdN4UB7mfHekje4W\nVEercMURidPp0cxZolCYBQtilUjAyL0vqC3In1/Ogjq6oy3FEMxSop1pKxMY5j+Q\nnoqFD+6deLUrddeNH7J3X4LSr4dSbX4JjG+tlgt+yQKBgQCuwTL4hA6KqeInQ0Ta\n9VQX5Qr8hFlqJz1gpymi/k63tW/Ob8yedbg3WWNWyShwRMFYyY9S81ITFWM95uL6\nvF3x9rmRjwElJw9PMwVu6dmf/CO0Z1wzXSp2VVD12gbrUD/0/d7MUoJ9LgC8X8f/\nn0txLHYGHbx+nf95+JUg6lV3hg==\n-----END PRIVATE KEY-----";
 /*
  * The crypto algorithm used for importing key and signing string
  */
@@ -39531,7 +39883,7 @@ class StoryLiveCollectionController extends LiveCollectionController {
         this.queryStreamController = new StoryQueryStreamController(this.query, this.cacheKey, this.notifyChange.bind(this), paginationController);
         this.paginationController = paginationController;
         this.callback = callback.bind(this);
-        this.loadPage(true);
+        this.loadPage({ initial: true });
     }
     setup() {
         var _a;
@@ -39713,7 +40065,7 @@ class GlobalStoryLiveCollectionController extends LiveCollectionController {
         this.queryStreamController = new GlobalStoryQueryStreamController(this.query, this.cacheKey, this.notifyChange.bind(this), paginationController);
         this.paginationController = paginationController;
         this.callback = callback.bind(this);
-        this.loadPage(true);
+        this.loadPage({ initial: true });
     }
     setup() {
         var _a;
@@ -39749,7 +40101,7 @@ class GlobalStoryLiveCollectionController extends LiveCollectionController {
             return rest;
         });
         this.callback({
-            onNextPage: () => this.loadPage(false, "next" /* Amity.LiveCollectionPageDirection.NEXT */),
+            onNextPage: () => this.loadPage({ direction: "next" /* Amity.LiveCollectionPageDirection.NEXT */ }),
             data,
             hasNextPage: !!this.paginationController.getNextToken(),
             loading,
@@ -39855,4 +40207,4 @@ const createUserToken = async (apiKey, apiRegion, params) => {
     return { accessToken: data.accessToken };
 };
 
-export { API_REGIONS, index$7 as CategoryRepository, index$b as ChannelRepository, index$k as Client, index$4 as CommentRepository, CommunityPostSettingMaps, CommunityPostSettings, index$8 as CommunityRepository, ContentFeedType, DefaultCommunityPostSetting, index$6 as FeedRepository, index$h as FileRepository, FileType, index$1 as LiveStreamPlayer, MessageContentType, index$f as MessageRepository, index$2 as PollRepository, PostContentType, index$5 as PostRepository, index$g as ReactionRepository, index as StoryRepository, index$3 as StreamRepository, index$e as SubChannelRepository, SubscriptionLevels, index$i as UserRepository, VERSION, VideoResolution, VideoSize, VideoTranscodingStatus, backupCache, createQuery, createReport, createUserToken, deleteReport, disableCache, dropFromCache, enableCache, filterByChannelMembership, filterByCommunityMembership, filterByFeedType, filterByPostDataTypes, filterByPropEquality, filterByPropInclusion, filterByPropIntersection, filterBySearchTerm, filterByStringComparePartially, getChannelTopic, getCommentTopic, getCommunityStoriesTopic, getCommunityTopic, getMarkedMessageTopic, getMarkerUserFeedTopic, getMessageTopic, getMyFollowersTopic, getMyFollowingsTopic, getNetworkTopic, getPostTopic, getRole, getSmartFeedChannelTopic, getSmartFeedMessageTopic, getSmartFeedSubChannelTopic, getStoryTopic, getSubChannelTopic, getUserTopic, isAfterBefore, isAfterBeforeRaw, isCachable, isFetcher, isFresh, isLocal, isMutator, isOffline, isPaged, isReportedByMe, isSkip, mergeInCache, onChannelMarkerFetched, onFeedMarkerFetched, onFeedMarkerUpdated, onMessageMarked, onMessageMarkerFetched, onSubChannelMarkerFetched, onSubChannelMarkerUpdated, onUserMarkerFetched, onUserMarkerFetchedLegacy, pullFromCache, pushToCache, queryCache, queryOptions, queryRoles, restoreCache, runQuery, sortByChannelSegment, sortByDisplayName, sortByFirstCreated, sortByFirstUpdated, sortByLastActivity, sortByLastCreated, sortByLastUpdated, sortByLocalSortingDate, sortByName, sortBySegmentNumber, subscribeTopic, toPage, toPageRaw, toToken, upsertInCache, wipeCache };
+export { API_REGIONS, index$7 as CategoryRepository, index$b as ChannelRepository, index$k as Client, index$5 as CommentRepository, CommunityPostSettingMaps, CommunityPostSettings, index$8 as CommunityRepository, ContentFeedType, DefaultCommunityPostSetting, index$6 as FeedRepository, index$h as FileRepository, FileType, index$1 as LiveStreamPlayer, MessageContentType, index$f as MessageRepository, index$2 as PollRepository, PostContentType, index$4 as PostRepository, index$g as ReactionRepository, index as StoryRepository, index$3 as StreamRepository, index$e as SubChannelRepository, SubscriptionLevels, index$i as UserRepository, VERSION, VideoResolution, VideoSize, VideoTranscodingStatus, backupCache, createQuery, createReport, createUserToken, deleteReport, disableCache, dropFromCache, enableCache, filterByChannelMembership, filterByCommunityMembership, filterByFeedType, filterByPostDataTypes, filterByPropEquality, filterByPropInclusion, filterByPropIntersection, filterBySearchTerm, filterByStringComparePartially, getChannelTopic, getCommentTopic, getCommunityStoriesTopic, getCommunityTopic, getMarkedMessageTopic, getMarkerUserFeedTopic, getMessageTopic, getMyFollowersTopic, getMyFollowingsTopic, getNetworkTopic, getPostTopic, getRole, getSmartFeedChannelTopic, getSmartFeedMessageTopic, getSmartFeedSubChannelTopic, getStoryTopic, getSubChannelTopic, getUserTopic, isAfterBefore, isAfterBeforeRaw, isCachable, isFetcher, isFresh, isLocal, isMutator, isOffline, isPaged, isReportedByMe, isSkip, mergeInCache, onChannelMarkerFetched, onFeedMarkerFetched, onFeedMarkerUpdated, onMessageMarked, onMessageMarkerFetched, onSubChannelMarkerFetched, onSubChannelMarkerUpdated, onUserMarkerFetched, onUserMarkerFetchedLegacy, pullFromCache, pushToCache, queryCache, queryOptions, queryRoles, restoreCache, runQuery, sortByChannelSegment, sortByDisplayName, sortByFirstCreated, sortByFirstUpdated, sortByLastActivity, sortByLastCreated, sortByLastUpdated, sortByLocalSortingDate, sortByName, sortBySegmentNumber, subscribeTopic, toPage, toPageRaw, toToken, upsertInCache, wipeCache };