@amityco/ts-sdk 6.4.6-bdc04db.0 → 6.4.6-be7e4df.0

package/dist/index.cjs.js

@@ -524,7 +524,8 @@ const idResolvers = {
     post: ({ postId }) => postId,
     comment: ({ commentId }) => commentId,
     poll: ({ pollId }) => pollId,
-    reaction: ({ reactionId }) => reactionId,
+    reaction: ({ referenceType, referenceId }) => `${referenceType}#${referenceId}`,
+    reactor: ({ reactionId }) => reactionId,
     stream: ({ streamId }) => streamId,
     follow: ({ from, to }) => `${from}#${to}`,
     followInfo: ({ userId }) => userId,
@@ -551,10 +552,10 @@ const getResolver = (name) => idResolvers[name];
  */
 const CRITERIAS = {
     file: ['fileId', 'attributes'],
-    user: ['userId', 'avatarFileId'],
+    user: ['userId', 'avatarFileId', 'roles', 'permissions'],
     role: ['roleId'],
-    channel: ['channelId', 'rateLimit'],
-    subChannel: ['subChannelId'],
+    channel: ['channelId', 'defaultSubChannelId'],
+    subChannel: ['subChannelId', 'latestMessageId'],
     channelUsers: ['channelId', 'userId', 'membership'],
     message: ['messageId'],
     community: ['communityId', 'postSetting'],
@@ -563,7 +564,8 @@ const CRITERIAS = {
     post: ['postId', 'feedId'],
     comment: ['commentId', 'referenceId'],
     poll: ['pollId'],
-    reaction: ['reactionId'],
+    reaction: ['referenceId', 'referenceType', 'reactors'],
+    reactor: ['reactionId'],
     stream: ['streamId'],
     follow: ['from', 'to'],
     feed: ['feedId', 'feedType'],
@@ -22564,12 +22566,8 @@ const getTotalUnreadCount = (callback) => {
     if (!userId)
         throw new ASCError('The _id has not been defined in ActiveUser', 800000 /* Amity.ClientError.UNKNOWN_ERROR */, "error" /* Amity.ErrorLevel.ERROR */);
     const callbackDataSelector = (data) => { var _a; return (_a = data === null || data === void 0 ? void 0 : data.unreadCount) !== null && _a !== void 0 ? _a : 0; };
-    // based on the mobile specs, unreadCount will not trigger observer when userMarker
-    // is re-fetched, so apply this filter to ensure the behavior is the same.
-    const callbackFilter = (newModel, oldModel) => (newModel === null || newModel === void 0 ? void 0 : newModel.unreadCount) !== (oldModel === null || oldModel === void 0 ? void 0 : oldModel.unreadCount);
     return liveObject(userId, callback, 'userId', getUserMarker, [onUserMarkerFetched], {
         callbackDataSelector,
-        callbackFilter,
     });
 };
 
@@ -24319,6 +24317,7 @@ const onSubChannelDeleted = (callback) => {
 };
 
 const SYNC_TRIGGER_INTERVAL_TIME = 2000;
+const ON_SUB_CHANNEL_DELETE_SYNC_TRIGGER_DELAY = 2000;
 let clearSyncTrigger;
 let disposers = [];
 let isWaitingForResponse = false;
@@ -24409,7 +24408,13 @@ const registerEventListeners = () => {
     }, 
     // only trigger sync from remote events to prevent an unread count equal `-1`
     // when an optimistic message creation is performed.
-    false), onChannelCreated(() => events.push("subchannel is created" /* Amity.MarkerSyncEvent.CHANNEL_CREATED */)), onChannelDeleted(() => events.push("subchannel is deleted" /* Amity.MarkerSyncEvent.CHANNEL_DELETED */)), onChannelJoined(() => events.push("subchannel is joined" /* Amity.MarkerSyncEvent.CHANNEL_JOINED */)), onChannelLeft(() => events.push("subchannel is left" /* Amity.MarkerSyncEvent.CHANNEL_LEFT */)), onSubChannelCreated(() => events.push("subchannel is created" /* Amity.MarkerSyncEvent.SUB_CHANNEL_CREATED */)), onSubChannelDeleted(() => events.push("subchannel is deleted" /* Amity.MarkerSyncEvent.SUBCHANNEL_IS_DELETED */)), onFeedMarkerUpdated(() => events.push("feed marker updated" /* Amity.MarkerSyncEvent.MARKER_UPDATED */)), onUserMarkerSync(() => events.push("feed marker updated" /* Amity.MarkerSyncEvent.MARKER_UPDATED */)));
+    false), onChannelCreated(() => events.push("subchannel is created" /* Amity.MarkerSyncEvent.CHANNEL_CREATED */)), onChannelDeleted(() => events.push("subchannel is deleted" /* Amity.MarkerSyncEvent.CHANNEL_DELETED */)), onChannelJoined(() => events.push("subchannel is joined" /* Amity.MarkerSyncEvent.CHANNEL_JOINED */)), onChannelLeft(() => events.push("subchannel is left" /* Amity.MarkerSyncEvent.CHANNEL_LEFT */)), onSubChannelCreated(() => events.push("subchannel is created" /* Amity.MarkerSyncEvent.SUB_CHANNEL_CREATED */)), onSubChannelDeleted(() => 
+    /*
+     workaround: when receiving the event for sub-channel deletion,
+     before triggering marker update, the SDK will have to add a 2-second delay.
+     so that the unread count is calculated correctly.
+    */
+    setTimeout(() => events.push("subchannel is deleted" /* Amity.MarkerSyncEvent.SUBCHANNEL_IS_DELETED */), ON_SUB_CHANNEL_DELETE_SYNC_TRIGGER_DELAY)), onFeedMarkerUpdated(() => events.push("feed marker updated" /* Amity.MarkerSyncEvent.MARKER_UPDATED */)), onUserMarkerSync(() => events.push("feed marker updated" /* Amity.MarkerSyncEvent.MARKER_UPDATED */)));
 };
 const unRegisterEventListeners = () => {
     disposers.forEach(fn => fn());
@@ -27867,7 +27872,7 @@ const onReactorRemoved = (referenceType, referenceId, callback) => {
  * })
  * ```
  *
- * Queries a paginable list of {@link Amity.ReactionQuery} objects
+ * Queries a paginable list of {@link Amity.Reaction} objects
  *
  * @param query The query parameters
  * @returns A page of {@link Amity.Reaction} objects
@@ -27894,6 +27899,30 @@ const queryReactions = async (query) => {
     return { data: reactions, prevPage, nextPage };
 };
 
+/**
+ * ```js
+ * import { queryReactor } from '@amityco/ts-sdk'
+ * const { data: reactions, prevPage, nextPage } = await queryReactor({
+ *   referenceId: 'postId',
+ *   referenceType: 'post',
+ * })
+ * ```
+ *
+ * Queries a paginable list of {@link Amity.Reactor} objects
+ *
+ * @param query The query parameters
+ * @returns A page of {@link Amity.Reactor} objects
+ *
+ * @reaction Reaction API
+ * @async
+ * */
+const queryReactor = async (query) => {
+    const client = getActiveClient();
+    client.log('reaction/queryReactor', query);
+    const _a = await queryReactions(query), { data } = _a, response = __rest(_a, ["data"]);
+    return Object.assign(Object.assign({}, response), { data: data[0].reactors });
+};
+
 /* begin_public_function
   id: reaction.query
 */
@@ -27908,11 +27937,11 @@ const queryReactions = async (query) => {
  * }, response => merge(reactions, response.data))
  * ```
  *
