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

package/dist/index.cjs.js

@@ -95,8 +95,8 @@ const PostContentType = Object.freeze({
 
 function getVersion() {
     try {
-        // the string ''v0.0.1-beta.43.1-cjs'' should be replaced by actual value by @rollup/plugin-replace
-        return 'v0.0.1-beta.43.1-cjs';
+        // the string ''v0.0.1-beta.45.0-cjs'' should be replaced by actual value by @rollup/plugin-replace
+        return 'v0.0.1-beta.45.0-cjs';
     }
     catch (error) {
         return '__dev__';
@@ -1174,6 +1174,37 @@ const filterByCommunityMembership = (collection, membership, userId) => {
         // only membership value remainging is 'notMember'
         return !communityUser || communityUser.communityMembership !== 'none';
     });
+};
+/**
+ * Filter a post collection by dataType
+ *
+ * @param collection the post to filter
+ * @param dataTypes of the post to be filtered by
+ * @returns a filtered collection with items only matching the criteria
+ *
+ * @hidden
+ */
+const filterByPostDataTypes = (collection, dataTypes) => {
+    const filteredPosts = [];
+    collection.forEach(c => {
+        var _a;
+        /*
+         * A text post with no children is just a text post
+         */
+        if (c.dataType === 'text' && !c.children.length)
+            return;
+        if (c.children.length) {
+            const childPost = (_a = pullFromCache(['post', 'get', c.children[0]])) === null || _a === void 0 ? void 0 : _a.data;
+            if (childPost && (dataTypes === null || dataTypes === void 0 ? void 0 : dataTypes.includes(childPost === null || childPost === void 0 ? void 0 : childPost.dataType))) {
+                // @ts-ignore
+                filteredPosts.push(childPost);
+            }
+            return;
+        }
+        if (dataTypes === null || dataTypes === void 0 ? void 0 : dataTypes.includes(c.dataType))
+            filteredPosts.push(c);
+    });
+    return filteredPosts;
 };
 
 // Note:
@@ -20884,7 +20915,7 @@ const connectClient = async (params, sessionHandler, config) => {
          * Cannot push to subscriptions as watcher needs to continue working even if
          * token expires
          */
-        unsubWatcher = client.accessTokenExpiryWatcher((_b = client.token) === null || _b === void 0 ? void 0 : _b.issuedAt, (_c = client.token) === null || _c === void 0 ? void 0 : _c.expiresAt, sessionHandler);
+        unsubWatcher = client.accessTokenExpiryWatcher((_b = client.token) === null || _b === void 0 ? void 0 : _b.expiresAt, (_c = client.token) === null || _c === void 0 ? void 0 : _c.issuedAt, sessionHandler);
         setActiveUser(users[0]);
     }
     catch (error) {
@@ -21595,6 +21626,22 @@ const prepareMessagePayloadForCache = (payload) => {
     }
 };
 
+/*
+ * This is a simple utility that infers the value of isDeleted based on the
+ * value of includeDeleted
+ *
+ * There are two important things to note here:
+ *  1. `includeDeleted` is purely client side query param and not recognized by
+ *  the server
+ *  2. The only values we wish to expose with regards to `isDeleted` (the server
+ *  param for queries) is false | undefined and want to disallow users to query
+ *  for deleted entities
+ *
+ *  Although this is a very simple utility, it's only purpose is to keep things
+ *  DRY
+ */
+const inferIsDeleted = (includeDeleted) => includeDeleted === true ? undefined : false;
+
 const getCachedMarker$1 = (message) => {
     var _a, _b;
     const key = {
@@ -21673,7 +21720,7 @@ function convertParams(_a) {
 }
 function convertQueryParams$1(_a) {
     var { page, sortBy, subChannelId, tags, includeDeleted } = _a, rest = __rest(_a, ["page", "sortBy", "subChannelId", "tags", "includeDeleted"]);
-    const out = Object.assign(Object.assign({}, rest), { messageFeedId: subChannelId, isDeleted: includeDeleted === false ? false : undefined, options: { token: toToken(page || { limit: 10 }, 'afterbeforeraw') } });
+    const out = Object.assign(Object.assign({}, rest), { messageFeedId: subChannelId, isDeleted: inferIsDeleted(includeDeleted), options: { token: toToken(page || { limit: 10 }, 'afterbeforeraw') } });
     if (sortBy !== undefined) {
         out.options.sortBy = sortBy;
     }
@@ -22882,13 +22929,13 @@ const liveUsers = (params, callback, config) => {
         pushToCache(cacheKey, collection);
         responder(collection);
     };
-    const onFetch = () => {
+    const onFetch = (initial = false) => {
         var _a, _b, _c;
         const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
         const users = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
-        if (users.length > 0 && !(collection === null || collection === void 0 ? void 0 : collection.params.page))
+        if (!initial && users.length > 0 && !(collection === null || collection === void 0 ? void 0 : collection.params.page))
             return;
-        const query = createQuery(queryUsers, Object.assign(Object.assign({}, queryParams), { page: (_c = collection === null || collection === void 0 ? void 0 : collection.params.page) !== null && _c !== void 0 ? _c : { limit } }));
+        const query = createQuery(queryUsers, 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,
@@ -22904,7 +22951,7 @@ const liveUsers = (params, callback, config) => {
         }, queryOptions(policy));
     };
     disposers.push(onUserUpdated(realtimeRouter()), onUserDeleted(realtimeRouter()), onUserFlagged(realtimeRouter()), onUserUnflagged(realtimeRouter()), onUserFlagCleared(realtimeRouter()));
-    onFetch();
+    onFetch(true);
     return () => {
         log(`liveUsers(tmpid: ${timestamp}) > dispose`);
         disposers.forEach(fn => fn());
@@ -23515,52 +23562,23 @@ const queryMessages = async (query) => {
     const data = await prepareMessagePayload(payload);
     const { messages } = data;
     const cachedAt = client.cache && Date.now();
-    // if (client.cache) {
-    //   ingestInCache(data, { cachedAt });
-    //
-    //   const cacheKey = ['message', 'query', params as Amity.Serializable];
-    //   pushToCache(cacheKey, { messages: messages.map(getResolver('message')), paging });
-    // }
+    if (client.cache) {
+        /*
+         * queryMessages.locally is unsupported for messages as message list updates
+         * frequently and leads to bugs when user switches between channels, i.e. when
+         * the public function (live messages) calls unmount. The list fetched on
+         * after from the cache is stale.
+         */
+        ingestInCache(data, { cachedAt });
+        const cacheKey = ['message', 'query', params];
+        pushToCache(cacheKey, { messages: messages.map(getResolver('message')), paging });
+    }
     fireEvent('local.message.fetched', { messages });
     const nextPage = toPageRaw(paging.next);
     const prevPage = toPageRaw(paging.previous);
     return { data: messages, cachedAt, prevPage, nextPage };
 };
-/* end_public_function */
-/**
- * ```js
- * import { queryMessages } from '@amityco/ts-sdk'
- * const messages = queryMessages.locally!({ channelId })
- * ```
- *
- * Queries a paginable list of {@link Amity.Message} objects from cache
- *
- * @param query The query parameters
- * @returns A page of {@link Amity.Message} objects
- *
- * @category Message API
- */
-queryMessages.locally = (query) => {
-    var _a, _b;
-    const client = getActiveClient();
-    client.log('message/queryMessages.locally', query);
-    if (!client.cache)
-        return;
-    const params = convertQueryParams$1(query);
-    const queryKey = ['message', 'query', params];
-    const { data, cachedAt } = (_a = pullFromCache(queryKey)) !== null && _a !== void 0 ? _a : {};
-    if (!(data === null || data === void 0 ? void 0 : data.messages.length))
-        return;
-    const messages = data.messages
-        .map(messageId => pullFromCache(['message', 'get', messageId]))
-        .filter(Boolean)
-        .map(({ data }) => data);
-    const prevPage = toPageRaw(data === null || data === void 0 ? void 0 : data.paging.previous);
-    const nextPage = toPageRaw(data === null || data === void 0 ? void 0 : data.paging.next);
-    return messages.length === ((_b = data === null || data === void 0 ? void 0 : data.messages) === null || _b === void 0 ? void 0 : _b.length)
-        ? { data: messages, cachedAt, prevPage, nextPage }
-        : undefined;
-};
+/* end_public_function */
 
 const uuid = () => nativeIdGenerator__default["default"].v4().toString();
 
@@ -23904,7 +23922,7 @@ const queryPosts = async (query) => {
     // 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: includeDeleted === false ? false : undefined, 
+        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
@@ -24249,7 +24267,7 @@ const queryCommunities = async (query) => {
     // API-FIX: backend doesnt 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: includeDeleted === false ? false : undefined, keyword: displayName, filter: membership, options: {
+        params: Object.assign(Object.assign({}, restParams), { isDeleted: inferIsDeleted(includeDeleted), keyword: displayName, filter: membership, options: {
                 token: toToken(page, 'skiplimit'),
             } }),
     });
@@ -25100,7 +25118,7 @@ const queryComments = async (query) => {
     // 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: includeDeleted === false ? false : undefined, 
+        params: Object.assign(Object.assign({}, params), { isDeleted: inferIsDeleted(includeDeleted), 
             //      filterByParentId, API-FIX: backend does not support this boolean LOL. what the hell seriously.
             options }),
     });
@@ -26384,13 +26402,13 @@ const liveReactions = (params, callback, config) => {
         pushToCache(cacheKey, collection);
         responder(collection);
     };
-    const onFetch = () => {
-        var _a, _b, _c, _d, _e;
+    const onFetch = (initial = false) => {
+        var _a, _b, _c, _d;
         const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
         const reactions = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
-        if (reactions.length > 0 && !((_c = collection === null || collection === void 0 ? void 0 : collection.params) === null || _c === void 0 ? void 0 : _c.page))
+        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: (_e = (_d = collection === null || collection === void 0 ? void 0 : collection.params) === null || _d === void 0 ? void 0 : _d.page) !== null && _e !== void 0 ? _e : { limit } }));
+        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 } }));
         runQuery(query, ({ data: result, error, loading, nextPage: page }) => {
             const data = {
                 loading,
@@ -26408,7 +26426,7 @@ const liveReactions = (params, callback, config) => {
         }, queryOptions(policy));
     };
     disposers.push(onReactorAdded(queryParams.referenceType, queryParams.referenceId, realtimeRouter('onAdded')), onReactorRemoved(queryParams.referenceType, queryParams.referenceId, realtimeRouter('onRemoved')));
-    onFetch();
+    onFetch(true);
     return () => {
         log(`liveReactions(tmpid: ${timestamp}) > dispose`);
         disposers.forEach(fn => fn());
@@ -27769,13 +27787,13 @@ const liveChannels = (params, callback, config) => {
         pushToCache(cacheKey, collection);
         responder(collection);
     };
-    const onFetch = () => {
+    const onFetch = (initial = false) => {
         var _a, _b, _c;
         const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
         const channels = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
-        if (channels.length > 0 && !(collection === null || collection === void 0 ? void 0 : collection.params.page))
+        if (!initial && channels.length > 0 && !(collection === null || collection === void 0 ? void 0 : collection.params.page))
             return;
-        const query = createQuery(queryChannels, Object.assign(Object.assign({}, queryParams), { page: (_c = collection === null || collection === void 0 ? void 0 : collection.params.page) !== null && _c !== void 0 ? _c : { limit } }));
+        const query = createQuery(queryChannels, 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,
@@ -27791,7 +27809,7 @@ const liveChannels = (params, callback, config) => {
         }, queryOptions(policy, CACHE_SHORTEN_LIFESPAN));
     };
     disposers.push(onChannelCreated(realtimeRouter()), onChannelDeleted(realtimeRouter()), onChannelUpdated(realtimeRouter()), onChannelMuted(realtimeRouter()), onChannelJoined(realtimeRouter()), onChannelLeft(realtimeRouter()), onChannelMemberAdded(realtimeRouter()), onChannelMemberRemoved(realtimeRouter()), onMessageCreated(() => null));
-    onFetch();
+    onFetch(true);
     return () => {
         log(`liveChannels(tmpid: ${timestamp}) > dispose`);
         disposers.forEach(fn => fn());
@@ -27888,13 +27906,13 @@ const liveChannelMembers = (params, callback, config) => {
         pushToCache(cacheKey, collection);
         responder(collection);
     };
-    const onFetch = () => {
+    const onFetch = (initial = false) => {
         var _a, _b, _c;
         const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
         const channelMembers = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
-        if (channelMembers.length > 0 && !(collection === null || collection === void 0 ? void 0 : collection.params.page))
+        if (!initial && channelMembers.length > 0 && !(collection === null || collection === void 0 ? void 0 : collection.params.page))
             return;
-        const query = createQuery(queryChannelMembers, Object.assign(Object.assign({}, queryParams), { page: (_c = collection === null || collection === void 0 ? void 0 : collection.params.page) !== null && _c !== void 0 ? _c : { limit } }));
+        const query = createQuery(queryChannelMembers, 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,
@@ -27910,7 +27928,7 @@ const liveChannelMembers = (params, callback, config) => {
         }, queryOptions(policy));
     };
     disposers.push(onChannelJoined(realtimeRouter()), onChannelLeft(realtimeRouter()), onChannelMemberAdded(realtimeRouter()), onChannelMemberRemoved(realtimeRouter()), onChannelMemberBanned(realtimeRouter()), onChannelMemberUnbanned(realtimeRouter()));
-    onFetch();
+    onFetch(true);
     return () => {
         log(`liveChannelMembers(tmpid: ${timestamp}) > dispose`);
         disposers.forEach(fn => fn());
@@ -27939,7 +27957,7 @@ const querySubChannels = async (query) => {
     client.log('channel/querySubChannels', query);
     const _a = convertQueryParams(query), { page = { limit: 10 }, channelId, includeDeleted } = _a, params = __rest(_a, ["page", "channelId", "includeDeleted"]);
     const response = await client.http.get(`/api/v5/message-feeds/channel/${channelId}`, {
-        params: Object.assign(Object.assign({}, params), { isDeleted: includeDeleted === false ? false : undefined, options: {
+        params: Object.assign(Object.assign({}, params), { isDeleted: inferIsDeleted(includeDeleted), options: {
                 token: toToken(page, 'skiplimit'),
             } }),
     });
@@ -28322,7 +28340,7 @@ const liveSubChannels = (params, callback, config) => {
     const responder = (data) => {
         var _a;
         let subChannels = data.data;
-        if (params.includeDeleted === false) {
+        if (!params.includeDeleted) {
             subChannels = filterByPropEquality(subChannels, 'isDeleted', false);
         }
         subChannels.sort(sortByLastActivity);
@@ -28446,7 +28464,7 @@ const liveMessages = (params, callback, config) => {
          * for cases when message is deleted via RTE, this flag is used to get
          * items from cache that are !deleted
          */
-        if (params.includeDeleted === false) {
+        if (!params.includeDeleted) {
             messages = filterByPropEquality(messages, 'isDeleted', false);
         }
         callback({
@@ -28466,13 +28484,13 @@ const liveMessages = (params, callback, config) => {
         pushToCache(cacheKey, collection);
         responder(collection);
     };
-    const onFetch = () => {
-        var _a, _b, _c, _d, _e;
+    const onFetch = (initial = false) => {
+        var _a, _b, _c, _d;
         const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
         const messages = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
-        if (messages.length > 0 && !((_c = collection === null || collection === void 0 ? void 0 : collection.params) === null || _c === void 0 ? void 0 : _c.page))
+        if (!initial && messages.length > 0 && !((_c = collection === null || collection === void 0 ? void 0 : collection.params) === null || _c === void 0 ? void 0 : _c.page))
             return;
-        const query = createQuery(queryMessages, Object.assign(Object.assign({}, queryParams), { page: (_e = (_d = collection === null || collection === void 0 ? void 0 : collection.params) === null || _d === void 0 ? void 0 : _d.page) !== null && _e !== void 0 ? _e : { limit } }));
+        const query = createQuery(queryMessages, 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,
@@ -28488,11 +28506,11 @@ const liveMessages = (params, callback, config) => {
         }, queryOptions(policy, CACHE_SHORTEN_LIFESPAN));
     };
     disposers.push(onMessageFetched(realtimeRouter()), onMessageCreated(realtimeRouter()), onMessageUpdated(realtimeRouter()), onMessageDeleted(realtimeRouter()), onMessageFlagged(realtimeRouter()), onMessageUnflagged(realtimeRouter()), onMessageFlagCleared(realtimeRouter()), onMessageReactionAdded(realtimeRouter()), onMessageReactionRemoved(realtimeRouter()));
-    onFetch();
+    onFetch(true);
+    disposers.push(() => dropFromCache(cacheKey));
     return () => {
         log(`liveMessages(tmpid: ${timestamp}) > dispose`);
         disposers.forEach(fn => fn());
-        dropFromCache(cacheKey);
     };
 };
 
@@ -28969,7 +28987,7 @@ const liveCommunities = (params, callback, config) => {
             .filter(Boolean)
             .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
         communities = filterByPropEquality(communities, 'displayName', params.displayName);
-        if (params.includeDeleted === false) {
+        if (!params.includeDeleted) {
             communities = filterByPropEquality(communities, 'isDeleted', false);
         }
         if (params.categoryId) {
@@ -29018,13 +29036,13 @@ const liveCommunities = (params, callback, config) => {
         pushToCache(cacheKey, collection);
         responder(collection);
     };
-    const onFetch = () => {
+    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 (communities.length > 0 && !(collection === null || collection === void 0 ? void 0 : collection.params.page))
+        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 = collection === null || collection === void 0 ? void 0 : collection.params.page) !== null && _c !== void 0 ? _c : { limit } }));
+        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,
@@ -29040,7 +29058,7 @@ const liveCommunities = (params, callback, config) => {
         }, queryOptions(policy, CACHE_SHORTEN_LIFESPAN));
     };
     disposers.push(onCommunityCreated(realtimeRouter()), onCommunityDeleted(realtimeRouter()), onCommunityUpdated(realtimeRouter()), onCommunityJoined(realtimeRouter()), onCommunityLeft(realtimeRouter()), onCommunityUserChanged(realtimeRouter()));
-    onFetch();
+    onFetch(true);
     return () => {
         log(`liveCommunities(tmpid: ${timestamp}) > dispose`);
         disposers.forEach(fn => fn());
@@ -29160,13 +29178,13 @@ const liveCommunityMembers = (params, callback, config) => {
         pushToCache(cacheKey, collection);
         responder(collection);
     };
-    const onFetch = () => {
+    const onFetch = (initial = false) => {
         var _a, _b, _c;
         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 (communityMembers.length > 0 && !(collection === null || collection === void 0 ? void 0 : collection.params.page))
+        if (!initial && communityMembers.length > 0 && !(collection === null || collection === void 0 ? void 0 : collection.params.page))
             return;
-        const query = createQuery(queryCommunityMembers, Object.assign(Object.assign({}, queryParams), { page: (_c = collection === null || collection === void 0 ? void 0 : collection.params.page) !== null && _c !== void 0 ? _c : { limit } }));
+        const query = createQuery(queryCommunityMembers, 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,
@@ -29184,7 +29202,7 @@ const liveCommunityMembers = (params, callback, config) => {
         }, queryOptions(policy));
     };
     disposers.push(onCommunityLeft(realtimeRouter()), onCommunityJoined(realtimeRouter()), onCommunityUserBanned(realtimeRouter()), onCommunityUserUnbanned(realtimeRouter()), onCommunityUserChanged(realtimeRouter()), onCommunityUserRoleAdded(realtimeRouter()), onCommunityUserRoleRemoved(realtimeRouter()));
-    onFetch();
+    onFetch(true);
     return () => {
         log(`liveCommunityMembers(tmpid: ${timestamp}) > dispose`);
         disposers.forEach(fn => fn());
@@ -29213,7 +29231,7 @@ const queryCategories = async (query) => {
     client.log('category/queryCategories', query);
     const _a = query !== null && query !== void 0 ? query : {}, { page = { limit: 10 }, includeDeleted } = _a, params = __rest(_a, ["page", "includeDeleted"]);
     const { data } = await client.http.get(`/api/v3/community-categories`, {
-        params: Object.assign(Object.assign({}, params), { isDeleted: includeDeleted === false ? false : undefined, options: {
+        params: Object.assign(Object.assign({}, params), { isDeleted: inferIsDeleted(includeDeleted), options: {
                 token: toToken(page, 'skiplimit'),
             } }),
     });
@@ -29356,7 +29374,7 @@ const liveCategories = (params, callback, config) => {
             .map(categoryId => pullFromCache(['category', 'get', categoryId]))
             .filter(Boolean)
             .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
-        if (params.includeDeleted === false) {
+        if (!params.includeDeleted) {
             categories = filterByPropEquality(categories, 'isDeleted', false);
         }
         switch (params.sortBy) {
@@ -29383,13 +29401,13 @@ const liveCategories = (params, callback, config) => {
      * observers
      *};
      */
-    const onFetch = () => {
+    const onFetch = (initial = false) => {
         var _a, _b, _c;
         const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
         const categories = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
-        if (categories.length > 0 && !(collection === null || collection === void 0 ? void 0 : collection.params.page))
+        if (!initial && categories.length > 0 && !(collection === null || collection === void 0 ? void 0 : collection.params.page))
             return;
-        const query = createQuery(queryCategories, Object.assign(Object.assign({}, queryParams), { page: (_c = collection === null || collection === void 0 ? void 0 : collection.params.page) !== null && _c !== void 0 ? _c : { limit } }));
+        const query = createQuery(queryCategories, 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,
@@ -29407,7 +29425,7 @@ const liveCategories = (params, callback, config) => {
     disposers.push(() => {
         // @TODO -> update once observers added
     });
-    onFetch();
+    onFetch(true);
     return () => {
         log(`liveCategories(tmpid: ${timestamp}) > dispose`);
         disposers.forEach(fn => fn());
@@ -30164,13 +30182,13 @@ const liveFollowers = (params, callback, config) => {
         pushToCache(cacheKey, collection);
         responder(collection);
     };
-    const onFetch = () => {
-        var _a, _b, _c, _d, _e;
+    const onFetch = (initial = false) => {
+        var _a, _b, _c, _d;
         const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
         const followers = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
-        if (followers.length > 0 && !((_c = collection === null || collection === void 0 ? void 0 : collection.params) === null || _c === void 0 ? void 0 : _c.page))
+        if (!initial && followers.length > 0 && !((_c = collection === null || collection === void 0 ? void 0 : collection.params) === null || _c === void 0 ? void 0 : _c.page))
             return;
-        const query = createQuery(queryFollowers, Object.assign(Object.assign({}, queryParams), { page: (_e = (_d = collection === null || collection === void 0 ? void 0 : collection.params) === null || _d === void 0 ? void 0 : _d.page) !== null && _e !== void 0 ? _e : { limit } }));
+        const query = createQuery(queryFollowers, 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,
@@ -30186,7 +30204,7 @@ const liveFollowers = (params, callback, config) => {
         }, queryOptions(policy));
     };
     disposers.push(onFollowerRequested(realtimeRouter('onRequested')), onFollowRequestAccepted(realtimeRouter('onAccepted')), onFollowRequestDeclined(realtimeRouter('onDeclined')), onFollowRequestCanceled(realtimeRouter('onCanceled')), onUserFollowed(realtimeRouter('onFollowed')), onUserUnfollowed(realtimeRouter('onUnfollowed')), onFollowerDeleted(realtimeRouter('onDeleted')));
-    onFetch();
+    onFetch(true);
     return () => {
         log(`liveFollowers(tmpid: ${timestamp}) > dispose`);
         disposers.forEach(fn => fn());
@@ -30254,13 +30272,13 @@ const liveFollowings = (params, callback, config) => {
         pushToCache(cacheKey, collection);
         responder(collection);
     };
-    const onFetch = () => {
-        var _a, _b, _c, _d, _e;
+    const onFetch = (initial = false) => {
+        var _a, _b, _c, _d;
         const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
         const followings = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
-        if (followings.length > 0 && !((_c = collection === null || collection === void 0 ? void 0 : collection.params) === null || _c === void 0 ? void 0 : _c.page))
+        if (!initial && followings.length > 0 && !((_c = collection === null || collection === void 0 ? void 0 : collection.params) === null || _c === void 0 ? void 0 : _c.page))
             return;
-        const query = createQuery(queryFollowings, Object.assign(Object.assign({}, queryParams), { page: (_e = (_d = collection === null || collection === void 0 ? void 0 : collection.params) === null || _d === void 0 ? void 0 : _d.page) !== null && _e !== void 0 ? _e : { limit } }));
+        const query = createQuery(queryFollowings, 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,
@@ -30276,7 +30294,7 @@ const liveFollowings = (params, callback, config) => {
         }, queryOptions(policy));
     };
     disposers.push(onFollowerRequested(realtimeRouter('onRequested')), onFollowRequestAccepted(realtimeRouter('onAccepted')), onFollowRequestDeclined(realtimeRouter('onDeclined')), onFollowRequestCanceled(realtimeRouter('onCanceled')), onUserFollowed(realtimeRouter('onFollowed')), onUserUnfollowed(realtimeRouter('onUnfollowed')), onFollowerDeleted(realtimeRouter('onDeleted')));
-    onFetch();
+    onFetch(true);
     return () => {
         log(`liveFollowings(tmpid: ${timestamp}) > dispose`);
         disposers.forEach(fn => fn());
@@ -30460,14 +30478,14 @@ const livePosts = (params, callback, config) => {
         { targetId: params.targetId, targetType: params.targetType },
     ];
     const responder = (data) => {
-        var _a, _b;
+        var _a, _b, _c;
         let posts = (_a = data.data
             .map(postId => pullFromCache(['post', 'get', postId]))
             .filter(Boolean)
             .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
         const sortBy = params.sortBy ? params.sortBy : 'lastCreated';
         posts = posts.sort(sortBy === 'lastCreated' ? sortByLastCreated : sortByFirstCreated);
-        if (params.includeDeleted === false) {
+        if (!params.includeDeleted) {
             posts = filterByPropEquality(posts, 'isDeleted', false);
         }
         if (params.tags) {
@@ -30476,10 +30494,13 @@ const livePosts = (params, callback, config) => {
         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: !!((_b = data.params) === null || _b === void 0 ? void 0 : _b.page),
+            hasNextPage: !!((_c = data.params) === null || _c === void 0 ? void 0 : _c.page),
             loading: data.loading,
             error: data.error,
         });
@@ -30500,15 +30521,16 @@ const livePosts = (params, callback, config) => {
             collection.data = [...new Set([post.postId, ...collection.data])];
         }
         pushToCache(cacheKey, collection);
+        disposers.push(() => dropFromCache(cacheKey));
         responder(collection);
     };
-    const onFetch = () => {
-        var _a, _b, _c, _d, _e;
+    const onFetch = (initial = false) => {
+        var _a, _b, _c, _d;
         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 (posts.length > 0 && !((_c = collection === null || collection === void 0 ? void 0 : collection.params) === null || _c === void 0 ? void 0 : _c.page))
+        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), { page: (_e = (_d = collection === null || collection === void 0 ? void 0 : collection.params) === null || _d === void 0 ? void 0 : _d.page) !== null && _e !== void 0 ? _e : { limit } }));
+        const query = createQuery(queryPosts, 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,
@@ -30524,11 +30546,10 @@ const livePosts = (params, callback, config) => {
         }, 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();
+    onFetch(true);
     return () => {
         log(`livePosts(tmpid: ${timestamp}) > dispose`);
         disposers.forEach(fn => fn());
-        dropFromCache(cacheKey);
     };
 };
 
@@ -30685,7 +30706,7 @@ const liveComments = (params, callback, config) => {
             .map(commentId => pullFromCache(['comment', 'get', commentId]))
             .filter(Boolean)
             .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
-        if (params.includeDeleted === false) {
+        if (!params.includeDeleted) {
             comments = filterByPropEquality(comments, 'isDeleted', false);
         }
         const sortBy = params.sortBy ? params.sortBy : 'lastCreated';
@@ -30714,13 +30735,13 @@ const liveComments = (params, callback, config) => {
         pushToCache(cacheKey, collection);
         responder(collection);
     };
-    const onFetch = () => {
-        var _a, _b, _c, _d, _e;
+    const onFetch = (initial = false) => {
+        var _a, _b, _c, _d;
         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 (comments.length > 0 && !((_c = collection === null || collection === void 0 ? void 0 : collection.params) === null || _c === void 0 ? void 0 : _c.page))
+        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), { page: (_e = (_d = collection === null || collection === void 0 ? void 0 : collection.params) === null || _d === void 0 ? void 0 : _d.page) !== null && _e !== void 0 ? _e : { limit } }));
+        const query = createQuery(queryComments, 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, prevPage, nextPage }) => {
             // depend on sortBy value we have two different pagination type
             const page = queryParams.sortBy ? nextPage : prevPage;
@@ -30738,7 +30759,7 @@ const liveComments = (params, callback, config) => {
         }, 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();
+    onFetch(true);
     return () => {
         log(`liveComments(tmpid: ${timestamp}) > dispose`);
         disposers.forEach(fn => fn());
@@ -31430,6 +31451,7 @@ exports.fileUrlWithSize = fileUrlWithSize;
 exports.filterByChannelMembership = filterByChannelMembership;
 exports.filterByCommunityMembership = filterByCommunityMembership;
 exports.filterByFeedType = filterByFeedType;
+exports.filterByPostDataTypes = filterByPostDataTypes;
 exports.filterByPropEquality = filterByPropEquality;
 exports.filterByPropInclusion = filterByPropInclusion;
 exports.follow = follow;