@amityco/ts-sdk 0.0.1-beta.41.1 → 0.0.1-beta.42.2

package/dist/index.esm.js

@@ -81,8 +81,8 @@ const PostContentType = Object.freeze({
 
 function getVersion() {
     try {
-        // the string ''v0.0.1-beta.41.1-esm'' should be replaced by actual value by @rollup/plugin-replace
-        return 'v0.0.1-beta.41.1-esm';
+        // the string ''v0.0.1-beta.42.2-esm'' should be replaced by actual value by @rollup/plugin-replace
+        return 'v0.0.1-beta.42.2-esm';
     }
     catch (error) {
         return '__dev__';
@@ -90,11 +90,22 @@ function getVersion() {
 }
 const VERSION = getVersion();
 
+const COLLECTION_DEFAULT_PAGINATION_LIMIT = 5;
+const COLLECTION_DEFAULT_CACHING_POLICY = 'cache_then_server';
+const ENABLE_CACHE_MESSAGE = 'For using Live Collection feature you need to enable Cache!';
+const LIVE_OBJECT_ENABLE_CACHE_MESSAGE = 'For using Live Object feature you need to enable Cache!';
+const UNSYNCED_OBJECT_CACHED_AT_MESSAGE = 'Observing unsynced object is not supported by Live Object.';
+const UNSYNCED_OBJECT_CACHED_AT_VALUE = -5;
+const SECOND = 1000;
+const MINUTE = 60 * SECOND;
+const ACCESS_TOKEN_WATCHER_INTERVAL = 10 * MINUTE;
+
 // cache constants
 const CACHE_KEY_GET = 'get';
 const CACHE_KEY_TOMBSTONE = 'dead';
-const CACHE_LIFESPAN = 1 * 60 * 1000; // 1 minute
-const CACHE_LIFESPAN_TOMBSTONE = 3 * 60 * 1000; // 3 minutes
+const CACHE_SHORTEN_LIFESPAN = 2 * SECOND;
+const CACHE_LIFESPAN = 1 * MINUTE; // 1 minute
+const CACHE_LIFESPAN_TOMBSTONE = 3 * MINUTE; // 3 minutes
 /**
  * Shallow-clones an object and sort its keys
  *
@@ -498,6 +509,7 @@ const idResolvers = {
     reaction: ({ reactionId }) => reactionId,
     stream: ({ streamId }) => streamId,
     follow: ({ from, to }) => `${from}#${to}`,
+    followInfo: ({ userId }) => userId,
     followCount: ({ userId }) => userId,
     feed: ({ targetId, feedId }) => `${targetId}#${feedId}`,
 };
@@ -536,8 +548,9 @@ const CRITERIAS = {
     reaction: ['reactionId'],
     stream: ['streamId'],
     follow: ['from', 'to'],
-    followCount: ['userId', 'followerCount'],
     feed: ['feedId', 'feedType'],
+    followInfo: ['userId', 'status'],
+    followCount: ['userId', 'followerCount'],
 };
 /** @hidden */
 const hasKeys = (object, needles) => {
@@ -602,7 +615,15 @@ const PAYLOAD2MODEL = {
 };
 /** hidden */
 const hasUpdates = (prevData, nextData) => {
-    return new Date(prevData.updatedAt) < new Date(nextData.updatedAt);
+    if ('updatedAt' in prevData && 'updatedAt' in nextData) {
+        return new Date(prevData.updatedAt) < new Date(nextData.updatedAt);
+    }
+    /*
+     * hasUpdates is used to identify the latest object among many. If the object
+     * does not extend ${Amity.UpdatedAt}, then there is no way to differentiate.
+     * So it is considered by default that the object hasUpdates
+     */
+    return true;
 };
 /** hidden */
 function getFutureDate(date = new Date().toISOString()) {
@@ -20357,15 +20378,6 @@ const getFeedSettings = async () => {
     }));
 };
 
-const COLLECTION_DEFAULT_PAGINATION_LIMIT = 5;
-const COLLECTION_DEFAULT_CACHING_POLICY = 'cache_then_server';
-const ENABLE_CACHE_MESSAGE = 'For using Live Collection feature you need to enable Cache!';
-const LIVE_OBJECT_ENABLE_CACHE_MESSAGE = 'For using Live Object feature you need to enable Cache!';
-const UNSYNCED_OBJECT_CACHED_AT_MESSAGE = 'Observing unsynced object is not supported by Live Object.';
-const UNSYNCED_OBJECT_CACHED_AT_VALUE = -5;
-const MINUTE = 60 * 1000;
-const ACCESS_TOKEN_WATCHER_INTERVAL = 10 * MINUTE;
-
 // TODO: find a way to uniquely identify the device
 /** @hidden */
 const getDeviceId = () => {
@@ -22177,8 +22189,8 @@ function convertParams(_a) {
     return Object.assign({ messageFeedId: subChannelId, mentionedUsers: mentionees }, rest);
 }
 function convertQueryParams$1(_a) {
-    var { page, sortBy, subChannelId, tags } = _a, rest = __rest(_a, ["page", "sortBy", "subChannelId", "tags"]);
-    const out = Object.assign(Object.assign({}, rest), { messageFeedId: subChannelId, options: { token: toToken(page || { limit: 10 }, 'afterbeforeraw') } });
+    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') } });
     if (sortBy !== undefined) {
         out.options.sortBy = sortBy;
     }
@@ -22440,7 +22452,7 @@ let uniqueId;
 const createMessage = async (bundle) => {
     const client = getActiveClient();
     client.log('message/createMessage', bundle);
-    const referenceId = uniqueId || getLocalId();
+    const referenceId = bundle.referenceId || uniqueId || getLocalId();
     uniqueId = undefined;
     const { data: payload } = await client.http.post('/api/v5/messages', Object.assign(Object.assign({}, convertParams(bundle)), { referenceId }));
     const data = prepareMessagePayload(payload);
@@ -22473,8 +22485,9 @@ const createMessage = async (bundle) => {
  *
  * @category Message API
  */
-createMessage.optimistically = (bundle) => {
-    var _a, _b;
+createMessage.optimistically = (_a) => {
+    var _b, _c;
+    var { referenceId } = _a, bundle = __rest(_a, ["referenceId"]);
     const client = getActiveClient();
     if (!client.cache)
         return;
@@ -22485,7 +22498,7 @@ createMessage.optimistically = (bundle) => {
      * Updated to handle client requirement to add messageId while uploading
      * message with image. Temporary!
      */
-    uniqueId = getLocalId();
+    uniqueId = referenceId || getLocalId();
     const bundleWithMessageId = Object.assign({ messageId: uniqueId, uniqueId }, bundle);
     client.log('message/createMessage.optimistically', bundleWithMessageId);
     const subChannel = pullFromCache(['subChannel', 'get', bundle.subChannelId]);
@@ -22494,13 +22507,13 @@ createMessage.optimistically = (bundle) => {
         if (subChannel.data.channelId === subChannel.data.subChannelId) {
             const channel = pullFromCache(['channel', 'get', subChannel.data.channelId]);
             if (channel === null || channel === void 0 ? void 0 : channel.data) {
-                upsertInCache(['channel', 'get', subChannel.data.channelId], Object.assign(Object.assign({}, channel.data), { messageCount: ((_a = channel.data.messageCount) !== null && _a !== void 0 ? _a : 0) + 1 }));
+                upsertInCache(['channel', 'get', subChannel.data.channelId], Object.assign(Object.assign({}, channel.data), { messageCount: ((_b = channel.data.messageCount) !== null && _b !== void 0 ? _b : 0) + 1 }));
             }
         }
     }
     // as reused to update created and updated time, which should be the same
     const createdTime = new Date().toISOString();
-    const message = Object.assign({ creatorId: client.userId, channelSegment: ((_b = subChannel === null || subChannel === void 0 ? void 0 : subChannel.data.messageCount) !== null && _b !== void 0 ? _b : 0) + 1, childrenNumber: 0, createdAt: createdTime, updatedAt: createdTime }, bundleWithMessageId);
+    const message = Object.assign({ creatorId: client.userId, channelSegment: ((_c = subChannel === null || subChannel === void 0 ? void 0 : subChannel.data.messageCount) !== null && _c !== void 0 ? _c : 0) + 1, childrenNumber: 0, createdAt: createdTime, updatedAt: createdTime }, bundleWithMessageId);
     const cachedAt = UNSYNCED_OBJECT_CACHED_AT_VALUE;
     pushToCache(['message', 'get', message.messageId], message, { cachedAt });
     fireEvent('local.message.created', { messages: [message] });
@@ -22718,13 +22731,13 @@ const prepareMembershipPayload = (payload, memberProp, userIdProp = 'userId', us
 const queryPosts = async (query) => {
     const client = getActiveClient();
     client.log('post/queryPosts', query);
-    const { page = { limit: 10 } } = query, params = __rest(query, ["page"]);
+    const { page = { limit: 10 }, includeDeleted } = query, params = __rest(query, ["page", "includeDeleted"]);
     const { dataTypes, matchingOnlyParentPost } = params;
     // 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), { 
+        params: Object.assign(Object.assign({}, params), { isDeleted: includeDeleted === false ? false : undefined, 
             /*
              * when creating post like image, file, video BE will create 2 posts
              * 1. parent post to store text with dataType=text
@@ -23052,12 +23065,12 @@ const queryCommunities = async (query) => {
     client.log('channel/queryCommunities', query);
     // safe decapsulation
     const _a = query !== null && query !== void 0 ? query : {}, { page } = _a, params = __rest(_a, ["page"]);
-    const _b = params !== null && params !== void 0 ? params : {}, { displayName, membership } = _b, restParams = __rest(_b, ["displayName", "membership"]);
+    const _b = params !== null && params !== void 0 ? params : {}, { displayName, membership, includeDeleted } = _b, restParams = __rest(_b, ["displayName", "membership", "includeDeleted"]);
     // API-FIX: parameters should be querystring.
     // 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), { keyword: displayName, filter: membership, options: {
+        params: Object.assign(Object.assign({}, restParams), { isDeleted: includeDeleted === false ? false : undefined, keyword: displayName, filter: membership, options: {
                 token: toToken(page, 'skiplimit'),
             } }),
     });
@@ -23898,7 +23911,7 @@ const declinePost = async (postId) => {
 const queryComments = async (query) => {
     const client = getActiveClient();
     client.log('comment/queryComments', query);
-    const { page = { limit: 10 } } = query, params = __rest(query, ["page"]);
+    const { page = { limit: 10 }, includeDeleted } = query, params = __rest(query, ["page", "includeDeleted"]);
     const options = {
         type: params.sortBy ? 'pagination' : undefined,
         token: toToken(page, params.sortBy ? 'skiplimit' : 'afterbefore'),
@@ -23908,7 +23921,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), { 
+        params: Object.assign(Object.assign({}, params), { isDeleted: includeDeleted === false ? false : undefined, 
             //      filterByParentId, API-FIX: backend does not support this boolean LOL. what the hell seriously.
             options }),
     });
@@ -26765,6 +26778,11 @@ const liveChannel = (channelId, callback) => {
         onChannelUpdated,
         onChannelDeleted,
         onChannelJoined,
+        onChannelLeft,
+        onChannelMemberAdded,
+        onChannelMemberRemoved,
+        onChannelMemberBanned,
+        onChannelMemberUnbanned,
         onChannelMuted,
         () => onMessageCreated(() => null), // watch unread count
     ]);
@@ -26881,13 +26899,14 @@ const liveChannels = (params, callback, config) => {
             }
             pushToCache(cacheKey, data);
             responder(data);
-        }, queryOptions(policy));
+        }, 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();
     return () => {
         log(`liveChannels(tmpid: ${timestamp}) > dispose`);
         disposers.forEach(fn => fn());
+        dropFromCache(cacheKey);
     };
 };
 
@@ -27045,9 +27064,9 @@ function convertQueryParams(_a) {
 const querySubChannels = async (query) => {
     const client = getActiveClient();
     client.log('channel/querySubChannels', query);
-    const _a = convertQueryParams(query), { page = { limit: 10 }, channelId } = _a, params = __rest(_a, ["page", "channelId"]);
+    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), { options: {
+        params: Object.assign(Object.assign({}, params), { isDeleted: includeDeleted === false ? false : undefined, options: {
                 token: toToken(page, 'skiplimit'),
             } }),
     });
@@ -27490,8 +27509,8 @@ const liveSubChannels = (params, callback, config) => {
     const responder = (data) => {
         var _a;
         let subChannels = data.data;
-        if (params.isDeleted !== undefined) {
-            subChannels = filterByPropEquality(subChannels, 'isDeleted', params.isDeleted);
+        if (params.includeDeleted === false) {
+            subChannels = filterByPropEquality(subChannels, 'isDeleted', false);
         }
         subChannels.sort(sortByLastActivity);
         callback({
@@ -27531,7 +27550,7 @@ const liveSubChannels = (params, callback, config) => {
                 data: result ? merge(subChannels, result) : subChannels,
             };
             responder(snapshot);
-        }, queryOptions(policy));
+        }, queryOptions(policy, CACHE_SHORTEN_LIFESPAN));
     };
     disposers.push(onSubChannelCreated(realtimeRouter('onCreate')), onSubChannelDeleted(realtimeRouter('onDelete')), onSubChannelFetched(realtimeRouter('onFetch')), onSubChannelUpdated(realtimeRouter('onUpdate')));
     onFetch();
@@ -27636,9 +27655,11 @@ const liveMessages = (params, callback, config) => {
             .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
         /*
          * for cases when message is deleted via RTE, this flag is used to get
-         * items fro cache that are deleted | !deleted
+         * items from cache that are !deleted
          */
-        messages = filterByPropEquality(messages, 'isDeleted', params.isDeleted);
+        if (params.includeDeleted === false) {
+            messages = filterByPropEquality(messages, 'isDeleted', false);
+        }
         callback({
             onNextPage: onFetch,
             data: messages,
@@ -27647,17 +27668,12 @@ const liveMessages = (params, callback, config) => {
             error: data.error,
         });
     };
-    const realtimeRouter = (action) => (message) => {
+    const realtimeRouter = (_) => (message) => {
         var _a;
         const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-        if (params.subChannelId !== message.subChannelId || !collection)
+        if (params.subChannelId !== (message === null || message === void 0 ? void 0 : message.subChannelId) || !collection)
             return;
-        if (action === 'onCreate') {
-            collection.data = [...new Set([message.messageId, ...collection.data])];
-        }
-        else if (['onDelete'].includes(action)) {
-            collection.data = collection.data.filter(m => m !== message.messageId);
-        }
+        collection.data = [...new Set([message.messageId, ...collection.data])];
         pushToCache(cacheKey, collection);
         responder(collection);
     };
@@ -27680,13 +27696,14 @@ const liveMessages = (params, callback, config) => {
             }
             pushToCache(cacheKey, data);
             responder(data);
-        }, queryOptions(policy));
+        }, queryOptions(policy, CACHE_SHORTEN_LIFESPAN));
     };
-    disposers.push(onMessageFetched(realtimeRouter('onFetch')), onMessageCreated(realtimeRouter('onCreate')), onMessageUpdated(realtimeRouter('onUpdate')), onMessageDeleted(realtimeRouter('onDelete')), onMessageFlagged(realtimeRouter('onFlagged')), onMessageUnflagged(realtimeRouter('onUnflagged')), onMessageFlagCleared(realtimeRouter('onFlagCleared')), onMessageReactionAdded(realtimeRouter('onReactionAdded')), onMessageReactionRemoved(realtimeRouter('onReactionRemoved')));
+    disposers.push(onMessageFetched(realtimeRouter()), onMessageCreated(realtimeRouter()), onMessageUpdated(realtimeRouter()), onMessageDeleted(realtimeRouter()), onMessageFlagged(realtimeRouter()), onMessageUnflagged(realtimeRouter()), onMessageFlagCleared(realtimeRouter()), onMessageReactionAdded(realtimeRouter()), onMessageReactionRemoved(realtimeRouter()));
     onFetch();
     return () => {
         log(`liveMessages(tmpid: ${timestamp}) > dispose`);
         disposers.forEach(fn => fn());
+        dropFromCache(cacheKey);
     };
 };
 
@@ -28162,8 +28179,10 @@ const liveCommunities = (params, callback, config) => {
             .map(communityId => pullFromCache(['community', 'get', communityId]))
             .filter(Boolean)
             .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
-        communities = filterByPropEquality(communities, 'isDeleted', params.isDeleted);
         communities = filterByPropEquality(communities, 'displayName', params.displayName);
+        if (params.includeDeleted === false) {
+            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); });
         }
@@ -28232,13 +28251,14 @@ const liveCommunities = (params, callback, config) => {
             }
             pushToCache(cacheKey, data);
             responder(data);
-        }, queryOptions(policy));
+        }, queryOptions(policy, CACHE_SHORTEN_LIFESPAN));
     };
     disposers.push(onCommunityCreated(realtimeRouter()), onCommunityDeleted(realtimeRouter()), onCommunityUpdated(realtimeRouter()), onCommunityJoined(realtimeRouter()), onCommunityLeft(realtimeRouter()), onCommunityUserChanged(realtimeRouter()));
     onFetch();
     return () => {
         log(`liveCommunities(tmpid: ${timestamp}) > dispose`);
         disposers.forEach(fn => fn());
+        dropFromCache(cacheKey);
     };
 };
 
@@ -28405,9 +28425,9 @@ const liveCommunityMembers = (params, callback, config) => {
 const queryCategories = async (query) => {
     const client = getActiveClient();
     client.log('category/queryCategories', query);
-    const _a = query !== null && query !== void 0 ? query : {}, { page = { limit: 10 } } = _a, params = __rest(_a, ["page"]);
+    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), { options: {
+        params: Object.assign(Object.assign({}, params), { isDeleted: includeDeleted === false ? false : undefined, options: {
                 token: toToken(page, 'skiplimit'),
             } }),
     });
@@ -28550,7 +28570,9 @@ const liveCategories = (params, callback, config) => {
             .map(categoryId => pullFromCache(['category', 'get', categoryId]))
             .filter(Boolean)
             .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
-        categories = filterByPropEquality(categories, 'isDeleted', params.isDeleted);
+        if (params.includeDeleted === false) {
+            categories = filterByPropEquality(categories, 'isDeleted', false);
+        }
         switch (params.sortBy) {
             case 'firstCreated':
                 categories = categories.sort(sortByFirstCreated);
@@ -28808,11 +28830,6 @@ const queryFollowings = async (query) => queryFollows('following', query);
  */
 queryFollowings.locally = (query) => queryFollows.locally('following', query);
 
-const getCacheKey = (userId) => [
-    'followInfo',
-    'get',
-    `${getActiveClient().userId}#${userId}`,
-];
 /* begin_public_function
   id: user.relationship.get_follow_info, user.relationship.get_my_follow_info
 */
@@ -28839,7 +28856,9 @@ const getFollowInfo = async (userId) => {
     const followInfo = 'follows' in data
         ? Object.assign(Object.assign({}, data.followCounts[0]), { status: (_b = (_a = data.follows) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.status }) : data.followCounts[0];
     if (client.cache) {
-        pushToCache(getCacheKey(userId), followInfo, { cachedAt });
+        pushToCache(['followInfo', 'get', userId], followInfo, {
+            cachedAt,
+        });
     }
     return {
         data: followInfo,
@@ -28866,7 +28885,7 @@ getFollowInfo.locally = (userId) => {
     if (!client.cache) {
         return;
     }
-    const cached = pullFromCache(getCacheKey(userId));
+    const cached = pullFromCache(['followInfo', 'get', userId]);
     if (!cached) {
         return;
     }
@@ -29478,6 +29497,29 @@ const liveFollowings = (params, callback, config) => {
     };
 };
 
+/**
+ * ```js
+ * import { liveFollowInfo } from '@amityco/ts-sdk';
+ *
+ * let followInfo;
+ *
+ * const unsubscribe = liveFollowInfo(userId, response => {
+ *   followInfo = response.data;
+ * });
+ * ```
+ *
+ * Observe all mutation on a given {@link Amity.FollowCount} object
+ *
+ * @param userId the ID of the current user
+ * @param callback the function to call when new data are available
+ * @returns An {@link Amity.Unsubscriber} function to run when willing to stop observing
+ *
+ * @category FollowInfo Live Object
+ */
+const liveFollowInfo = (userId, callback) => {
+    return liveObject(userId, callback, 'userId', getFollowInfo, [onFollowInfoUpdated]);
+};
+
 /**
  * ```js
  * import { observePosts } from '@amityco/ts-sdk'
@@ -29637,9 +29679,11 @@ const livePosts = (params, callback, config) => {
             .map(postId => pullFromCache(['post', 'get', postId]))
             .filter(Boolean)
             .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
-        posts = filterByPropEquality(posts, 'isDeleted', params.isDeleted);
         const sortBy = params.sortBy ? params.sortBy : 'lastCreated';
         posts = posts.sort(sortBy === 'lastCreated' ? sortByLastCreated : sortByFirstCreated);
+        if (params.includeDeleted === 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); }); });
         }
@@ -29691,13 +29735,14 @@ const livePosts = (params, callback, config) => {
             }
             pushToCache(cacheKey, data);
             responder(data);
-        }, queryOptions(policy));
+        }, 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();
     return () => {
         log(`livePosts(tmpid: ${timestamp}) > dispose`);
         disposers.forEach(fn => fn());
+        dropFromCache(cacheKey);
     };
 };
 
@@ -29854,7 +29899,9 @@ const liveComments = (params, callback, config) => {
             .map(commentId => pullFromCache(['comment', 'get', commentId]))
             .filter(Boolean)
             .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
-        comments = filterByPropEquality(comments, 'isDeleted', params.isDeleted);
+        if (params.includeDeleted === false) {
+            comments = filterByPropEquality(comments, 'isDeleted', false);
+        }
         const sortBy = params.sortBy ? params.sortBy : 'lastCreated';
         comments = comments.sort(sortBy === 'lastCreated' ? sortByLastCreated : sortByFirstCreated);
         callback({
@@ -29902,13 +29949,14 @@ const liveComments = (params, callback, config) => {
             }
             pushToCache(cacheKey, data);
             responder(data);
-        }, queryOptions(policy));
+        }, 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();
     return () => {
         log(`liveComments(tmpid: ${timestamp}) > dispose`);
         disposers.forEach(fn => fn());
+        dropFromCache(cacheKey);
     };
 };
 
@@ -30534,4 +30582,4 @@ const createUserToken = async (apiKey, apiRegion, params) => {
     return { accessToken: data.accessToken };
 };
 
-export { API_REGIONS, CommunityPostSettingMaps, CommunityPostSettings, ContentFeedType, DefaultCommunityPostSetting, FileType, MessageContentType, PostContentType, SubscriptionLevels, VERSION, VideoResolution, VideoSize, VideoTranscodingStatus, acceptFollower, addChannelMembers, addChannelMembersRole, addCommunityMembers, addCommunityMembersRoles, addReaction, approvePost, backupCache, banChannelMembers, closePoll, connectClient, createChannel, createClient, createComment, createCommunity, createFile, createImage, createMessage, createPoll, createPost, createQuery, createReport, createStream, createSubChannel, createUserToken, createVideo, declineFollower, declinePost, deleteChannel, deleteComment, deleteCommunity, deleteFile, deleteMessage, deletePoll, deletePost, deleteReport, deleteStream, deleteSubChannel, disableCache, disconnectClient, disposeStream, dropFromCache, enableCache, fileUrlWithSize, filterByChannelMembership, filterByFeedType, filterByPropEquality, filterByPropInclusion, follow, getActiveClient, getCategory, getChannel, getChannelTopic, getChannels, getComment, getCommentTopic, getComments, getCommunities, getCommunity, getCommunityTopic, getFeedSettings, getFile, getFollowInfo, getMessage, getMessageTopic, getMessages, getMyFollowersTopic, getMyFollowingsTopic, getNetworkTopic, getPoll, getPost, getPostTopic, getPosts, getRecommendedCommunities, getRole, getSmartFeedChannelTopic, getSmartFeedMessageTopic, getSmartFeedSubChannelTopic, getStream, getSubChannel, getSubChannelTopic, getSubChannels, getTopTrendingCommunities, getUser, getUserTopic, getUsers, isAfterBefore, isAfterBeforeRaw, isCachable, isConnected, isFetcher, isFresh, isLocal, isMutator, isOffline, isPaged, isReportedByMe, isSkip, joinChannel, joinCommunity, leaveChannel, leaveCommunity, liveCategories, liveChannel, liveChannelMembers, liveChannels, liveComment, liveComments, liveCommunities, liveCommunity, liveCommunityMembers, liveFollowers, liveFollowings, liveMessage, liveMessages, livePost, livePosts, liveReactions, liveSubChannel, liveSubChannels, liveUser, liveUsers, mergeInCache, observeChannel, observeChannels, observeComment, observeComments, observeCommunity, observeFile, observeFollowInfo, observeFollowers, observeFollowings, observeMessage, observeMessages, observePoll, observePost, observePosts, observeUser, onChannelCreated, onChannelDeleted, onChannelJoined, onChannelLeft, onChannelMemberAdded, onChannelMemberBanned, onChannelMemberRemoved, onChannelMemberUnbanned, onChannelMuted, onChannelUpdated, onClientBanned, onClientDisconnected, onCommentCreated, onCommentDeleted, onCommentFlagged, onCommentReactionAdded, onCommentReactionRemoved, onCommentUnflagged, onCommentUpdated, onCommunityCreated, onCommunityDeleted, onCommunityJoined, onCommunityLeft, onCommunityUpdated, onCommunityUserAdded, onCommunityUserBanned, onCommunityUserChanged, onCommunityUserRemoved, onCommunityUserRoleAdded, onCommunityUserRoleRemoved, onCommunityUserUnbanned, onConnectionError, onFollowInfoUpdated, onFollowRequestAccepted, onFollowRequestCanceled, onFollowRequestDeclined, onFollowerDeleted, onFollowerRequested, onMessageCreated, onMessageDeleted, onMessageFlagCleared, onMessageFlagged, onMessageReactionAdded, onMessageReactionRemoved, onMessageUnflagged, onMessageUpdated, onPollDeleted, onPollUpdated, onPostApproved, onPostCreated, onPostDeclined, onPostDeleted, onPostFlagged, onPostReactionAdded, onPostReactionRemoved, onPostUnflagged, onPostUpdated, onReactionAdded, onReactionRemoved, onReactorAdded, onReactorRemoved, onSessionStateChange, onStreamRecorded, onStreamStarted, onStreamStopped, onSubChannelCreated, onSubChannelDeleted, onSubChannelUpdated, onUserDeleted, onUserFlagCleared, onUserFlagged, onUserFollowed, onUserUnflagged, onUserUnfollowed, onUserUpdated, pullFromCache, pushToCache, queryCache, queryCategories, queryChannelMembers, queryChannels, queryComments, queryCommunities, queryCommunityMembers, queryFollowers, queryFollowings, queryGlobalFeed, queryMessages, queryOptions, queryPosts, queryReactions, queryRoles, queryStreams, querySubChannels, queryUsers, removeChannelMembers, removeChannelMembersRole, removeCommunityMembers, removeCommunityMembersRoles, removeReaction, renewal, restoreCache, runQuery, sortByChannelSegment, sortByDisplayName, sortByFirstCreated, sortByLastActivity, sortByLastCreated, sortByName, sortBySegmentNumber, startReading, stopReading, subscribeTopic, toPage, toPageRaw, toToken, unbanChannelMembers, unfollow, updateChannel, updateComment, updateCommunity, updateMessage, updatePost, updateStream, updateSubChannel, updateUser, upsertInCache, votePoll, wipeCache };
+export { API_REGIONS, CommunityPostSettingMaps, CommunityPostSettings, ContentFeedType, DefaultCommunityPostSetting, FileType, MessageContentType, PostContentType, SubscriptionLevels, VERSION, VideoResolution, VideoSize, VideoTranscodingStatus, acceptFollower, addChannelMembers, addChannelMembersRole, addCommunityMembers, addCommunityMembersRoles, addReaction, approvePost, backupCache, banChannelMembers, closePoll, connectClient, createChannel, createClient, createComment, createCommunity, createFile, createImage, createMessage, createPoll, createPost, createQuery, createReport, createStream, createSubChannel, createUserToken, createVideo, declineFollower, declinePost, deleteChannel, deleteComment, deleteCommunity, deleteFile, deleteMessage, deletePoll, deletePost, deleteReport, deleteStream, deleteSubChannel, disableCache, disconnectClient, disposeStream, dropFromCache, enableCache, fileUrlWithSize, filterByChannelMembership, filterByFeedType, filterByPropEquality, filterByPropInclusion, follow, getActiveClient, getCategory, getChannel, getChannelTopic, getChannels, getComment, getCommentTopic, getComments, getCommunities, getCommunity, getCommunityTopic, getFeedSettings, getFile, getFollowInfo, getMessage, getMessageTopic, getMessages, getMyFollowersTopic, getMyFollowingsTopic, getNetworkTopic, getPoll, getPost, getPostTopic, getPosts, getRecommendedCommunities, getRole, getSmartFeedChannelTopic, getSmartFeedMessageTopic, getSmartFeedSubChannelTopic, getStream, getSubChannel, getSubChannelTopic, getSubChannels, getTopTrendingCommunities, getUser, getUserTopic, getUsers, isAfterBefore, isAfterBeforeRaw, isCachable, isConnected, isFetcher, isFresh, isLocal, isMutator, isOffline, isPaged, isReportedByMe, isSkip, joinChannel, joinCommunity, leaveChannel, leaveCommunity, liveCategories, liveChannel, liveChannelMembers, liveChannels, liveComment, liveComments, liveCommunities, liveCommunity, liveCommunityMembers, liveFollowInfo, liveFollowers, liveFollowings, liveMessage, liveMessages, livePost, livePosts, liveReactions, liveSubChannel, liveSubChannels, liveUser, liveUsers, mergeInCache, observeChannel, observeChannels, observeComment, observeComments, observeCommunity, observeFile, observeFollowInfo, observeFollowers, observeFollowings, observeMessage, observeMessages, observePoll, observePost, observePosts, observeUser, onChannelCreated, onChannelDeleted, onChannelJoined, onChannelLeft, onChannelMemberAdded, onChannelMemberBanned, onChannelMemberRemoved, onChannelMemberUnbanned, onChannelMuted, onChannelUpdated, onClientBanned, onClientDisconnected, onCommentCreated, onCommentDeleted, onCommentFlagged, onCommentReactionAdded, onCommentReactionRemoved, onCommentUnflagged, onCommentUpdated, onCommunityCreated, onCommunityDeleted, onCommunityJoined, onCommunityLeft, onCommunityUpdated, onCommunityUserAdded, onCommunityUserBanned, onCommunityUserChanged, onCommunityUserRemoved, onCommunityUserRoleAdded, onCommunityUserRoleRemoved, onCommunityUserUnbanned, onConnectionError, onFollowInfoUpdated, onFollowRequestAccepted, onFollowRequestCanceled, onFollowRequestDeclined, onFollowerDeleted, onFollowerRequested, onMessageCreated, onMessageDeleted, onMessageFlagCleared, onMessageFlagged, onMessageReactionAdded, onMessageReactionRemoved, onMessageUnflagged, onMessageUpdated, onPollDeleted, onPollUpdated, onPostApproved, onPostCreated, onPostDeclined, onPostDeleted, onPostFlagged, onPostReactionAdded, onPostReactionRemoved, onPostUnflagged, onPostUpdated, onReactionAdded, onReactionRemoved, onReactorAdded, onReactorRemoved, onSessionStateChange, onStreamRecorded, onStreamStarted, onStreamStopped, onSubChannelCreated, onSubChannelDeleted, onSubChannelUpdated, onUserDeleted, onUserFlagCleared, onUserFlagged, onUserFollowed, onUserUnflagged, onUserUnfollowed, onUserUpdated, pullFromCache, pushToCache, queryCache, queryCategories, queryChannelMembers, queryChannels, queryComments, queryCommunities, queryCommunityMembers, queryFollowers, queryFollowings, queryGlobalFeed, queryMessages, queryOptions, queryPosts, queryReactions, queryRoles, queryStreams, querySubChannels, queryUsers, removeChannelMembers, removeChannelMembersRole, removeCommunityMembers, removeCommunityMembersRoles, removeReaction, renewal, restoreCache, runQuery, sortByChannelSegment, sortByDisplayName, sortByFirstCreated, sortByLastActivity, sortByLastCreated, sortByName, sortBySegmentNumber, startReading, stopReading, subscribeTopic, toPage, toPageRaw, toToken, unbanChannelMembers, unfollow, updateChannel, updateComment, updateCommunity, updateMessage, updatePost, updateStream, updateSubChannel, updateUser, upsertInCache, votePoll, wipeCache };