- * Observe all mutations on a list of {@link Amity.Reaction} for a given target object
+ * Observe all mutations on a list of {@link Amity.Reactor} for a given target object
  *
- * @param params.referenceType the type of the target
- * @param params.referenceId the ID of the target
+ * @param params for querying reactions
  * @param callback the function to call when new data are available
+ * @param config the live collection configuration
  * @returns An {@link Amity.Unsubscriber} function to run when willing to stop observing the messages
  *
  * @category Reactions Live Collection
@@ -27967,7 +27996,7 @@ const getReactions = (params, callback, config) => {
         const reactions = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
         if (!initial && reactions.length > 0 && !((_c = collection === null || collection === void 0 ? void 0 : collection.params) === null || _c === void 0 ? void 0 : _c.page))
             return;
-        const query = createQuery(queryReactions, Object.assign(Object.assign({}, queryParams), { page: (_d = (!initial ? collection === null || collection === void 0 ? void 0 : collection.params.page : undefined)) !== null && _d !== void 0 ? _d : { limit } }));
+        const query = createQuery(queryReactor, Object.assign(Object.assign({}, queryParams), { page: (_d = (!initial ? collection === null || collection === void 0 ? void 0 : collection.params.page : undefined)) !== null && _d !== void 0 ? _d : { limit } }));
         runQuery(query, ({ data: result, error, loading, nextPage: page }) => {
             const data = {
                 loading,
@@ -27976,9 +28005,7 @@ const getReactions = (params, callback, config) => {
                 data: reactions,
             };
             if (result) {
-                data.data = [
-                    ...new Set([...reactions, ...result[0].reactors.map(getResolver('reaction'))]),
-                ];
+                data.data = [...new Set([...reactions, ...result.map(getResolver('reactor'))])];
             }
             pushToCache(cacheKey, data);
             responder(data);
@@ -29738,8 +29765,8 @@ const updateCommunity = async (communityId, patch) => {
 
 /**
  * ```js
- * import { getCommunity } from '@amityco/ts-sdk'
- * const community = await getCommunity('foobar')
+ * import { CommunityRepository } from '@amityco/ts-sdk'
+ * const community = await CommunityRepository.getCommunity('foobar')
  * ```
  *
  * Fetches a {@link Amity.Community} object
@@ -29767,8 +29794,8 @@ const getCommunity$1 = async (communityId) => {
 };
 /**
  * ```js
- * import { getCommunity } from '@amityco/ts-sdk'
- * const community = getCommunity.locally('foobar')
+ * import { CommunityRepository } from '@amityco/ts-sdk'
+ * const community = CommunityRepository.getCommunity.locally('foobar')
  * ```
  *
  * Fetches a {@link Amity.Community} object from cache
@@ -29893,9 +29920,12 @@ const leaveCommunity = async (communityId) => {
   id: community.query.trending_communities
 */
 /**
+ * @deprecated This API renamed to `getTrendingCommunities()`.
+ * Please use getTrendingCommunities() instead.
+ *
  * ```js
- * import { getTopTrendingCommunities } from '@amityco/ts-sdk'
- * const trendingCommunities = await getTopTrendingCommunities()
+ * import { CommunityRepository } from '@amityco/ts-sdk'
+ * const trendingCommunities = await CommunityRepository.getTopTrendingCommunities()
  * ```
  *
  * Gets a list of top trending {@link Amity.Community} objects
@@ -29957,74 +29987,6 @@ getTopTrendingCommunities.locally = (query) => {
         : undefined;
 };
 
-/* begin_public_function
-  id: community.query.recommended_communities
-*/
-/**
- * ```js
- * import { getRecommendedCommunities } from '@amityco/ts-sdk'
- * const communities = await getRecommendedCommunities()
- * ```
- *
- * Gets a list of recommended {@link Amity.Community} objects
- *
- * @param query The query parameters
- * @returns A list of {@link Amity.Community} objects
- *
- * @category Community API
- * @async
- */
-const getRecommendedCommunities = async (query) => {
-    const client = getActiveClient();
-    client.log('channel/getRecommendedCommunities', query);
-    const { limit = 5 } = query !== null && query !== void 0 ? query : {};
-    // API-FIX: backend doesnt answer Amity.Response
-    // const { data: payload } = await client.http.get<Amity.Response<CommunityPayload>>(
-    const { data: payload } = await client.http.get(`/api/v3/communities/recommended`, { params: { options: { limit } } });
-    const data = prepareCommunityPayload(payload);
-    const { communities } = data;
-    const cachedAt = client.cache && Date.now();
-    if (client.cache) {
-        ingestInCache(data, { cachedAt });
-        const cacheKey = ['community', 'recommended', { params: { options: { limit } } }];
-        pushToCache(cacheKey, { communities: communities.map(getResolver('community')) });
-    }
-    return { data: communities, cachedAt };
-};
-/* end_public_function */
-/**
- * ```js
- * import { getRecommendedCommunities } from '@amityco/ts-sdk'
- * const communities = getRecommendedCommunities.locally()
- * ```
- *
- * Gets a list of recommended {@link Amity.Community} objects from cache
- *
- * @param query The query parameters
- * @returns communities
- *
- * @category Community API
- */
-getRecommendedCommunities.locally = (query) => {
-    var _a, _b;
-    const client = getActiveClient();
-    client.log('community/getRecommendedCommunities.locally', query);
-    if (!client.cache)
-        return;
-    const { limit = 5 } = query !== null && query !== void 0 ? query : {};
-    const queryKey = ['community', 'recommended', { params: { options: { limit } } }];
-    const { data, cachedAt } = (_a = pullFromCache(queryKey)) !== null && _a !== void 0 ? _a : {};
-    if (!(data === null || data === void 0 ? void 0 : data.communities.length))
-        return;
-    const communities = data.communities
-        .map(communityId => pullFromCache(['community', 'get', communityId]))
-        .filter(Boolean)
-        .map(({ data }) => data);
-    return communities.length === ((_b = data === null || data === void 0 ? void 0 : data.communities) === null || _b === void 0 ? void 0 : _b.length)
-        ? { data: communities, cachedAt }
-        : undefined;
-};
-
 const createCommunityEventSubscriber = (event, callback) => {
     const client = getActiveClient();
     const filter = (payload) => {
@@ -30429,10 +30391,10 @@ const queryCommunities = async (query) => {
 */
 /**
  * ```js
- * import { getCommunities } from '@amityco/ts-sdk'
+ * import { CommunityRepository } from '@amityco/ts-sdk'
  *
  * let communities = []
- * const unsub = getCommunities({
+ * const unsub = CommunityRepository.getCommunities({
  *   displayName: Amity.Community['displayName'],
  * }, response => merge(communities, response.data))
  * ```
@@ -30549,11 +30511,11 @@ const getCommunities = (params, callback, config) => {
 */
 /**
  * ```js
- * import { getCommunity } from '@amityco/ts-sdk';
+ * import { CommunityRepository } from '@amityco/ts-sdk';
  *
  * let community;
  *
- * const unsubscribe = getCommunity(communityId, response => {
+ * const unsub = CommunityRepository.getCommunity(communityId, response => {
  *   community = response.data;
  * });
  * ```
@@ -30579,6 +30541,221 @@ const getCommunity = (communityId, callback) => {
 };
 /* end_public_function */
 
+const communityQueryFilter = (data, params, userId) => {
+    let communities = data;
+    communities = filterByPropEquality(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);
+    }
+    const sortBy = params.sortBy || 'lastCreated';
+    if (sortBy === 'lastCreated' || sortBy === 'firstCreated') {
+        communities = communities.sort(sortBy === 'lastCreated' ? sortByLastCreated : sortByFirstCreated);
+    }
+    /*
+     * 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);
+    }
+    return communities;
+};
+
+/* begin_public_function
+  id: community.query
+*/
+/**
+ * ```js
+ * import { CommunityRepository } from '@amityco/ts-sdk'
+ *
+ * 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 getTrendingCommunities = (params, callback, config) => {
+    const { log, cache, userId } = getActiveClient();
+    if (!cache) {
+        console.log(ENABLE_CACHE_MESSAGE);
+    }
+    const timestamp = Date.now();
+    log(`getTrendingCommunities(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', 'top-trending', { params: { options: { limit } } }];
+    const responder = (data, isEventModel = false) => {
+        var _a, _b;
+        const communities = (_a = data.data
+            .map(communityId => pullFromCache(['community', 'get', communityId]))
+            .filter(Boolean)
+            .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
+        callback({
+            onNextPage: onFetch,
+            data: isEventModel ? communityQueryFilter(communities, params, userId) : communities,
+            hasNextPage: !!((_b = data.params) === null || _b === void 0 ? void 0 : _b.page),
+            loading: data.loading,
+            error: data.error,
+        });
+    };
+    const realtimeRouter = (_) => (community) => {
+        var _a;
+        const collection = (_a = pullFromCache(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, _c;
+        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))
+            return;
+        const query = createQuery(queryCommunities, Object.assign(Object.assign({}, queryParams), { page: (_c = (!initial ? collection === null || collection === void 0 ? void 0 : collection.params.page : undefined)) !== null && _c !== void 0 ? _c : { limit } }));
+        runQuery(query, ({ data: result, error, loading, nextPage: page }) => {
+            const data = {
+                loading,
+                error,
+                params: { page },
+                data: communities,
+            };
+            if (result) {
+                data.data = [...new Set([...communities, ...result.map(getResolver('community'))])];
+            }
+            pushToCache(cacheKey, data);
+            responder(data);
+        }, queryOptions(policy, CACHE_SHORTEN_LIFESPAN));
+    };
+    disposers.push(onCommunityUserChanged(realtimeRouter()));
+    onFetch(true);
+    disposers.push(() => dropFromCache(cacheKey));
+    return () => {
+        log(`getTrendingCommunities(tmpid: ${timestamp}) > dispose`);
+        disposers.forEach(fn => fn());
+    };
+};
+/* end_public_function */
+
+/* begin_public_function
+  id: community.query
+*/
+/**
+ * ```js
+ * import { CommunityRepository } from '@amityco/ts-sdk'
+ *
+ * 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 getRecommendedCommunities = (params, callback, config) => {
+    const { log, cache, userId } = getActiveClient();
+    if (!cache) {
+        console.log(ENABLE_CACHE_MESSAGE);
+    }
+    const timestamp = Date.now();
+    log(`getRecommendedCommunities(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', 'recommended', { params: { options: { limit } } }];
+    const responder = (data, isEventModel = false) => {
+        var _a, _b;
+        const communities = (_a = data.data
+            .map(communityId => pullFromCache(['community', 'get', communityId]))
+            .filter(Boolean)
+            .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
+        callback({
+            onNextPage: onFetch,
+            data: isEventModel ? communityQueryFilter(communities, params, userId) : communities,
+            hasNextPage: !!((_b = data.params) === null || _b === void 0 ? void 0 : _b.page),
+            loading: data.loading,
+            error: data.error,
+        });
+    };
+    const realtimeRouter = (_) => (community) => {
+        var _a;
+        const collection = (_a = pullFromCache(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, _c;
+        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))
+            return;
+        const query = createQuery(queryCommunities, Object.assign(Object.assign({}, queryParams), { page: (_c = (!initial ? collection === null || collection === void 0 ? void 0 : collection.params.page : undefined)) !== null && _c !== void 0 ? _c : { limit } }));
+        runQuery(query, ({ data: result, error, loading, nextPage: page }) => {
+            const data = {
+                loading,
+                error,
+                params: { page },
+                data: communities,
+            };
+            if (result) {
+                data.data = [...new Set([...communities, ...result.map(getResolver('community'))])];
+            }
+            pushToCache(cacheKey, data);
+            responder(data);
+        }, queryOptions(policy, CACHE_SHORTEN_LIFESPAN));
+    };
+    disposers.push(onCommunityUserChanged(realtimeRouter()));
+    onFetch(true);
+    disposers.push(() => dropFromCache(cacheKey));
+    return () => {
+        log(`getRecommendedCommunities(tmpid: ${timestamp}) > dispose`);
+        disposers.forEach(fn => fn());
+    };
+};
+/* end_public_function */
+
 /* begin_public_function
   id: community.moderation.add_roles
 */
@@ -31007,13 +31184,14 @@ var index$6 = /*#__PURE__*/Object.freeze({
   joinCommunity: joinCommunity,
   leaveCommunity: leaveCommunity,
   getTopTrendingCommunities: getTopTrendingCommunities,
-  getRecommendedCommunities: getRecommendedCommunities,
   onCommunityCreated: onCommunityCreated,
   onCommunityUpdated: onCommunityUpdated,
   onCommunityDeleted: onCommunityDeleted,
   observeCommunity: observeCommunity,
   getCommunities: getCommunities,
-  getCommunity: getCommunity
+  getCommunity: getCommunity,
+  getTrendingCommunities: getTrendingCommunities,
+  getRecommendedCommunities: getRecommendedCommunities
 });
 
 /* begin_public_function
@@ -31105,7 +31283,7 @@ const queryCategories = async (query) => {
         const cacheKey = [
             'category',
             'query',
-            Object.assign(Object.assign({}, params), { options: Object.assign({}, page) }),
+            Object.assign(Object.assign({}, params), { includeDeleted, options: Object.assign({}, page) }),
         ];
         pushToCache(cacheKey, { categories: categories.map(getResolver('category')), paging });
     }
@@ -31984,11 +32162,11 @@ const observePost = (postId, callback, policy = 'cache_then_server') => {
 */
 /**
  * ```js
- * import { getPost } from '@amityco/ts-sdk';
+ * import { PostRepository } from '@amityco/ts-sdk';
  *
  * let post;
  *
- * const unsubscribe = getPost(postId, response => {
+ * const unsub = PostRepository.getPost(postId, response => {
  *   post = response.data;
  * });
  * ```
@@ -32068,7 +32246,7 @@ const queryPosts = async (query) => {
 };
 
 /* begin_public_function
-  id: post.query, feed.query.community_feed, feed.query.user_feed
+  id: post.query
 */
 /**
  * ```js
@@ -32644,11 +32822,11 @@ const observeComment = (commentId, callback, policy = 'cache_then_server') => {
 */
 /**
  * ```js
- * import { getComment } from '@amityco/ts-sdk';
+ * import { CommentRepository } from '@amityco/ts-sdk';
  *
  * let comment;
  *
- * const unsubscribe = getComment(commentId, response => {
+ * const unsub = CommentRepository.getComment(commentId, response => {
  *   comment = response.data;
  * });
  * ```
@@ -33281,64 +33459,6 @@ var index$1 = /*#__PURE__*/Object.freeze({
   getStreams: getStreams
 });
 
-/* begin_public_function
-  id: poll.get
-*/
-/**
- * ```js
- * import { getPoll } from '@amityco/ts-sdk'
- * const poll = await getPoll('foobar')
- * ```
- *
- * Fetches a {@link Amity.Poll} object
- *
- * @param pollId the ID of the {@link Amity.Poll} to fetch
- * @returns the associated {@link Amity.Poll} object
- *
- * @category Poll API
- * @async
- */
-const getPoll = async (pollId) => {
-    const client = getActiveClient();
-    client.log('poll/getPoll', pollId);
-    const { data } = await client.http.get(`/api/v3/polls/${pollId}`);
-    const cachedAt = client.cache && Date.now();
-    if (client.cache)
-        ingestInCache(data, { cachedAt });
-    const { polls } = data;
-    return {
-        data: polls.find(poll => poll.pollId === pollId),
-        cachedAt,
-    };
-};
-/* end_public_function */
-/**
- * ```js
- * import { getPoll } from '@amityco/ts-sdk'
- * const poll = getPoll.locally('foobar')
- * ```
- *
- * Fetches a {@link Amity.Poll} object
- *
- * @param pollId the ID of the {@link Amity.Poll} to fetch
- * @returns the associated {@link Amity.Poll} object
- *
- * @category Poll API
- */
-getPoll.locally = (pollId) => {
-    const client = getActiveClient();
-    client.log('poll/getPoll', pollId);
-    if (!client.cache)
-        return;
-    const cached = pullFromCache(['poll', 'get', pollId]);
-    if (!cached)
-        return;
-    return {
-        data: cached.data,
-        cachedAt: cached.cachedAt,
-    };
-};
-
 /* begin_public_function
   id: poll.create
 */
@@ -33411,6 +33531,64 @@ const closePoll = async (pollId) => {
 };
 /* end_public_function */
 
+/* begin_public_function
+  id: poll.get
+*/
+/**
+ * ```js
+ * import { getPoll } from '@amityco/ts-sdk'
+ * const poll = await getPoll('foobar')
+ * ```
+ *
+ * Fetches a {@link Amity.Poll} object
+ *
+ * @param pollId the ID of the {@link Amity.Poll} to fetch
+ * @returns the associated {@link Amity.Poll} object
+ *
+ * @category Poll API
+ * @async
+ */
+const getPoll$1 = async (pollId) => {
+    const client = getActiveClient();
+    client.log('poll/getPoll', pollId);
+    const { data } = await client.http.get(`/api/v3/polls/${pollId}`);
+    const cachedAt = client.cache && Date.now();
+    if (client.cache)
+        ingestInCache(data, { cachedAt });
+    const { polls } = data;
+    return {
+        data: polls.find(poll => poll.pollId === pollId),
+        cachedAt,
+    };
+};
+/* end_public_function */
+/**
+ * ```js
+ * import { getPoll } from '@amityco/ts-sdk'
+ * const poll = getPoll.locally('foobar')
+ * ```
+ *
+ * Fetches a {@link Amity.Poll} object
+ *
+ * @param pollId the ID of the {@link Amity.Poll} to fetch
+ * @returns the associated {@link Amity.Poll} object
+ *
+ * @category Poll API
+ */
+getPoll$1.locally = (pollId) => {
+    const client = getActiveClient();
+    client.log('poll/getPoll', pollId);
+    if (!client.cache)
+        return;
+    const cached = pullFromCache(['poll', 'get', pollId]);
+    if (!cached)
+        return;
+    return {
+        data: cached.data,
+        cachedAt: cached.cachedAt,
+    };
+};
+
 /* begin_public_function
   id: poll.delete
 */
@@ -33431,7 +33609,7 @@ const closePoll = async (pollId) => {
 const deletePoll = async (pollId) => {
     const client = getActiveClient();
     client.log('poll/deletePoll', pollId);
-    const poll = await getPoll(pollId);
+    const poll = await getPoll$1(pollId);
     // API-FIX: it returns { success: boolean } but seems it should be Amity.Response<{ success: boolean }
     const { data } = await client.http.delete(`/api/v3/polls/${pollId}`);
     const { success } = data; // unwrapPayload(data)
@@ -33563,23 +33741,50 @@ const observePoll = (pollId, callback, policy = 'cache_then_server') => {
     };
     const disposers = [];
     disposers.push(onPollUpdated(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onUpdate')), onPollDeleted(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onDelete')));
-    runQuery(createQuery(getPoll, pollId), result => (result.data || result.error) && router(result, 'onFetch'), queryOptions(policy));
+    runQuery(createQuery(getPoll$1, pollId), result => (result.data || result.error) && router(result, 'onFetch'), queryOptions(policy));
     return () => {
         log(`observePoll(tmpid: ${timestamp}) > dispose`);
         disposers.forEach(fn => fn());
     };
 };
 
+/* begin_public_function
+  id: poll.get
+*/
+/**
+ * ```js
+ * import { PollRepository } from '@amityco/ts-sdk';
+ *
+ * let poll;
+ *
+ * const unsub = PollRepository.getPoll(commentId, response => {
+ *   poll = response.data;
+ * });
+ * ```
+ *
+ * Observe all mutation on a given {@link Amity.Poll}
+ *
+ * @param pollId the ID of the poll 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 poll
+ *
+ * @category Poll Live Object
+ */
+const getPoll = (pollId, callback) => {
+    return liveObject(pollId, callback, 'pollId', getPoll$1, [onPollUpdated, onPollDeleted]);
+};
+/* end_public_function */
+
 var index = /*#__PURE__*/Object.freeze({
   __proto__: null,
-  getPoll: getPoll,
   createPoll: createPoll,
   closePoll: closePoll,
   deletePoll: deletePoll,
   votePoll: votePoll,
   onPollUpdated: onPollUpdated,
   onPollDeleted: onPollDeleted,
-  observePoll: observePoll
+  observePoll: observePoll,
+  getPoll: getPoll
 });
 
 /**