@amityco/ts-sdk 6.35.3-fa3d4ac.0 → 7.0.1-7547014.0

package/dist/index.esm.js

@@ -87,8 +87,8 @@ const PostContentType = Object.freeze({
 
 function getVersion() {
     try {
-        // the string ''v6.35.2-esm'' should be replaced by actual value by @rollup/plugin-replace
-        return 'v6.35.2-esm';
+        // the string ''v7.0.0-esm'' should be replaced by actual value by @rollup/plugin-replace
+        return 'v7.0.0-esm';
     }
     catch (error) {
         return '__dev__';
@@ -1304,9 +1304,6 @@ const WS_EVENTS = [
     'sessionStateChange',
     // for internal use by accessTokenExpiryWatcher
     'tokenExpired',
-    'v3.video-streaming.didRecord',
-    'v3.video-streaming.didStart',
-    'v3.video-streaming.didStop',
 ];
 const MQTT_EVENTS = [
     'connect',
@@ -1316,7 +1313,12 @@ const MQTT_EVENTS = [
     'close',
     'end',
     'reconnect',
-    'user.didGlobalBan',
+    'video-streaming.didStart',
+    'video-streaming.didRecord',
+    'video-streaming.didStop',
+    'video-streaming.didFlag',
+    'video-streaming.didTerminate',
+    // 'user.didGlobalBan' remove due to message event,
 ];
 /** @hidden */
 const createEventEmitter = () => {
@@ -1515,7 +1517,11 @@ function subscribeTopic(topic, callback) {
         return () => null;
     modifyMqttConnection();
     return mqtt.subscribe(topic, callback);
-}
+}
+const getLiveStreamTopic = () => {
+    const user = getActiveUser();
+    return `${getNetworkId(user)}/videostreaming`;
+};
 
 var _a;
 /* eslint-disable no-undef */
@@ -1551,7 +1557,7 @@ const API_REGIONS = {
     US: 'us',
 };
 const URLS = {
-    http: 'https://api.{region}.amity.co',
+    http: 'https://apix.{region}.amity.co',
     mqtt: 'wss://sse.{region}.amity.co:443/mqtt',
 };
 function computeUrl(type, region) {
@@ -20460,6 +20466,7 @@ const subscribeGlobalTopic = () => {
         // subscribing to user topic is necessary to handle ban event
         subscribeTopic(getUserTopic(getActiveUser())),
         subscribeTopic(getMarkerUserFeedTopic()),
+        subscribeTopic(getLiveStreamTopic()),
     ];
     return () => disposers.forEach(fn => fn());
 };
@@ -21972,9 +21979,6 @@ const reactorLinkedObject = (reactor) => {
  * import { ChannelRepository } from '@amityco/ts-sdk'
  * const success = await ChannelRepository.markAsRead('channelId')
  * ```
- *
- * @deprecated Please use the {@link Amity.Channel.markAsRead} method instead
- *
  * Updating all {@link Amity.SubChannel} in specify {@link Amity.Channel} as read
  *
  * @param channelId the ID of to specify {@link Amity.Channel}
@@ -22587,7 +22591,7 @@ const prepareMessagePayload = async (payload, event) => {
             var _a, _b;
             const subChannelCache = (_b = (_a = pullFromCache(['subChannel', 'get', messageFeed.messageFeedId])) === null || _a === void 0 ? void 0 : _a.data) !== null && _b !== void 0 ? _b : {};
             // exclude getter properties from existing subChannel cache, update only other properties to existing subChannel cache
-            const _c = convertFromRaw$2(messageFeed), restSubChannel = __rest(_c, ["unreadCount", "hasMentioned", "isMentioned"]);
+            const _c = convertFromRaw$2(messageFeed), restSubChannel = __rest(_c, ["unreadCount", "isMentioned"]);
             updateSubChannelCache(messageFeed.messageFeedId, subChannelCache, restSubChannel);
         });
     }
@@ -22601,15 +22605,12 @@ function convertParams(_a) {
     return Object.assign({ messageFeedId: subChannelId, mentionedUsers: mentionees, dataType, data }, rest);
 }
 function convertQueryParams$1(_a) {
-    var { sortBy, subChannelId, tags, includingTags, excludingTags, includeDeleted, aroundMessageId, limit, type } = _a, rest = __rest(_a, ["sortBy", "subChannelId", "tags", "includingTags", "excludingTags", "includeDeleted", "aroundMessageId", "limit", "type"]);
+    var { sortBy, subChannelId, includingTags, excludingTags, includeDeleted, aroundMessageId, limit, type } = _a, rest = __rest(_a, ["sortBy", "subChannelId", "includingTags", "excludingTags", "includeDeleted", "aroundMessageId", "limit", "type"]);
     const out = Object.assign(Object.assign({}, rest), { messageFeedId: subChannelId, isDeleted: inferIsDeleted(includeDeleted), options: {
             sortBy,
             limit: limit || COLLECTION_DEFAULT_PAGINATION_LIMIT,
             around: aroundMessageId,
         } });
-    if (tags) {
-        out.includeTags = tags;
-    }
     if (includingTags) {
         out.includeTags = includingTags;
     }
@@ -23093,22 +23094,27 @@ const getSubChannelsUnreadCount = (channel, marker) => {
 };
 
 const constructChannelDynamicValue = (channel) => {
-    return shallowClone(channel, {
-        get unreadCount() {
-            return getSubChannelsUnreadCount(channel);
-        },
-        get hasMentioned() {
-            return getChannelIsMentioned(channel);
-        },
+    const rest = __rest(channel, ["messageCount"]);
+    return shallowClone(rest, {
         get isMentioned() {
-            return getChannelIsMentioned(channel);
+            return getChannelIsMentioned(rest);
         },
         get subChannelsUnreadCount() {
-            return getSubChannelsUnreadCount(channel);
+            return getSubChannelsUnreadCount(rest);
         },
     });
 };
 
+const constructChannelObject = (channel) => {
+    /**
+     * convert internal cache data to be public channel data
+     * 1. [getChannelMessagePreviewWithUser] add messagePreview >> Amity.InternalChannel -> Amity.InternalChannel
+     * 2. [constructChannelDynamicValue] construct getter value >> Amity.StaticInternalChannel -> Amity.Channel
+     * 3. [LinkedObject.channel] add markAsRead >> Amity.InternalChannel -> Amity.Channel
+     */
+    return LinkedObject.channel(constructChannelDynamicValue(getChannelMessagePreviewWithUser(channel)));
+};
+
 /**
  * ```js
  * import { getChannelByIds } from '@amityco/ts-sdk'
@@ -23123,7 +23129,7 @@ const constructChannelDynamicValue = (channel) => {
  * @category Channel API
  * @async
  */
-const getChannelByIds = async (channelIds) => {
+const getChannelByIds$1 = async (channelIds) => {
     const client = getActiveClient();
     client.log('channel/getChannelByIds', channelIds);
     const encodedChannelIds = channelIds.map(channelId => encodeURIComponent(channelId));
@@ -23153,7 +23159,7 @@ const getChannelByIds = async (channelIds) => {
         ingestInCache(data, { cachedAt });
     fireEvent('local.channel.fetched', data.channels);
     return {
-        data: data.channels.map(channel => LinkedObject.channel(constructChannelDynamicValue(channel))),
+        data: data.channels.map(channel => constructChannelObject(channel)),
         cachedAt,
     };
 };
@@ -23170,7 +23176,7 @@ const getChannelByIds = async (channelIds) => {
  *
  * @category Channel API
  */
-getChannelByIds.locally = (channelIds) => {
+getChannelByIds$1.locally = (channelIds) => {
     var _a, _b;
     const client = getActiveClient();
     client.log('channel/getChannelByIds.locally', channelIds);
@@ -23184,7 +23190,7 @@ getChannelByIds.locally = (channelIds) => {
     const channels = cached.map(({ data }) => data);
     const oldest = (_b = cached.sort((a, b) => (a.cachedAt < b.cachedAt ? -1 : 1))) === null || _b === void 0 ? void 0 : _b[0];
     return {
-        data: channels.map(channel => LinkedObject.channel(channel)),
+        data: channels.map(channel => constructChannelObject(channel)),
         cachedAt: oldest.cachedAt,
     };
 };
@@ -23242,20 +23248,6 @@ const setIntervalTask = (handler, timeout) => {
     return () => clearInterval(timer);
 };
 
-const onOnline = (callback) => {
-    if (typeof window !== 'undefined' && window.addEventListener) {
-        window.addEventListener('online', callback);
-        return () => window.removeEventListener('online', callback);
-    }
-    if (typeof document !== 'undefined' && document.addEventListener) {
-        document.addEventListener('online', callback);
-        return () => document.removeEventListener('online', callback);
-    }
-    // Handle unsupported environment
-    console.error('Unsupported environment');
-    return () => console.error('Unsupported environment');
-};
-
 /**
  * ```js
  * import { SubChannel } from '@amityco/ts-sdk'
@@ -23288,73 +23280,8 @@ const readingAPI = async (messageFeedIds) => {
     return true;
 };
 
-/**
- * ```js
- * import { SubChannel } from '@amityco/ts-sdk'
- * const success = await SubChannel('foo')
- * ```
- *
- * Mark all messages as read and start reading message inside channel
- *
- * @param messageFeedId - Sub channel ID to start reading.
- * @return A success boolean if reading of the sub channel had begun.
- *
- * @category Channel API
- * @async
- * @private
- */
-const startReadingAPI = async (messageFeedId) => {
-    const client = getActiveClient();
-    client.log('subChannel/startReadingAPI', messageFeedId);
-    const { data: payload } = await client.http.post(`/api/v1/markers/message-feeds/${messageFeedId}/start-reading`);
-    const { userEntityMarkers: userEntityMarkersPayload, userFeedMarkers: userFeedMarkersPayload, feedMarkers, userMarkers, } = payload;
-    const userEntityMarkers = convertChannelMarkerResponse(userEntityMarkersPayload);
-    const userFeedMarkers = convertSubChannelMarkerResponse(userFeedMarkersPayload);
-    const cachedAt = client.cache && Date.now();
-    if (client.cache)
-        ingestInCache({ userEntityMarkers, userFeedMarkers, feedMarkers, userMarkers }, { cachedAt });
-    fireEvent('local.feedMarker.fetched', { feedMarkers });
-    fireEvent('local.channelMarker.fetched', { userEntityMarkers });
-    fireEvent('local.subChannelMarker.fetched', { userFeedMarkers });
-    fireEvent('local.userMarker.fetched', { userMarkers });
-    return true;
-};
-
-/**
- * ```js
- * import { stopReading } from '@amityco/ts-sdk'
- * const success = await stopReading('foo')
- * ```
- *
- * Mark all messages as read and stop reading message inside channel
- *
- * @param messageFeedId - The sub channel ID to stop reading.
- * @return A success boolean if reading of the sub channel had begun.
- *
- * @category Channel API
- * @async
- * @private
- */
-const stopReadingAPI = async (messageFeedId) => {
-    const client = getActiveClient();
-    client.log('channel/stopReadingAPI', messageFeedId);
-    const { data: payload } = await client.http.post(`/api/v1/markers/message-feeds/${messageFeedId}/stop-reading`);
-    const { userEntityMarkers: userEntityMarkersPayload, userFeedMarkers: userFeedMarkersPayload, feedMarkers, userMarkers, } = payload;
-    const userEntityMarkers = convertChannelMarkerResponse(userEntityMarkersPayload);
-    const userFeedMarkers = convertSubChannelMarkerResponse(userFeedMarkersPayload);
-    const cachedAt = client.cache && Date.now();
-    if (client.cache)
-        ingestInCache({ userEntityMarkers, userFeedMarkers, feedMarkers, userMarkers }, { cachedAt });
-    fireEvent('local.feedMarker.fetched', { feedMarkers });
-    fireEvent('local.channelMarker.fetched', { userEntityMarkers });
-    fireEvent('local.subChannelMarker.fetched', { userFeedMarkers });
-    fireEvent('local.userMarker.fetched', { userMarkers });
-    return true;
-};
-
 const START_READING_INTERVAL_TIME = 30000;
 let isSyncRunning$1 = false;
-let disposers$2 = [];
 /**
  * map contains subChannelId and isReading flag to determine which subChannel is on reading state
  */
@@ -23398,91 +23325,6 @@ const markReadEngineOnLoginHandler = () => {
         stopIntervalTask();
     };
 };
-const getParentChannelId$1 = async (subChannelId) => {
-    const cached = getSubChannel$1.locally(subChannelId);
-    if (cached) {
-        return cached.data.channelId;
-    }
-    const { data } = await getSubChannel$1(subChannelId);
-    return data.channelId;
-};
-const registerEventListeners$1 = () => {
-    if (disposers$2.length > 0) {
-        return;
-    }
-    disposers$2.push(onOnline(() => {
-        // Start reading the reading subChannel again when resume from offline state
-        startReadingFromReadingList();
-    }));
-};
-const registerTopicSubscribers$1 = async (subChannelId) => {
-    const channelId = await getParentChannelId$1(subChannelId);
-    const markedMessageTopic = getMarkedMessageTopic({ channelId, subChannelId });
-    disposers$2.push(subscribeTopic(markedMessageTopic));
-};
-const disposeAll = () => {
-    disposers$2.forEach(fn => fn());
-    disposers$2 = [];
-};
-/* begin_public_function
-  id: subchannel.start_reading
-*/
-/**
- * @deprecated Use {@link startMessageReceiptSync} instead.
- * ```js
- * import { startReading } from '@amityco/ts-sdk'
- * const success = await startReading('foo')
- * ```
- *
- * Set local reading state of channel to `true` and then call mark all
- * messages as read API.
- *
- * @param subChannelId - The sub channel ID to start reading.
- * @return A success boolean if reading of the sub channel had begun.
- *
- * @category Channel API
- * @async
- */
-const startReading = async (subChannelId) => {
-    isReadingMap[subChannelId] = true;
-    if (disposers$2.length === 0) {
-        registerEventListeners$1();
-        registerTopicSubscribers$1(subChannelId);
-    }
-    try {
-        return await startReadingAPI(subChannelId);
-    }
-    catch (e) {
-        isReadingMap[subChannelId] = false;
-        return false;
-    }
-};
-/* end_public_function */
-/* begin_public_function
-  id: subchannel.stop_reading
-*/
-/**
- * @deprecated Use {@link stopMessageReceiptSync} instead.
- * ```js
- * import { stopReading } from '@amityco/ts-sdk'
- * const success = await stopReading('foo')
- * ```
- *
- * Set local reading state of channel to `false` and then call mark all
- * messages as unread API.
- *
- * @param subChannelId - The sub channel ID to stop reading.
- * @return A success boolean if reading of the sub channel had begun.
- *
- * @category Channel API
- * @async
- */
-const stopReading = (subChannelId) => {
-    isReadingMap[subChannelId] = false;
-    disposeAll();
-    return stopReadingAPI(subChannelId);
-};
-/* end_public_function */
 setIntervalTask(async () => {
     if (!isSyncRunning$1)
         return;
@@ -23637,7 +23479,7 @@ const initializeMessagePreviewSetting = async () => {
          * 2. channel and subChannel which isDelete = true
          */
         if (channelWithIsDeletedTrue.length !== 0)
-            await getChannelByIds(channelWithIsDeletedTrue);
+            await getChannelByIds$1(channelWithIsDeletedTrue);
         if (subChannelWithIsDeletedTrue.length !== 0)
             await getSubChannels$1(subChannelWithIsDeletedTrue);
     }
@@ -24035,6 +23877,20 @@ var readReceiptSyncEngineOnLoginHandler = () => {
     };
 };
 
+const onOnline = (callback) => {
+    if (typeof window !== 'undefined' && window.addEventListener) {
+        window.addEventListener('online', callback);
+        return () => window.removeEventListener('online', callback);
+    }
+    if (typeof document !== 'undefined' && document.addEventListener) {
+        document.addEventListener('online', callback);
+        return () => document.removeEventListener('online', callback);
+    }
+    // Handle unsupported environment
+    console.error('Unsupported environment');
+    return () => console.error('Unsupported environment');
+};
+
 const onOffline = (callback) => {
     if (typeof window !== 'undefined' && window.addEventListener) {
         window.addEventListener('offline', callback);
@@ -24049,8 +23905,90 @@ const onOffline = (callback) => {
     return () => console.error('Unsupported environment');
 };
 
+/**
+ * ```js
+ * import { getChannelByIds } from '@amityco/ts-sdk'
+ * const channels = await getChannelByIds(['foo', 'bar'])
+ * ```
+ *
+ * Fetches a collection of {@link Amity.Channel} objects
+ *
+ * @param channelIds the IDs of the {@link Amity.Channel} to fetch
+ * @returns the associated collection of {@link Amity.Channel} objects
+ *
+ * @category Channel API
+ * @async
+ */
+const getChannelByIds = async (channelIds) => {
+    const client = getActiveClient();
+    client.log('channel/getChannelByIds', channelIds);
+    const encodedChannelIds = channelIds.map(channelId => encodeURIComponent(channelId));
+    let payload;
+    try {
+        // API-FIX: endpoint should not be /list, parameters should be querystring.
+        const response = await client.http.get(`/api/v3/channels/list`, {
+            params: { channelIds: encodedChannelIds },
+        });
+        payload = response.data;
+    }
+    catch (error) {
+        channelIds.forEach(channelId => {
+            if (checkIfShouldGoesToTombstone(error === null || error === void 0 ? void 0 : error.code)) {
+                // NOTE: use channelPublicId as tombstone cache key since we cannot get the channelPrivateId that come along with channel data from server
+                pushToTombstone('channel', channelId);
+            }
+        });
+        throw error;
+    }
+    const data = await prepareChannelPayload(payload);
+    if (client.isUnreadCountEnabled && client.getMarkerSyncConsistentMode()) {
+        await prepareUnreadCountInfo(payload);
+    }
+    const cachedAt = client.cache && Date.now();
+    if (client.cache)
+        ingestInCache(data, { cachedAt });
+    fireEvent('local.channel.fetched', data.channels);
+    return {
+        data: data.channels,
+        cachedAt,
+    };
+};
+/**
+ * ```js
+ * import { getChannelByIds } from '@amityco/ts-sdk'
+ * const channels = getChannelByIds.locally(['foo', 'bar']) ?? []
+ * ```
+ *
+ * Fetches a collection of {@link Amity.Channel} objects from cache
+ *
+ * @param channelIds the IDs of the {@link Amity.Channel} to fetch
+ * @returns the associated collection of {@link Amity.Channel} objects
+ *
+ * @category Channel API
+ */
+getChannelByIds.locally = (channelIds) => {
+    var _a, _b;
+    const client = getActiveClient();
+    client.log('channel/getChannelByIds.locally', channelIds);
+    if (!client.cache)
+        return;
+    const cached = (_a = queryCache(['channel', 'get'])) === null || _a === void 0 ? void 0 : _a.filter(({ data }) => {
+        return channelIds.includes(data.channelPublicId);
+    });
+    if (!cached || (cached === null || cached === void 0 ? void 0 : cached.length) < channelIds.length)
+        return;
+    const channels = cached.map(({ data }) => data);
+    const oldest = (_b = cached.sort((a, b) => (a.cachedAt < b.cachedAt ? -1 : 1))) === null || _b === void 0 ? void 0 : _b[0];
+    return {
+        data: channels,
+        cachedAt: oldest.cachedAt,
+    };
+};
+
 const resolveChannels = async (channelIds) => {
-    const { data: channels } = await getChannelByIds(channelIds);
+    var _a, _b, _c;
+    await getChannelByIds(channelIds);
+    const channels = (_c = (_b = (_a = queryCache(['channel', 'get'])) === null || _a === void 0 ? void 0 : _a.filter(({ data }) => data.channelPublicId && channelIds.includes(data.channelPublicId))) === null || _b === void 0 ? void 0 : _b.map(({ data }) => data)) !== null && _c !== void 0 ? _c : [];
     fireEvent('local.channel.resolved', channels);
 };
 
@@ -25178,13 +25116,6 @@ const stopUnreadSync = () => {
     setMarkerSyncEvents([]);
     unRegisterEventListeners();
 };
-/**
- * @deprecated Please use `startUnreadSync` instead
- */
-const stopUnreadSyncing = () => {
-    console.warn('`stopUnreadSyncing` has been deprecated, please use `stopUnreadSync` instead');
-    return stopUnreadSync();
-};
 setIntervalTask(async () => {
     if (!isSyncRunning)
         return;
@@ -25639,6 +25570,28 @@ function setUploadedFileAccessType(accessType) {
     GlobalFileAccessType$1.getInstance().setFileAccessType(accessType);
 }
 
+/**
+ * ```js
+ * import { fetchLinkPreview } from '@amityco/ts-sdk'
+ * const { title, description, imageUrl } = fetchLinkPreview('https://www.example.com/')
+ * ```
+ *
+ *
+ * @param url the url to fetch link preview
+ * @returns A {@link Amity.LinkPreview} instance
+ *
+ * @category Client API
+ * */
+const fetchLinkPreview = async (url) => {
+    const client = getActiveClient();
+    let fetchUrl = url;
+    if (!/^https?:\/\//i.test(url)) {
+        fetchUrl = `https://${url}`;
+    }
+    const { data } = await client.http.get(`/api/v1/link-preview?url=${encodeURIComponent(fetchUrl)}`);
+    return data;
+};
+
 /**
  * ```js
  * import { onChannelMarkerFetched } from '@amityco/ts-sdk'
@@ -25882,100 +25835,6 @@ const removeFunctionProperties = (obj) => {
     return Object.fromEntries(entries);
 };
 
-/**
- * @deprecated This function is deprecated
- */
-const liveObject = (id, callback, key, fetcher, eventHandlers, options) => {
-    const { forceDispatch, callbackDataSelector, callbackFilter } = Object.assign({ forceDispatch: false, callbackDataSelector: (data) => data }, options);
-    const { cache } = getActiveClient();
-    if (!cache) {
-        console.log(LIVE_OBJECT_ENABLE_CACHE_MESSAGE);
-    }
-    let model;
-    let isUnsyncedModel = false; // for messages
-    const disposers = [];
-    const dispatcher = (data) => {
-        const { data: newModel } = data, rest = __rest(data, ["data"]);
-        if (!callbackFilter || callbackFilter(newModel, model)) {
-            callback(Object.assign({ data: callbackDataSelector(newModel) }, rest));
-        }
-        // resolve all getter on data model to a static value to avoid comparison problems
-        model = convertGetterPropsToStatic(newModel);
-    };
-    const realtimeRouter = (eventModel, forceDispatch = false) => {
-        if (id !== eventModel[key]) {
-            return;
-        }
-        if (model) {
-            if (!forceDispatch && isEqual(model, eventModel)) {
-                return;
-            }
-        }
-        dispatcher({ loading: false, data: eventModel, origin: 'event' });
-    };
-    const onFetch = () => {
-        // TODO: Ihis `@ts-ignore` is bring back to fix the build and it needs to be removed later
-        // @ts-ignore
-        const query = createQuery(fetcher, id, true);
-        runQuery(query, ({ error, data, loading, origin, cachedAt }) => {
-            if (cachedAt === UNSYNCED_OBJECT_CACHED_AT_VALUE) {
-                dispatcher({
-                    // @ts-ignore
-                    data,
-                    origin,
-                    loading: false,
-                    error: new ASCApiError(UNSYNCED_OBJECT_CACHED_AT_MESSAGE, 800800 /* Amity.ClientError.DISALOOW_UNSYNCED_OBJECT */, "error" /* Amity.ErrorLevel.ERROR */),
-                });
-                isUnsyncedModel = true;
-                disposers.forEach(fn => fn());
-            }
-            else if (!isUnsyncedModel) {
-                // @ts-ignore
-                dispatcher({ loading, data, origin, error });
-            }
-            if (error) {
-                disposers.forEach(fn => fn());
-            }
-        });
-    };
-    disposers.push(...eventHandlers.map(fn => fn(eventModel => realtimeRouter(eventModel, forceDispatch))));
-    onFetch();
-    return () => {
-        disposers.forEach(fn => fn());
-    };
-};
-
-/**
- * @deprecated Please use unreadCount from `getUserUnread` instead.
- *
- * ```js
- * import { getTotalUnreadCount } from '@amityco/ts-sdk';
- *
- * const unsubscribe = getTotalUnreadCount(response => {
- *   totalUnreadCount = response.data;
- * });
- * ```
- *
- * Observe current user's unread count from {@link Amity.UserMarker}
- *
- * @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 events
- *
- * @category Message Live Object
- */
-const getTotalUnreadCount = (callback) => {
-    const { _id: userId } = getActiveUser();
-    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; };
-    return liveObject(userId, callback, 'userId', async () => {
-        const { data: userMarker, cachedAt } = await getUserMarker();
-        return { data: userMarker, cachedAt };
-    }, [onUserMarkerFetchedLegacy], {
-        callbackDataSelector,
-    });
-};
-
 /**
  *
  * ```js
@@ -26017,7 +25876,7 @@ const getUserUnread = (callback) => {
         model = callbackModel ? convertGetterPropsToStatic(callbackModel) : callbackModel;
         callback({
             data: callbackModel
-                ? Object.assign(Object.assign({}, callbackModel), { hasMentioned: callbackModel.isMentioned }) : callbackModel,
+                ? Object.assign(Object.assign({}, callbackModel), { isMentioned: callbackModel.isMentioned }) : callbackModel,
             loading: data.loading,
             error: data.error,
         });
@@ -26100,12 +25959,12 @@ var index$l = /*#__PURE__*/Object.freeze({
   markerSync: markerSync,
   enableUnreadCount: enableUnreadCount,
   setUploadedFileAccessType: setUploadedFileAccessType,
+  fetchLinkPreview: fetchLinkPreview,
   onConnectionError: onConnectionError,
   onClientDisconnected: onClientDisconnected,
   onClientBanned: onClientBanned,
   onSessionStateChange: onSessionStateChange,
   onNetworkActivities: onNetworkActivities,
-  getTotalUnreadCount: getTotalUnreadCount,
   getUserUnread: getUserUnread,
   getMarkerSyncEvents: getMarkerSyncEvents,
   setMarkerSyncEvents: setMarkerSyncEvents,
@@ -26114,7 +25973,6 @@ var index$l = /*#__PURE__*/Object.freeze({
   startMarkerSync: startMarkerSync,
   startUnreadSync: startUnreadSync,
   stopUnreadSync: stopUnreadSync,
-  stopUnreadSyncing: stopUnreadSyncing,
   getMarkerSyncConsistentMode: getMarkerSyncConsistentMode
 });
 
@@ -26199,311 +26057,134 @@ const unBlockUser = async (userId) => {
 };
 /* end_public_function */
 
-class PaginationController {
-    constructor(queryParams) {
-        const { http } = getActiveClient();
-        this.queryParams = queryParams;
-        this.http = http;
-    }
-    loadFirstPage() {
-        return this.onFetch("first" /* Amity.LiveCollectionPageDirection.FIRST */);
-    }
-    loadNextPage() {
-        return this.onFetch("next" /* Amity.LiveCollectionPageDirection.NEXT */);
-    }
-    loadPreviousPage() {
-        return this.onFetch("prev" /* Amity.LiveCollectionPageDirection.PREV */);
-    }
-    async onFetch(direction = "first" /* Amity.LiveCollectionPageDirection.FIRST */) {
-        var _a, _b, _c, _d;
-        if (direction === 'prev' && !this.previousToken)
-            return;
-        if (direction === 'next' && !this.nextToken)
-            return;
-        let token;
-        if (direction === 'prev')
-            token = this.previousToken;
-        if (direction === 'next')
-            token = this.nextToken;
-        const queryResponse = await this.getRequest(this.queryParams, token);
-        if (direction === 'first') {
-            this.nextToken = (_a = queryResponse.paging) === null || _a === void 0 ? void 0 : _a.next;
-            this.previousToken = (_b = queryResponse.paging) === null || _b === void 0 ? void 0 : _b.previous;
-        }
-        if (direction === 'prev')
-            this.previousToken = (_c = queryResponse.paging) === null || _c === void 0 ? void 0 : _c.previous;
-        if (direction === 'next')
-            this.nextToken = (_d = queryResponse.paging) === null || _d === void 0 ? void 0 : _d.next;
-        return queryResponse;
-    }
-    getNextToken() {
-        return this.nextToken;
-    }
-    getPrevToken() {
-        return this.previousToken;
-    }
-}
-
-class BlockedUserPaginationController extends PaginationController {
-    async getRequest(queryParams, token) {
-        const { limit = COLLECTION_DEFAULT_PAGINATION_LIMIT } = queryParams, params = __rest(queryParams, ["limit"]);
-        const options = token ? { token } : { limit };
-        const { data: queryResponse } = await this.http.get('/api/v4/me/user-blocks', {
-            params: Object.assign(Object.assign({}, params), { options, isDeleted: false }),
-        });
-        return queryResponse;
-    }
-}
-
-class QueryStreamController {
-    constructor(query, cacheKey) {
-        this.query = query;
-        this.cacheKey = cacheKey;
-    }
-}
-
-var EnumFollowActions;
-(function (EnumFollowActions) {
-    EnumFollowActions["OnRequested"] = "onRequested";
-    EnumFollowActions["OnAccepted"] = "onAccepted";
-    EnumFollowActions["OnDeclined"] = "onDeclined";
-    EnumFollowActions["OnCanceled"] = "onCanceled";
-    EnumFollowActions["OnFollowed"] = "onFollowed";
-    EnumFollowActions["OnUnfollowed"] = "onUnfollowed";
-    EnumFollowActions["OnDeleted"] = "onDeleted";
-    EnumFollowActions["OnUserDeleted"] = "onUserDeleted";
-})(EnumFollowActions || (EnumFollowActions = {}));
-
-class BlockedUserQueryStreamController extends QueryStreamController {
-    constructor(query, cacheKey, notifyChange, preparePayload) {
-        super(query, cacheKey);
-        this.notifyChange = notifyChange;
-        this.preparePayload = preparePayload;
-    }
-    async saveToMainDB(response) {
-        const processedPayload = await this.preparePayload(response);
-        const client = getActiveClient();
-        const cachedAt = client.cache && Date.now();
-        if (client.cache) {
-            ingestInCache(processedPayload, { cachedAt });
-        }
-    }
-    appendToQueryStream(response, direction, refresh = false) {
-        var _a, _b;
-        if (refresh) {
-            pushToCache(this.cacheKey, {
-                data: response.users.map(getResolver('user')),
-            });
-        }
-        else {
-            const collection = (_a = pullFromCache(this.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 : [];
-            pushToCache(this.cacheKey, Object.assign(Object.assign({}, collection), { data: [...new Set([...users, ...response.users.map(getResolver('user'))])] }));
-        }
-    }
-    reactor(action) {
-        return (targetUser) => {
-            var _a;
-            if (action === EnumFollowActions.OnFollowed) {
-                const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-                const updatedCollection = collection === null || collection === void 0 ? void 0 : collection.data.filter(id => id !== targetUser.userId);
-                pushToCache(this.cacheKey, Object.assign(Object.assign({}, collection), { data: updatedCollection }));
-            }
-            this.notifyChange({ origin: "event" /* Amity.LiveDataOrigin.EVENT */, loading: false });
-        };
-    }
-    subscribeRTE(createSubscriber) {
-        return createSubscriber.map(subscriber => subscriber.fn(this.reactor(subscriber.action)));
-    }
-}
-
-class PaginationNoPageController {
-    constructor(queryParams) {
-        const { http } = getActiveClient();
-        this.queryParams = queryParams;
-        this.http = http;
-    }
-    async onFetch() {
-        const queryResponse = await this.getRequest(this.queryParams);
-        return queryResponse;
-    }
-}
-
-class LiveCollectionController {
-    constructor(paginationController, queryStreamId, cacheKey, callback) {
-        this.paginationController = paginationController;
-        this.queryStreamId = queryStreamId;
-        this.cacheKey = cacheKey;
-        this.callback = callback;
-    }
-    async refresh() {
-        try {
-            let result;
-            if (this.paginationController instanceof PaginationNoPageController) {
-                result = await this.paginationController.onFetch();
-            }
-            else {
-                result = await this.paginationController.loadFirstPage();
-            }
-            if (!result)
-                return;
-            await this.persistModel(result);
-            this.persistQueryStream({
-                response: result,
-                direction: "next" /* Amity.LiveCollectionPageDirection.NEXT */,
-                refresh: true,
-            });
-            this.notifyChange({ origin: "server" /* Amity.LiveDataOrigin.SERVER */, loading: false });
-        }
-        catch (e) {
-            this.notifyChange({ origin: "server" /* Amity.LiveDataOrigin.SERVER */, loading: false, error: e });
-        }
-    }
-    loadPage({ initial = false, direction = "next" /* Amity.LiveCollectionPageDirection.NEXT */, }) {
-        this.setup();
-        this.notifyChange({ origin: "local" /* Amity.LiveDataOrigin.LOCAL */, loading: true });
-        if (initial) {
-            this.refresh();
-        }
-        else if (direction === "prev" /* Amity.LiveCollectionPageDirection.PREV */) {
-            this.loadPrevPage();
-        }
-        else if (direction === "next" /* Amity.LiveCollectionPageDirection.NEXT */) {
-            this.loadNextPage();
-        }
-    }
-    async loadNextPage() {
-        try {
-            if (this.paginationController instanceof PaginationNoPageController)
-                return;
-            const result = await this.paginationController.loadNextPage();
-            if (!result)
-                return;
-            await this.persistModel(result);
-            this.persistQueryStream({
-                response: result,
-                direction: "next" /* Amity.LiveCollectionPageDirection.NEXT */,
-            });
-            this.notifyChange({ origin: "server" /* Amity.LiveDataOrigin.SERVER */, loading: false });
-        }
-        catch (e) {
-            this.notifyChange({ origin: "server" /* Amity.LiveDataOrigin.SERVER */, loading: false, error: e });
-        }
-    }
-    async loadPrevPage() {
-        try {
-            if (this.paginationController instanceof PaginationNoPageController)
-                return;
-            const result = await this.paginationController.loadPreviousPage();
-            if (!result)
-                return;
-            await this.persistModel(result);
-            this.persistQueryStream({
-                response: result,
-                direction: "prev" /* Amity.LiveCollectionPageDirection.PREV */,
-            });
-            this.notifyChange({ origin: "server" /* Amity.LiveDataOrigin.SERVER */, loading: false });
-        }
-        catch (e) {
-            this.notifyChange({ origin: "server" /* Amity.LiveDataOrigin.SERVER */, loading: false, error: e });
-        }
-    }
-    shouldNotify(data) {
-        const newData = data.map(convertGetterPropsToStatic).map(removeFunctionProperties);
-        if (isEqual(this.snapshot, newData))
-            return false;
-        this.snapshot = newData;
-        return true;
-    }
-    getCacheKey() {
-        return this.cacheKey;
-    }
-}
-
-function prepareBlockedUserPayload(response) {
-    const { users, follows } = response, rest = __rest(response, ["users", "follows"]);
-    return Object.assign(Object.assign({}, rest), { follows: follows.map(follow => {
-            const followUser = users.find(user => user.userId === follow.from);
-            return Object.assign(Object.assign({}, follow), { user: convertRawUserToInternalUser(followUser) });
-        }), users: users.map(convertRawUserToInternalUser) });
-}
-
+/* begin_public_function
+  id: user.relationship.follow
+*/
 /**
  * ```js
- * import { onUserUpdated } from '@amityco/ts-sdk'
- * const dispose = onUserUpdated(user => {
- *   // ...
- * })
+ * import { follow } from '@amityco/ts-sdk'
+ * const status = await follow('foobar')
  * ```
  *
- * Fired when a {@link Amity.InternalUser} has been updated
+ * Follow the user
  *
- * @param callback The function to call when the event was fired
- * @returns an {@link Amity.Unsubscriber} function to stop listening
+ * @param userId the ID of the {@link Amity.InternalUser}
+ * @returns the status {@link Amity.FollowStatus}
  *
- * @category User Events
+ * @category Follow API
+ * @async
  */
-const onUserUpdated = (callback) => createUserEventSubscriber('user.updated', callback);
+const follow = async (userId) => {
+    const client = getActiveClient();
+    client.log('follow/follow', userId);
+    const { data } = await client.http.post(`/api/v4/me/following/${userId}`);
+    const cachedAt = client.cache && Date.now();
+    if (client.cache) {
+        ingestInCache(data, { cachedAt });
+    }
+    const payload = prepareFollowStatusPayload(data);
+    if (data.follows[0].status === 'accepted') {
+        fireEvent('local.follow.created', payload);
+    }
+    else {
+        fireEvent('local.follow.requested', payload);
+    }
+    return {
+        data: data.follows[0],
+        cachedAt,
+    };
+};
+/* end_public_function */
 
+/* begin_public_function
+  id: user.relationship.unfollow
+*/
 /**
  * ```js
- * import { onUserFlagged } from '@amityco/ts-sdk'
- * const dispose = onUserFlagged(user => {
- *   // ...
- * })
+ * import { unfollow } from '@amityco/ts-sdk'
+ * await unfollow('foobar')
  * ```
  *
- * Fired when a {@link Amity.InternalUser} has been flagged
+ * Cancel the follow request or unfollow the user
  *
- * @param callback The function to call when the event was fired
- * @returns an {@link Amity.Unsubscriber} function to stop listening
+ * @param userId the ID of the {@link Amity.InternalUser}
+ * @returns A success boolean if the user {@link Amity.InternalUser} was unfollowed
  *
- * @category User Events
+ * @category Follow API
+ * @async
  */
-const onUserFlagged = (callback) => createUserEventSubscriber('user.flagged', callback);
+const unfollow = async (userId) => {
+    const client = getActiveClient();
+    client.log('follow/unfollow', userId);
+    const { data } = await client.http.delete(`/api/v4/me/following/${userId}`);
+    if (client.cache) {
+        ingestInCache(data);
+    }
+    const payload = prepareFollowStatusPayload(data);
+    fireEvent('local.follow.unfollowed', payload);
+    return true;
+};
+/* end_public_function */
 
+/* begin_public_function
+  id: user.relationship.accept_follow
+*/
 /**
  * ```js
- * import { onUserUnflagged } from '@amityco/ts-sdk'
- * const dispose = onUserUnflagged(user => {
- *   // ...
- * })
+ * import { UserRepository } from '@amityco/ts-sdk'
+ * await UserRepository.Relationship.acceptMyFollower('foobar')
  * ```
  *
- * Fired when a flag has been removed from a {@link Amity.InternalUser}
+ * Accept the follow request
  *
- * @param callback The function to call when the event was fired
- * @returns an {@link Amity.Unsubscriber} function to stop listening
+ * @param userId the ID of the {@link Amity.InternalUser} follower
+ * @returns A success boolean if the follow request was accepted
  *
- * @category User Events
+ * @category Follow API
+ * @async
  */
-const onUserUnflagged = (callback) => createUserEventSubscriber('user.unflagged', callback);
+const acceptMyFollower = async (userId) => {
+    const client = getActiveClient();
+    client.log('follow/acceptMyFollower', userId);
+    const { data } = await client.http.post(`/api/v4/me/followers/${userId}`);
+    if (client.cache) {
+        ingestInCache(data);
+    }
+    const payload = prepareFollowStatusPayload(data);
+    fireEvent('local.follow.accepted', payload);
+    return true;
+};
+/* end_public_function */
 
+/* begin_public_function
+  id: user.relationship.decline_follow
+*/
 /**
  * ```js
- * import { onUserFlagCleared } from '@amityco/ts-sdk'
- * const dispose = onUserFlagCleared(user => {
- *   // ...
- * })
+ * import { UserRepository } from '@amityco/ts-sdk'
+ * await UserRepository.Relationship.declineMyFollower('foobar')
  * ```
  *
- * Fired when flags have been cleared for a {@link Amity.InternalUser}
+ * Decline the follow request or delete the follower
  *
- * @param callback The function to call when the event was fired
- * @returns an {@link Amity.Unsubscriber} function to stop listening
+ * @param userId the ID of the {@link Amity.InternalUser} follower
+ * @returns A success boolean if the follow request was decline
  *
- * @category User Events
+ * @category Follow API
+ * @async
  */
-const onUserFlagCleared = (callback) => createUserEventSubscriber('user.flagCleared', callback);
-
-var EnumUserActions;
-(function (EnumUserActions) {
-    EnumUserActions["OnUserDeleted"] = "onUserDeleted";
-    EnumUserActions["OnUserUpdated"] = "onUserUpdated";
-    EnumUserActions["OnUserFlagged"] = "onUserFlagged";
-    EnumUserActions["OnUserUnflagged"] = "onUserUnflagged";
-    EnumUserActions["OnUserFlagCleared"] = "onUserFlagCleared";
-})(EnumUserActions || (EnumUserActions = {}));
+const declineMyFollower = async (userId) => {
+    const client = getActiveClient();
+    client.log('follow/declineMyFollower', userId);
+    const { data } = await client.http.delete(`/api/v4/me/followers/${userId}`);
+    if (client.cache) {
+        ingestInCache(data);
+    }
+    const payload = prepareFollowStatusPayload(data);
+    fireEvent('local.follow.requestDeclined', payload);
+    return true;
+};
+/* end_public_function */
 
 const createFollowEventSubscriber = (event, callback) => {
     const client = getActiveClient();
@@ -26767,446 +26448,50 @@ const onLocalFollowRequestAccepted = (callback) => createLocalFollowEventSubscri
 
 const onLocalFollowRequestDeclined = (callback) => createLocalFollowEventSubscriber('local.follow.requestDeclined', callback);
 
-const convertEventPayload = (eventHandler, sourceModelProp, destinationDomain) => (callback) => eventHandler(sourceModel => {
-    var _a, _b;
-    if (!sourceModel) {
-        return sourceModel;
-    }
-    const client = getActiveClient();
-    const { objectSyncMap } = client;
-    /*
-     * NOTE: For objects created locally (optimistic creation), the SDK stores them with their local ID as the cache key, which is used throughout the entire SDK session (in-memory) for syncing updates.
-     * If the payload or response only contains the remote ID of the same object, the SDK will look up the corresponding local ID to retrieve the object.
-     */
-    const resolvedId = isLocalId(sourceModel[sourceModelProp])
-        ? sourceModel[sourceModelProp]
-        : (_a = objectSyncMap.get(sourceModel[sourceModelProp])) !== null && _a !== void 0 ? _a : sourceModel[sourceModelProp];
-    const model = (_b = pullFromCache([
-        destinationDomain,
-        'get',
-        `${resolvedId}`,
-    ])) === null || _b === void 0 ? void 0 : _b.data;
-    if (!model)
-        return;
-    return callback(model);
-});
-
-class BlockedUserLiveCollectionController extends LiveCollectionController {
-    constructor(query, callback) {
-        const queryStreamId = hash(query);
-        const cacheKey = ['blockedUsers', 'collection', queryStreamId];
-        const paginationController = new BlockedUserPaginationController(query);
-        super(paginationController, queryStreamId, cacheKey, callback);
-        this.query = query;
-        this.queryStreamController = new BlockedUserQueryStreamController(this.query, this.cacheKey, this.notifyChange.bind(this), prepareBlockedUserPayload);
-        this.callback = callback.bind(this);
-        this.loadPage({ initial: true });
-    }
-    setup() {
-        var _a;
-        const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-        if (!collection) {
-            pushToCache(this.cacheKey, {
-                data: [],
-                params: {},
-            });
-        }
+class PaginationController {
+    constructor(queryParams) {
+        const { http } = getActiveClient();
+        this.queryParams = queryParams;
+        this.http = http;
     }
-    async persistModel(queryPayload) {
-        await this.queryStreamController.saveToMainDB(queryPayload);
+    loadFirstPage() {
+        return this.onFetch("first" /* Amity.LiveCollectionPageDirection.FIRST */);
     }
-    persistQueryStream({ response, direction, refresh, }) {
-        this.queryStreamController.appendToQueryStream(response, direction, refresh);
+    loadNextPage() {
+        return this.onFetch("next" /* Amity.LiveCollectionPageDirection.NEXT */);
     }
-    startSubscription() {
-        return this.queryStreamController.subscribeRTE([
-            {
-                fn: onUserDeleted$2,
-                action: EnumUserActions.OnUserDeleted,
-            },
-            // In the case of unblocking a user, we need to subscribe to the follow events
-            {
-                fn: convertEventPayload(onLocalUserFollowed, 'to', 'user'),
-                action: EnumFollowActions.OnFollowed,
-            },
-            {
-                fn: convertEventPayload(onUserFollowed, 'to', 'user'),
-                action: EnumFollowActions.OnFollowed,
-            },
-        ]);
+    loadPreviousPage() {
+        return this.onFetch("prev" /* Amity.LiveCollectionPageDirection.PREV */);
     }
-    notifyChange({ origin, loading, error }) {
-        var _a, _b;
-        const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-        if (!collection)
+    async onFetch(direction = "first" /* Amity.LiveCollectionPageDirection.FIRST */) {
+        var _a, _b, _c, _d;
+        if (direction === 'prev' && !this.previousToken)
             return;
-        const data = this.applyFilter((_b = collection.data
-            .map(id => pullFromCache(['user', 'get', id]))
-            .filter(isNonNullable)
-            .map(({ data }) => data)
-            .map(LinkedObject.user)) !== null && _b !== void 0 ? _b : []);
-        if (!this.shouldNotify(data) && origin === 'event')
+        if (direction === 'next' && !this.nextToken)
             return;
-        this.callback({
-            onNextPage: () => this.loadPage({ direction: "next" /* Amity.LiveCollectionPageDirection.NEXT */ }),
-            data,
-            hasNextPage: !!this.paginationController.getNextToken(),
-            loading,
-            error,
-        });
-    }
-    // eslint-disable-next-line class-methods-use-this
-    applyFilter(data) {
-        let users = data;
-        users = users.filter(user => user.isDeleted == null || user.isDeleted === false);
-        return users;
-    }
-}
-
-/* begin_public_function
-  id: user.get_blocked_users
-*/
-/**
- * ```js
- * import { UserRepository } from '@amityco/ts-sdk'
- * const unblockedUser = await UserRepository.blockUser('userId')
- * ```
- *
- * Blocks a {@link Amity.InternalUser}
- *
- * @param params The params to get blocked {@link Amity.InternalUser}s
- * @param callback to recieve updates on unblocked {@link Amity.InternalUser}s
- * @returns {@link Amity.Unsubscriber} to unsubscribe from collection
- *
- * @category Post API
- * @async
- */
-const getBlockedUsers$1 = (params, callback, config) => {
-    const { log, cache } = getActiveClient();
-    if (!cache) {
-        console.log(ENABLE_CACHE_MESSAGE);
-    }
-    const timestamp = Date.now();
-    log(`getBlockedUsers(tmpid: ${timestamp}) > listen`);
-    const blockedUserLiveCollection = new BlockedUserLiveCollectionController(params, callback);
-    const disposers = blockedUserLiveCollection.startSubscription();
-    const cacheKey = blockedUserLiveCollection.getCacheKey();
-    disposers.push(() => dropFromCache(cacheKey));
-    return () => {
-        log(`getBlockedUsers(tmpid: ${timestamp}) > dispose`);
-        disposers.forEach(fn => fn());
-        dropFromCache(cacheKey);
-    };
-};
-/* end_public_function */
-
-/* eslint-disable no-use-before-define */
-const getBlockedUsers = (params, callback, config) => {
-    console.log('Deprecation Notice: UserRepository.Relationship.getBlockedUsers will be deprecated on 9th June 2023, please use UserRepository.getBlockedUsers instead.');
-    return getBlockedUsers$1(params, callback);
-};
-
-/* begin_public_function
-  id: user.relationship.follow
-*/
-/**
- * ```js
- * import { follow } from '@amityco/ts-sdk'
- * const status = await follow('foobar')
- * ```
- *
- * Follow the user
- *
- * @param userId the ID of the {@link Amity.InternalUser}
- * @returns the status {@link Amity.FollowStatus}
- *
- * @category Follow API
- * @async
- */
-const follow = async (userId) => {
-    const client = getActiveClient();
-    client.log('follow/follow', userId);
-    const { data } = await client.http.post(`/api/v4/me/following/${userId}`);
-    const cachedAt = client.cache && Date.now();
-    if (client.cache) {
-        ingestInCache(data, { cachedAt });
-    }
-    const payload = prepareFollowStatusPayload(data);
-    if (data.follows[0].status === 'accepted') {
-        fireEvent('local.follow.created', payload);
-    }
-    else {
-        fireEvent('local.follow.requested', payload);
-    }
-    return {
-        data: data.follows[0],
-        cachedAt,
-    };
-};
-/* end_public_function */
-
-/* begin_public_function
-  id: user.relationship.unfollow
-*/
-/**
- * ```js
- * import { unfollow } from '@amityco/ts-sdk'
- * await unfollow('foobar')
- * ```
- *
- * Cancel the follow request or unfollow the user
- *
- * @param userId the ID of the {@link Amity.InternalUser}
- * @returns A success boolean if the user {@link Amity.InternalUser} was unfollowed
- *
- * @category Follow API
- * @async
- */
-const unfollow = async (userId) => {
-    const client = getActiveClient();
-    client.log('follow/unfollow', userId);
-    const { data } = await client.http.delete(`/api/v4/me/following/${userId}`);
-    if (client.cache) {
-        ingestInCache(data);
-    }
-    const payload = prepareFollowStatusPayload(data);
-    fireEvent('local.follow.unfollowed', payload);
-    return true;
-};
-/* end_public_function */
-
-/**
- * @deprecated This API renamed to `acceptMyFollower`.
- * Please use acceptMyFollower() instead.
- *
- * ```js
- * import { acceptFollower } from '@amityco/ts-sdk'
- * await acceptFollower('foobar')
- * ```
- *
- * Accept the follow request
- *
- * @param userId the ID of the {@link Amity.InternalUser} follower
- * @returns A success boolean if the follow request was accepted
- *
- * @category Follow API
- * @async
- */
-const acceptFollower = async (userId) => {
-    const client = getActiveClient();
-    client.log('follow/acceptFollower', userId);
-    const { data } = await client.http.post(`/api/v4/me/followers/${userId}`);
-    if (client.cache) {
-        ingestInCache(data);
-    }
-    const payload = prepareFollowStatusPayload(data);
-    fireEvent('local.follow.accepted', payload);
-    return true;
-};
-
-/* begin_public_function
-  id: user.relationship.accept_follow
-*/
-/**
- * ```js
- * import { UserRepository } from '@amityco/ts-sdk'
- * await UserRepository.Relationship.acceptMyFollower('foobar')
- * ```
- *
- * Accept the follow request
- *
- * @param userId the ID of the {@link Amity.InternalUser} follower
- * @returns A success boolean if the follow request was accepted
- *
- * @category Follow API
- * @async
- */
-const acceptMyFollower = async (userId) => {
-    const client = getActiveClient();
-    client.log('follow/acceptMyFollower', userId);
-    const { data } = await client.http.post(`/api/v4/me/followers/${userId}`);
-    if (client.cache) {
-        ingestInCache(data);
+        let token;
+        if (direction === 'prev')
+            token = this.previousToken;
+        if (direction === 'next')
+            token = this.nextToken;
+        const queryResponse = await this.getRequest(this.queryParams, token);
+        if (direction === 'first') {
+            this.nextToken = (_a = queryResponse.paging) === null || _a === void 0 ? void 0 : _a.next;
+            this.previousToken = (_b = queryResponse.paging) === null || _b === void 0 ? void 0 : _b.previous;
+        }
+        if (direction === 'prev')
+            this.previousToken = (_c = queryResponse.paging) === null || _c === void 0 ? void 0 : _c.previous;
+        if (direction === 'next')
+            this.nextToken = (_d = queryResponse.paging) === null || _d === void 0 ? void 0 : _d.next;
+        return queryResponse;
     }
-    const payload = prepareFollowStatusPayload(data);
-    fireEvent('local.follow.accepted', payload);
-    return true;
-};
-/* end_public_function */
-
-/**
- * @deprecated This API renamed to `declineMyFollower`.
- * Please use declineMyFollower() instead.
- *
- * ```js
- * import { declineFollower } from '@amityco/ts-sdk'
- * await declineFollower('foobar')
- * ```
- *
- * Decline the follow request or delete the follower
- *
- * @param userId the ID of the {@link Amity.InternalUser} follower
- * @returns A success boolean if the follow request was decline
- *
- * @category Follow API
- * @async
- */
-const declineFollower = async (userId) => {
-    const client = getActiveClient();
-    client.log('follow/declineFollower', userId);
-    const { data } = await client.http.delete(`/api/v4/me/followers/${userId}`);
-    if (client.cache) {
-        ingestInCache(data);
+    getNextToken() {
+        return this.nextToken;
     }
-    const payload = prepareFollowStatusPayload(data);
-    fireEvent('local.follow.requestDeclined', payload);
-    return true;
-};
-
-/* begin_public_function
-  id: user.relationship.decline_follow
-*/
-/**
- * ```js
- * import { UserRepository } from '@amityco/ts-sdk'
- * await UserRepository.Relationship.declineMyFollower('foobar')
- * ```
- *
- * Decline the follow request or delete the follower
- *
- * @param userId the ID of the {@link Amity.InternalUser} follower
- * @returns A success boolean if the follow request was decline
- *
- * @category Follow API
- * @async
- */
-const declineMyFollower = async (userId) => {
-    const client = getActiveClient();
-    client.log('follow/declineMyFollower', userId);
-    const { data } = await client.http.delete(`/api/v4/me/followers/${userId}`);
-    if (client.cache) {
-        ingestInCache(data);
+    getPrevToken() {
+        return this.previousToken;
     }
-    const payload = prepareFollowStatusPayload(data);
-    fireEvent('local.follow.requestDeclined', payload);
-    return true;
-};
-/* end_public_function */
-
-/**
- * ```js
- * import { observeFollowInfo } from '@amityco/ts-sdk'
- *
- * let followInfo = {}
- * const dispose = observeFollowInfo(userId, updated => followInfo = updated)
- * ```
- *
- * Observe all mutation on a given {@link Amity.FollowInfo}
- *
- * @param userId the ID of the user 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 post
- *
- * @category Follow Observer
- */
-const observeFollowInfo = (userId, callback, policy = 'cache_then_server') => {
-    const { log } = getActiveClient();
-    const timestamp = Date.now();
-    log(`observeFollowInfo(tmpid: ${timestamp}) > listen`);
-    const router = (result, action) => {
-        var _a, _b;
-        if (callback instanceof Function)
-            return callback(result);
-        if (action !== 'onFetch')
-            (_a = callback.onEvent) === null || _a === void 0 ? void 0 : _a.call(callback, action, result);
-        (_b = callback[action]) === null || _b === void 0 ? void 0 : _b.call(callback, result);
-    };
-    const realtimeRouter = (result, action) => {
-        var _a;
-        if (((_a = result.data) === null || _a === void 0 ? void 0 : _a.userId) !== userId)
-            return;
-        router(result, action);
-    };
-    const disposers = [];
-    disposers.push(onFollowInfoUpdated(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onUpdate')));
-    runQuery(createQuery(getFollowInfo$1, userId), result => (result.data || result.error) && router(result, 'onFetch'), queryOptions(policy));
-    return () => {
-        log(`observeFollowInfo(tmpid: ${timestamp}) > dispose`);
-        disposers.forEach(fn => fn());
-    };
-};
-
-/**
- * ```js
- * import { observeFollowers } from '@amityco/ts-sdk'
- *
- * let followers = []
- * const unsub = observeFollowers('userId', follower => merge(followers, follower))
- * ```
- *
- * Observe all mutations on a list of followers {@link Amity.FollowStatus} for a given user
- *
- * @param userId the ID of the {@link Amity.InternalUser}
- * @param callback the function to call when new data are available
- * @returns An {@link Amity.Unsubscriber} function to run when willing to stop observing the messages
- *
- * @category Follow Observer
- */
-const observeFollowers = (userId, callback) => {
-    const { log } = getActiveClient();
-    const timestamp = Date.now();
-    log(`observeFollowers(tmpid: ${timestamp}) > listen`);
-    const disposers = [];
-    const router = (status, action) => {
-        var _a, _b;
-        if (callback instanceof Function) {
-            return callback(status);
-        }
-        (_a = callback.onEvent) === null || _a === void 0 ? void 0 : _a.call(callback, action, status);
-        (_b = callback[action]) === null || _b === void 0 ? void 0 : _b.call(callback, status);
-    };
-    disposers.push(onFollowerRequested(x => router(x, 'onRequested')), onFollowRequestAccepted(x => router(x, 'onAccepted')), onFollowRequestDeclined(x => router(x, 'onDeclined')), onFollowRequestCanceled(x => router(x, 'onCanceled')), onUserFollowed(x => router(x, 'onFollowed')), onUserUnfollowed(x => router(x, 'onUnfollowed')), onFollowerDeleted(x => router(x, 'onDeleted')), onLocalFollowerRequested(x => router(x, 'onRequested')), onLocalFollowRequestAccepted(x => router(x, 'onAccepted')), onLocalFollowRequestDeclined(x => router(x, 'onDeclined')), onLocalUserFollowed(x => router(x, 'onFollowed')), onLocalUserUnfollowed(x => router(x, 'onUnfollowed')));
-    return () => {
-        log(`observeFollowers(tmpid: ${timestamp}) > dispose`);
-        disposers.forEach(fn => fn());
-    };
-};
-
-/**
- * ```js
- * import { observeFollowings } from '@amityco/ts-sdk'
- *
- * let followings = []
- * const unsub = observeFollowers('userId', follower => merge(followings, following))
- * ```
- *
- * Observe all mutations on a list of followings {@link Amity.FollowStatus} for a given user
- *
- * @param userId the ID of the {@link Amity.InternalUser}
- * @param callback the function to call when new data are available
- * @returns An {@link Amity.Unsubscriber} function to run when willing to stop observing the messages
- *
- * @category Follow Observer
- */
-const observeFollowings = (userId, callback) => {
-    const { log } = getActiveClient();
-    const timestamp = Date.now();
-    log(`observeFollowings(tmpid: ${timestamp}) > listen`);
-    const disposers = [];
-    const router = (status, action) => {
-        var _a, _b;
-        if (callback instanceof Function) {
-            return callback(status);
-        }
-        (_a = callback.onEvent) === null || _a === void 0 ? void 0 : _a.call(callback, action, status);
-        (_b = callback[action]) === null || _b === void 0 ? void 0 : _b.call(callback, status);
-    };
-    disposers.push(onFollowerRequested(x => router(x, 'onRequested')), onFollowRequestAccepted(x => router(x, 'onAccepted')), onFollowRequestDeclined(x => router(x, 'onDeclined')), onFollowRequestCanceled(x => router(x, 'onCanceled')), onUserFollowed(x => router(x, 'onFollowed')), onUserUnfollowed(x => router(x, 'onUnfollowed')), onFollowerDeleted(x => router(x, 'onDeleted')), onLocalFollowerRequested(x => router(x, 'onRequested')), onLocalFollowRequestAccepted(x => router(x, 'onAccepted')), onLocalFollowRequestDeclined(x => router(x, 'onDeclined')), onLocalUserFollowed(x => router(x, 'onFollowed')), onLocalUserUnfollowed(x => router(x, 'onUnfollowed')));
-    return () => {
-        log(`observeFollowings(tmpid: ${timestamp}) > dispose`);
-        disposers.forEach(fn => fn());
-    };
-};
+}
 
 class FollowerPaginationController extends PaginationController {
     async getRequest(queryParams, token) {
@@ -27221,6 +26506,25 @@ class FollowerPaginationController extends PaginationController {
     }
 }
 
+class QueryStreamController {
+    constructor(query, cacheKey) {
+        this.query = query;
+        this.cacheKey = cacheKey;
+    }
+}
+
+var EnumFollowActions;
+(function (EnumFollowActions) {
+    EnumFollowActions["OnRequested"] = "onRequested";
+    EnumFollowActions["OnAccepted"] = "onAccepted";
+    EnumFollowActions["OnDeclined"] = "onDeclined";
+    EnumFollowActions["OnCanceled"] = "onCanceled";
+    EnumFollowActions["OnFollowed"] = "onFollowed";
+    EnumFollowActions["OnUnfollowed"] = "onUnfollowed";
+    EnumFollowActions["OnDeleted"] = "onDeleted";
+    EnumFollowActions["OnUserDeleted"] = "onUserDeleted";
+})(EnumFollowActions || (EnumFollowActions = {}));
+
 class FollowerQueryStreamController extends QueryStreamController {
     constructor(query, cacheKey, notifyChange, preparePayload) {
         super(query, cacheKey);
@@ -27276,6 +26580,109 @@ class FollowerQueryStreamController extends QueryStreamController {
     }
 }
 
+class PaginationNoPageController {
+    constructor(queryParams) {
+        const { http } = getActiveClient();
+        this.queryParams = queryParams;
+        this.http = http;
+    }
+    async onFetch() {
+        const queryResponse = await this.getRequest(this.queryParams);
+        return queryResponse;
+    }
+}
+
+class LiveCollectionController {
+    constructor(paginationController, queryStreamId, cacheKey, callback) {
+        this.paginationController = paginationController;
+        this.queryStreamId = queryStreamId;
+        this.cacheKey = cacheKey;
+        this.callback = callback;
+    }
+    async refresh() {
+        try {
+            let result;
+            if (this.paginationController instanceof PaginationNoPageController) {
+                result = await this.paginationController.onFetch();
+            }
+            else {
+                result = await this.paginationController.loadFirstPage();
+            }
+            if (!result)
+                return;
+            await this.persistModel(result);
+            this.persistQueryStream({
+                response: result,
+                direction: "next" /* Amity.LiveCollectionPageDirection.NEXT */,
+                refresh: true,
+            });
+            this.notifyChange({ origin: "server" /* Amity.LiveDataOrigin.SERVER */, loading: false });
+        }
+        catch (e) {
+            this.notifyChange({ origin: "server" /* Amity.LiveDataOrigin.SERVER */, loading: false, error: e });
+        }
+    }
+    loadPage({ initial = false, direction = "next" /* Amity.LiveCollectionPageDirection.NEXT */, }) {
+        this.setup();
+        this.notifyChange({ origin: "local" /* Amity.LiveDataOrigin.LOCAL */, loading: true });
+        if (initial) {
+            this.refresh();
+        }
+        else if (direction === "prev" /* Amity.LiveCollectionPageDirection.PREV */) {
+            this.loadPrevPage();
+        }
+        else if (direction === "next" /* Amity.LiveCollectionPageDirection.NEXT */) {
+            this.loadNextPage();
+        }
+    }
+    async loadNextPage() {
+        try {
+            if (this.paginationController instanceof PaginationNoPageController)
+                return;
+            const result = await this.paginationController.loadNextPage();
+            if (!result)
+                return;
+            await this.persistModel(result);
+            this.persistQueryStream({
+                response: result,
+                direction: "next" /* Amity.LiveCollectionPageDirection.NEXT */,
+            });
+            this.notifyChange({ origin: "server" /* Amity.LiveDataOrigin.SERVER */, loading: false });
+        }
+        catch (e) {
+            this.notifyChange({ origin: "server" /* Amity.LiveDataOrigin.SERVER */, loading: false, error: e });
+        }
+    }
+    async loadPrevPage() {
+        try {
+            if (this.paginationController instanceof PaginationNoPageController)
+                return;
+            const result = await this.paginationController.loadPreviousPage();
+            if (!result)
+                return;
+            await this.persistModel(result);
+            this.persistQueryStream({
+                response: result,
+                direction: "prev" /* Amity.LiveCollectionPageDirection.PREV */,
+            });
+            this.notifyChange({ origin: "server" /* Amity.LiveDataOrigin.SERVER */, loading: false });
+        }
+        catch (e) {
+            this.notifyChange({ origin: "server" /* Amity.LiveDataOrigin.SERVER */, loading: false, error: e });
+        }
+    }
+    shouldNotify(data) {
+        const newData = data.map(convertGetterPropsToStatic).map(removeFunctionProperties);
+        if (isEqual(this.snapshot, newData))
+            return false;
+        this.snapshot = newData;
+        return true;
+    }
+    getCacheKey() {
+        return this.cacheKey;
+    }
+}
+
 const onFollowerUserDeleted = ({ userId }) => (callback) => {
     const client = getActiveClient();
     const filter = (data) => {
@@ -27620,6 +27027,69 @@ const getFollowings = (params, callback, config) => {
 };
 /* end_public_function */
 
+/**
+ * @deprecated This function will to be deprecated soon.
+ */
+const liveObject = (id, callback, key, fetcher, eventHandlers, options) => {
+    const { forceDispatch, callbackDataSelector, callbackFilter } = Object.assign({ forceDispatch: false, callbackDataSelector: (data) => data }, options);
+    const { cache } = getActiveClient();
+    if (!cache) {
+        console.log(LIVE_OBJECT_ENABLE_CACHE_MESSAGE);
+    }
+    let model;
+    let isUnsyncedModel = false; // for messages
+    const disposers = [];
+    const dispatcher = (data) => {
+        const { data: newModel } = data, rest = __rest(data, ["data"]);
+        if (!callbackFilter || callbackFilter(newModel, model)) {
+            callback(Object.assign({ data: callbackDataSelector(newModel) }, rest));
+        }
+        // resolve all getter on data model to a static value to avoid comparison problems
+        model = convertGetterPropsToStatic(newModel);
+    };
+    const realtimeRouter = (eventModel, forceDispatch = false) => {
+        if (id !== eventModel[key]) {
+            return;
+        }
+        if (model) {
+            if (!forceDispatch && isEqual(model, eventModel)) {
+                return;
+            }
+        }
+        dispatcher({ loading: false, data: eventModel, origin: 'event' });
+    };
+    const onFetch = () => {
+        // TODO: Ihis `@ts-ignore` is bring back to fix the build and it needs to be removed later
+        // @ts-ignore
+        const query = createQuery(fetcher, id, true);
+        runQuery(query, ({ error, data, loading, origin, cachedAt }) => {
+            if (cachedAt === UNSYNCED_OBJECT_CACHED_AT_VALUE) {
+                dispatcher({
+                    // @ts-ignore
+                    data,
+                    origin,
+                    loading: false,
+                    error: new ASCApiError(UNSYNCED_OBJECT_CACHED_AT_MESSAGE, 800800 /* Amity.ClientError.DISALOOW_UNSYNCED_OBJECT */, "error" /* Amity.ErrorLevel.ERROR */),
+                });
+                isUnsyncedModel = true;
+                disposers.forEach(fn => fn());
+            }
+            else if (!isUnsyncedModel) {
+                // @ts-ignore
+                dispatcher({ loading, data, origin, error });
+            }
+            if (error) {
+                disposers.forEach(fn => fn());
+            }
+        });
+    };
+    disposers.push(...eventHandlers.map(fn => fn(eventModel => realtimeRouter(eventModel, forceDispatch))));
+    onFetch();
+    return () => {
+        disposers.forEach(fn => fn());
+    };
+};
+
 /* begin_public_function
   id: user.relationship.get_follow_info
 */
@@ -27685,12 +27155,9 @@ var index$k = /*#__PURE__*/Object.freeze({
   __proto__: null,
   blockUser: blockUser,
   unBlockUser: unBlockUser,
-  getBlockedUsers: getBlockedUsers,
   follow: follow,
   unfollow: unfollow,
-  acceptFollower: acceptFollower,
   acceptMyFollower: acceptMyFollower,
-  declineFollower: declineFollower,
   declineMyFollower: declineMyFollower,
   onUserFollowed: onUserFollowed,
   onUserUnfollowed: onUserUnfollowed,
@@ -27705,9 +27172,6 @@ var index$k = /*#__PURE__*/Object.freeze({
   onLocalFollowerRequested: onLocalFollowerRequested,
   onLocalFollowRequestAccepted: onLocalFollowRequestAccepted,
   onLocalFollowRequestDeclined: onLocalFollowRequestDeclined,
-  observeFollowInfo: observeFollowInfo,
-  observeFollowers: observeFollowers,
-  observeFollowings: observeFollowings,
   getFollowers: getFollowers,
   getFollowings: getFollowings,
   getFollowInfo: getFollowInfo,
@@ -27895,6 +27359,74 @@ const isUserFlaggedByMe = async (userId) => {
 };
 /* end_public_function */
 
+/**
+ * ```js
+ * import { onUserUpdated } from '@amityco/ts-sdk'
+ * const dispose = onUserUpdated(user => {
+ *   // ...
+ * })
+ * ```
+ *
+ * Fired when a {@link Amity.InternalUser} has been updated
+ *
+ * @param callback The function to call when the event was fired
+ * @returns an {@link Amity.Unsubscriber} function to stop listening
+ *
+ * @category User Events
+ */
+const onUserUpdated = (callback) => createUserEventSubscriber('user.updated', callback);
+
+/**
+ * ```js
+ * import { onUserFlagged } from '@amityco/ts-sdk'
+ * const dispose = onUserFlagged(user => {
+ *   // ...
+ * })
+ * ```
+ *
+ * Fired when a {@link Amity.InternalUser} has been flagged
+ *
+ * @param callback The function to call when the event was fired
+ * @returns an {@link Amity.Unsubscriber} function to stop listening
+ *
+ * @category User Events
+ */
+const onUserFlagged = (callback) => createUserEventSubscriber('user.flagged', callback);
+
+/**
+ * ```js
+ * import { onUserUnflagged } from '@amityco/ts-sdk'
+ * const dispose = onUserUnflagged(user => {
+ *   // ...
+ * })
+ * ```
+ *
+ * Fired when a flag has been removed from a {@link Amity.InternalUser}
+ *
+ * @param callback The function to call when the event was fired
+ * @returns an {@link Amity.Unsubscriber} function to stop listening
+ *
+ * @category User Events
+ */
+const onUserUnflagged = (callback) => createUserEventSubscriber('user.unflagged', callback);
+
+/**
+ * ```js
+ * import { onUserFlagCleared } from '@amityco/ts-sdk'
+ * const dispose = onUserFlagCleared(user => {
+ *   // ...
+ * })
+ * ```
+ *
+ * Fired when flags have been cleared for a {@link Amity.InternalUser}
+ *
+ * @param callback The function to call when the event was fired
+ * @returns an {@link Amity.Unsubscriber} function to stop listening
+ *
+ * @category User Events
+ */
+const onUserFlagCleared = (callback) => createUserEventSubscriber('user.flagCleared', callback);
+
 /**
  * ```js
  * import { onUserFetched } from '@amityco/ts-sdk'
@@ -27926,7 +27458,7 @@ const onUserFetched = (callback) => createUserEventSubscriber('user.fetched', ca
  * @category Private
  * @async
  */
-const getUser$2 = async (userId) => {
+const getUser$1 = async (userId) => {
     const client = getActiveClient();
     client.log('user/getUser', userId);
     isInTombstone('user', userId);
@@ -27962,7 +27494,7 @@ const getUser$2 = async (userId) => {
  *
  * @category User API
  */
-getUser$2.locally = (userId) => {
+getUser$1.locally = (userId) => {
     const client = getActiveClient();
     client.log('user/getUser.locally', userId);
     if (!client.cache)
@@ -27998,11 +27530,11 @@ getUser$2.locally = (userId) => {
  *
  * @category Message Live Object
  */
-const getUser$1 = (userId, callback) => {
+const getUser = (userId, callback) => {
     const reactor = (response) => {
         return callback(Object.assign(Object.assign({}, response), { data: response.data ? LinkedObject.user(response.data) : response.data }));
     };
-    return liveObject(userId, reactor, 'userId', getUser$2, [
+    return liveObject(userId, reactor, 'userId', getUser$1, [
         onUserFetched,
         onUserUpdated,
         onUserDeleted$2,
@@ -28015,10 +27547,10 @@ const getUser$1 = (userId, callback) => {
 
 class UserPaginationController extends PaginationController {
     async getRequest(queryParams, token) {
-        const { limit = COLLECTION_DEFAULT_PAGINATION_LIMIT, displayName } = queryParams, params = __rest(queryParams, ["limit", "displayName"]);
+        const { limit = COLLECTION_DEFAULT_PAGINATION_LIMIT } = queryParams, params = __rest(queryParams, ["limit"]);
         const options = token ? { token } : { limit };
         const { data: queryResponse } = await this.http.get(`/api/v3/users`, {
-            params: Object.assign(Object.assign({}, params), { keyword: displayName, options, isDeleted: false }),
+            params: Object.assign(Object.assign({}, params), { options, isDeleted: false }),
         });
         return queryResponse;
     }
@@ -28070,6 +27602,15 @@ class UserQueryStreamController extends QueryStreamController {
     }
 }
 
+var EnumUserActions;
+(function (EnumUserActions) {
+    EnumUserActions["OnUserDeleted"] = "onUserDeleted";
+    EnumUserActions["OnUserUpdated"] = "onUserUpdated";
+    EnumUserActions["OnUserFlagged"] = "onUserFlagged";
+    EnumUserActions["OnUserUnflagged"] = "onUserUnflagged";
+    EnumUserActions["OnUserFlagCleared"] = "onUserFlagCleared";
+})(EnumUserActions || (EnumUserActions = {}));
+
 class UserLiveCollectionController extends LiveCollectionController {
     constructor(query, callback) {
         const queryStreamId = hash(query);
@@ -28128,21 +27669,17 @@ class UserLiveCollectionController extends LiveCollectionController {
     }
     applyFilter(data) {
         let users = data;
-        if (!this.query.displayName) {
-            const sortFn = (() => {
-                switch (this.query.sortBy) {
-                    case 'firstCreated':
-                        return sortByFirstCreated;
-                    case 'lastCreated':
-                        return sortByLastCreated;
-                    case 'displayName':
-                        return sortByDisplayName;
-                    default:
-                        return sortByLastCreated;
-                }
-            })();
-            users = users.sort(sortFn);
-        }
+        const sortFn = (() => {
+            switch (this.query.sortBy) {
+                case 'firstCreated':
+                    return sortByFirstCreated;
+                case 'lastCreated':
+                    return sortByLastCreated;
+                default:
+                    return sortByLastCreated;
+            }
+        })();
+        users = users.sort(sortFn);
         if (this.query.filter === 'flagged') {
             users = users.filter(user => !!user.hashFlag);
         }
@@ -28189,90 +27726,200 @@ const getUsers = (params, callback, config) => {
 };
 /* end_public_function */
 
-/**
- * ```js
- * import { getUser } from '~/user/api'
- * const { data: user } = await getUser('foobar')
- * ```
- *
- * Fetches a {@link Amity.User} object
- *
- * @param userId the ID of the {@link Amity.User} to fetch
- * @returns the associated {@link Amity.User} object
- *
- * @category Private
- * @async
- */
-const getUser = async (userId) => {
-    const { data, cachedAt } = await getUser$2(userId);
-    return {
-        data: LinkedObject.user(data),
-        cachedAt,
-    };
-};
-/**
- * ```js
- * import { getUser } from '@amityco/ts-sdk'
- * const { data: user } = getUser.locally('foobar')
- * ```
- *
- * Fetches a {@link Amity.User} object from cache
- *
- * @param userId the ID of the {@link Amity.User} to fetch
- * @returns the associated {@link Amity.User} object
- *
- * @category User API
- */
-getUser.locally = (userId) => {
-    const cached = getUser$2.locally(userId);
-    if (!cached)
+class BlockedUserPaginationController extends PaginationController {
+    async getRequest(queryParams, token) {
+        const { limit = COLLECTION_DEFAULT_PAGINATION_LIMIT } = queryParams, params = __rest(queryParams, ["limit"]);
+        const options = token ? { token } : { limit };
+        const { data: queryResponse } = await this.http.get('/api/v4/me/user-blocks', {
+            params: Object.assign(Object.assign({}, params), { options, isDeleted: false }),
+        });
+        return queryResponse;
+    }
+}
+
+class BlockedUserQueryStreamController extends QueryStreamController {
+    constructor(query, cacheKey, notifyChange, preparePayload) {
+        super(query, cacheKey);
+        this.notifyChange = notifyChange;
+        this.preparePayload = preparePayload;
+    }
+    async saveToMainDB(response) {
+        const processedPayload = await this.preparePayload(response);
+        const client = getActiveClient();
+        const cachedAt = client.cache && Date.now();
+        if (client.cache) {
+            ingestInCache(processedPayload, { cachedAt });
+        }
+    }
+    appendToQueryStream(response, direction, refresh = false) {
+        var _a, _b;
+        if (refresh) {
+            pushToCache(this.cacheKey, {
+                data: response.users.map(getResolver('user')),
+            });
+        }
+        else {
+            const collection = (_a = pullFromCache(this.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 : [];
+            pushToCache(this.cacheKey, Object.assign(Object.assign({}, collection), { data: [...new Set([...users, ...response.users.map(getResolver('user'))])] }));
+        }
+    }
+    reactor(action) {
+        return (targetUser) => {
+            var _a;
+            if (action === EnumFollowActions.OnFollowed) {
+                const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+                const updatedCollection = collection === null || collection === void 0 ? void 0 : collection.data.filter(id => id !== targetUser.userId);
+                pushToCache(this.cacheKey, Object.assign(Object.assign({}, collection), { data: updatedCollection }));
+            }
+            this.notifyChange({ origin: "event" /* Amity.LiveDataOrigin.EVENT */, loading: false });
+        };
+    }
+    subscribeRTE(createSubscriber) {
+        return createSubscriber.map(subscriber => subscriber.fn(this.reactor(subscriber.action)));
+    }
+}
+
+function prepareBlockedUserPayload(response) {
+    const { users, follows } = response, rest = __rest(response, ["users", "follows"]);
+    return Object.assign(Object.assign({}, rest), { follows: follows.map(follow => {
+            const followUser = users.find(user => user.userId === follow.from);
+            return Object.assign(Object.assign({}, follow), { user: convertRawUserToInternalUser(followUser) });
+        }), users: users.map(convertRawUserToInternalUser) });
+}
+
+const convertEventPayload = (eventHandler, sourceModelProp, destinationDomain) => (callback) => eventHandler(sourceModel => {
+    var _a, _b;
+    if (!sourceModel) {
+        return sourceModel;
+    }
+    const client = getActiveClient();
+    const { objectSyncMap } = client;
+    /*
+     * NOTE: For objects created locally (optimistic creation), the SDK stores them with their local ID as the cache key, which is used throughout the entire SDK session (in-memory) for syncing updates.
+     * If the payload or response only contains the remote ID of the same object, the SDK will look up the corresponding local ID to retrieve the object.
+     */
+    const resolvedId = isLocalId(sourceModel[sourceModelProp])
+        ? sourceModel[sourceModelProp]
+        : (_a = objectSyncMap.get(sourceModel[sourceModelProp])) !== null && _a !== void 0 ? _a : sourceModel[sourceModelProp];
+    const model = (_b = pullFromCache([
+        destinationDomain,
+        'get',
+        `${resolvedId}`,
+    ])) === null || _b === void 0 ? void 0 : _b.data;
+    if (!model)
         return;
-    return {
-        data: LinkedObject.user(cached.data),
-        cachedAt: cached.cachedAt,
-    };
-};
+    return callback(model);
+});
 
+class BlockedUserLiveCollectionController extends LiveCollectionController {
+    constructor(query, callback) {
+        const queryStreamId = hash(query);
+        const cacheKey = ['blockedUsers', 'collection', queryStreamId];
+        const paginationController = new BlockedUserPaginationController(query);
+        super(paginationController, queryStreamId, cacheKey, callback);
+        this.query = query;
+        this.queryStreamController = new BlockedUserQueryStreamController(this.query, this.cacheKey, this.notifyChange.bind(this), prepareBlockedUserPayload);
+        this.callback = callback.bind(this);
+        this.loadPage({ initial: true });
+    }
+    setup() {
+        var _a;
+        const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+        if (!collection) {
+            pushToCache(this.cacheKey, {
+                data: [],
+                params: {},
+            });
+        }
+    }
+    async persistModel(queryPayload) {
+        await this.queryStreamController.saveToMainDB(queryPayload);
+    }
+    persistQueryStream({ response, direction, refresh, }) {
+        this.queryStreamController.appendToQueryStream(response, direction, refresh);
+    }
+    startSubscription() {
+        return this.queryStreamController.subscribeRTE([
+            {
+                fn: onUserDeleted$2,
+                action: EnumUserActions.OnUserDeleted,
+            },
+            // In the case of unblocking a user, we need to subscribe to the follow events
+            {
+                fn: convertEventPayload(onLocalUserFollowed, 'to', 'user'),
+                action: EnumFollowActions.OnFollowed,
+            },
+            {
+                fn: convertEventPayload(onUserFollowed, 'to', 'user'),
+                action: EnumFollowActions.OnFollowed,
+            },
+        ]);
+    }
+    notifyChange({ origin, loading, error }) {
+        var _a, _b;
+        const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+        if (!collection)
+            return;
+        const data = this.applyFilter((_b = collection.data
+            .map(id => pullFromCache(['user', 'get', id]))
+            .filter(isNonNullable)
+            .map(({ data }) => data)
+            .map(LinkedObject.user)) !== null && _b !== void 0 ? _b : []);
+        if (!this.shouldNotify(data) && origin === 'event')
+            return;
+        this.callback({
+            onNextPage: () => this.loadPage({ direction: "next" /* Amity.LiveCollectionPageDirection.NEXT */ }),
+            data,
+            hasNextPage: !!this.paginationController.getNextToken(),
+            loading,
+            error,
+        });
+    }
+    // eslint-disable-next-line class-methods-use-this
+    applyFilter(data) {
+        let users = data;
+        users = users.filter(user => user.isDeleted == null || user.isDeleted === false);
+        return users;
+    }
+}
+
+/* begin_public_function
+  id: user.get_blocked_users
+*/
 /**
  * ```js
- * import { observeUser } from '@amityco/ts-sdk'
- *
- * let user = {}
- * const dispose = observeUser(userId, updated => user = updated)
+ * import { UserRepository } from '@amityco/ts-sdk'
+ * const unblockedUser = await UserRepository.blockUser('userId')
  * ```
  *
- * @param userId the ID of the user 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 user
+ * Blocks a {@link Amity.InternalUser}
+ *
+ * @param params The params to get blocked {@link Amity.InternalUser}s
+ * @param callback to recieve updates on unblocked {@link Amity.InternalUser}s
+ * @returns {@link Amity.Unsubscriber} to unsubscribe from collection
  *
- * Observe all mutation on a given {@link Amity.InternalUser}
- * @category User Observer
+ * @category Post API
+ * @async
  */
-const observeUser = (userId, callback) => {
-    const { log } = getActiveClient();
+const getBlockedUsers = (params, callback, config) => {
+    const { log, cache } = getActiveClient();
+    if (!cache) {
+        console.log(ENABLE_CACHE_MESSAGE);
+    }
     const timestamp = Date.now();
-    log(`observeUser(tmpid: ${timestamp}) > listen`);
-    // wrapper function to make sure
-    const router = (result, action) => {
-        var _a, _b, _c;
-        // filter function
-        if (((_a = result.data) === null || _a === void 0 ? void 0 : _a.userId) !== userId)
-            return;
-        const newResult = Object.assign(Object.assign({}, result), { data: LinkedObject.user(result.data) });
-        if (callback instanceof Function)
-            return callback(newResult);
-        if (action !== 'onFetch')
-            (_b = callback.onEvent) === null || _b === void 0 ? void 0 : _b.call(callback, action, newResult);
-        (_c = callback[action]) === null || _c === void 0 ? void 0 : _c.call(callback, newResult);
-    };
-    const disposers = [];
-    disposers.push(onUserUpdated(data => router({ data, loading: false, origin: 'event' }, 'onUpdate')), onUserDeleted$2(data => router({ data, loading: false, origin: 'event' }, 'onDelete')), onUserFlagged(data => router({ data, loading: false, origin: 'event' }, 'onFlagged')), onUserUnflagged(data => router({ data, loading: false, origin: 'event' }, 'onUnflagged')), onUserFlagCleared(data => router({ data, loading: false, origin: 'event' }, 'onFlagCleared')));
-    runQuery(createQuery(getUser, userId), result => result.data && router(result, 'onFetch'));
+    log(`getBlockedUsers(tmpid: ${timestamp}) > listen`);
+    const blockedUserLiveCollection = new BlockedUserLiveCollectionController(params, callback);
+    const disposers = blockedUserLiveCollection.startSubscription();
+    const cacheKey = blockedUserLiveCollection.getCacheKey();
+    disposers.push(() => dropFromCache(cacheKey));
     return () => {
-        log(`observeUser(tmpid: ${timestamp}) > dispose`);
+        log(`getBlockedUsers(tmpid: ${timestamp}) > dispose`);
         disposers.forEach(fn => fn());
+        dropFromCache(cacheKey);
     };
-};
+};
+/* end_public_function */
 
 class SearchUserPaginationController extends PaginationController {
     async getRequest(queryParams, token) {
@@ -28457,74 +28104,6 @@ const queryReachUser = async ({ viewId, viewedType, limit, token, }) => {
     return response.data;
 };
 
-/**
- * @deprecated: Please use {@link UserRepository.getReachUsers} instead
- * @param params
- * @param callback
- */
-const getViewedUsers = (params, callback) => {
-    const { log, cache } = getActiveClient();
-    const cacheKey = ['postViewedUsers', 'collection', { postId: params.postId }];
-    if (!cache) {
-        console.log(ENABLE_CACHE_MESSAGE);
-    }
-    const timestamp = Date.now();
-    log(`getViewedUsers(tmpid: ${timestamp}) > listen`);
-    const { limit: queryLimit, postId } = params;
-    const responder = (snapshot) => {
-        var _a, _b;
-        let users = [];
-        if (snapshot === null || snapshot === void 0 ? void 0 : snapshot.data) {
-            users =
-                snapshot.data
-                    .map((userId) => pullFromCache(['user', 'get', userId]))
-                    .filter(Boolean)
-                    .map(data => data === null || data === void 0 ? void 0 : data.data) || [];
-        }
-        callback({
-            // eslint-disable-next-line no-use-before-define
-            onNextPage: onFetch,
-            data: users,
-            hasNextPage: !!((_b = (_a = snapshot.params) === null || _a === void 0 ? void 0 : _a.page) === null || _b === void 0 ? void 0 : _b.next),
-            loading: snapshot.loading || false,
-        });
-    };
-    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 (!initial && users.length > 0 && !(collection === null || collection === void 0 ? void 0 : collection.params.page))
-            return;
-        const query = createQuery(queryReachUser, {
-            viewId: postId,
-            viewedType: "post" /* Amity.AnalyticEventContentType.Post */,
-            limit: queryLimit || 10,
-            token: !initial ? (_c = collection === null || collection === void 0 ? void 0 : collection.params.page) === null || _c === void 0 ? void 0 : _c.next : undefined,
-        });
-        runQuery(query, result => {
-            var _a, _b, _c, _d, _e;
-            let userIds = (_c = (_b = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.data) !== null && _c !== void 0 ? _c : [];
-            if ((_d = result.data) === null || _d === void 0 ? void 0 : _d.users) {
-                userIds = [
-                    ...new Set([...userIds, ...result.data.users.map(({ userId }) => userId)]),
-                ];
-            }
-            const saveToCache = {
-                loading: result.loading,
-                params: { page: (_e = result.data) === null || _e === void 0 ? void 0 : _e.paging },
-                data: userIds || [],
-            };
-            pushToCache(cacheKey, saveToCache);
-            responder(saveToCache);
-        }, queryOptions(COLLECTION_DEFAULT_CACHING_POLICY, CACHE_SHORTEN_LIFESPAN));
-    };
-    onFetch(true);
-    return () => {
-        log(`getViewedUsers(tmpid: ${timestamp}) > dispose`);
-        dropFromCache(cacheKey);
-    };
-};
-
 const getReachedUsers = (params, callback) => {
     // Pre-defined function to avoid undefined function call
     let onFetch = (initial = false) => undefined;
@@ -28612,12 +28191,10 @@ var index$j = /*#__PURE__*/Object.freeze({
   onUserFlagged: onUserFlagged,
   onUserUnflagged: onUserUnflagged,
   onUserFlagCleared: onUserFlagCleared,
-  getUser: getUser$1,
+  getUser: getUser,
   getUsers: getUsers,
-  observeUser: observeUser,
-  getBlockedUsers: getBlockedUsers$1,
+  getBlockedUsers: getBlockedUsers,
   searchUserByDisplayName: searchUserByDisplayName,
-  getViewedUsers: getViewedUsers,
   getReachedUsers: getReachedUsers,
   get AmityUserSearchMatchType () { return AmityUserSearchMatchType; }
 });
@@ -28867,181 +28444,6 @@ const uploadImage = async (formData, onProgress) => {
 };
 /* end_public_function */
 
-/**
- * ```js
- * import { createImage } from '@amityco/ts-sdk'
- * const created = await createImage(formData)
- * ```
- *
- * Creates an {@link Amity.File<'image'>}
- *
- * @param formData The data necessary to create a new {@link Amity.File<'image'>}
- * @param onProgress The callback to track the upload progress
- * @returns The newly created {@link Amity.File<'image'>}
- *
- * @category File API
- * @async
- */
-const createImage = async (formData, onProgress) => {
-    const client = getActiveClient();
-    client.log('file/createImage', formData);
-    const files = formData.getAll('files');
-    if (!files.length)
-        throw new Error('The formData object must have a `files` key.');
-    const accessType = GlobalFileAccessType$1.getInstance().getFileAccessType();
-    formData.append('accessType', accessType);
-    formData.append('preferredFilename', files[0].name);
-    const headers = 'getHeaders' in formData
-        ? formData.getHeaders()
-        : { 'content-type': 'multipart/form-data' };
-    const { data } = await client.http.post('/api/v4/images', formData, {
-        headers,
-        onUploadProgress({ loaded, total = 100 }) {
-            onProgress && onProgress(Math.round((loaded * 100) / total));
-        },
-    });
-    // API-FIX: payload should be serialized properly
-    // const { files } = data
-    const cachedAt = client.cache && Date.now();
-    if (client.cache)
-        ingestInCache({ files: data }, { cachedAt });
-    return {
-        data,
-        cachedAt,
-    };
-};
-/* end_public_function */
-
-/**
- * ```js
- * import { FileRepository } from '@amityco/ts-sdk'
- * const created = await FileRepository.createFile(formData)
- * ```
- *
- * Creates an {@link Amity.File}
- *
- * @param formData The data necessary to create a new {@link Amity.File}
- * @param onProgress The callback to track the upload progress
- * @returns The newly created {@link Amity.File}
- *
- * @category File API
- * @async
- */
-const createFile = async (formData, onProgress) => {
-    const client = getActiveClient();
-    client.log('file/createFile', formData);
-    const files = formData.getAll('files');
-    if (!files.length)
-        throw new Error('The formData object must have a `files` key.');
-    const accessType = GlobalFileAccessType$1.getInstance().getFileAccessType();
-    formData.append('accessType', accessType);
-    formData.append('preferredFilename', files[0].name);
-    const headers = 'getHeaders' in formData
-        ? formData.getHeaders()
-        : { 'content-type': 'multipart/form-data' };
-    const { data } = await client.http.post('/api/v4/files', formData, {
-        headers,
-        onUploadProgress({ loaded, total = 100 }) {
-            onProgress && onProgress(Math.round((loaded * 100) / total));
-        },
-    });
-    // API-FIX: payload should be serialized properly
-    // const { files } = data
-    const cachedAt = client.cache && Date.now();
-    if (client.cache)
-        ingestInCache({ files: data }, { cachedAt });
-    return {
-        data,
-        cachedAt,
-    };
-};
-
-/**
- * ```js
- * import { FileRepository } from '@amityco/ts-sdk'
- * const created = await FileRepository.createVideo(formData)
- * ```
- *
- * Creates an {@link Amity.File<'video'>}
- *
- * @param formData The data necessary to create a new {@link Amity.File<'video'>}
- * @param feedType The {@link Amity.File<'video'>} feed type
- * @param onProgress The callback to track the upload progress
- * @returns The newly uploaded {@link Amity.File<'video'>}
- *
- * @category File API
- * @async
- */
-const createVideo = async (formData, feedType, onProgress) => {
-    const client = getActiveClient();
-    client.log('file/createVideo', formData);
-    const files = formData.getAll('files');
-    if (!files.length)
-        throw new Error('The formData object must have a `files` key.');
-    const accessType = GlobalFileAccessType$1.getInstance().getFileAccessType();
-    formData.append('accessType', accessType);
-    formData.append('preferredFilename', files[0].name);
-    if (feedType) {
-        formData.append('feedType', feedType);
-    }
-    const headers = 'getHeaders' in formData
-        ? formData.getHeaders()
-        : { 'content-type': 'multipart/form-data' };
-    const { data } = await client.http.post('/api/v4/videos', formData, {
-        headers,
-        onUploadProgress({ loaded, total = 100 }) {
-            onProgress && onProgress(Math.round((loaded * 100) / total));
-        },
-    });
-    // API-FIX: payload should be serialized properly
-    // const { files } = data
-    const cachedAt = client.cache && Date.now();
-    if (client.cache)
-        ingestInCache({ files: data }, { cachedAt });
-    return {
-        data,
-        cachedAt,
-    };
-};
-
-/**
- * ```js
- * import { observeFile } from '@amityco/ts-sdk'
- *
- * let file = {}
- * const dispose = observeFile(fileId, updated => file = updated)
- * ```
- *
- * Observe all mutation on a given {@link Amity.File}
- *
- * @param fileId the ID of the file 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 file
- *
- * @category File Observer
- */
-const observeFile = (fileId, callback) => {
-    const { log } = getActiveClient();
-    const timestamp = Date.now();
-    log(`observeFile(tmpid: ${timestamp}) > listen`);
-    // wrapper function to make sure
-    const router = (result, action) => {
-        var _a, _b, _c;
-        // filter function
-        if (((_a = result.data) === null || _a === void 0 ? void 0 : _a.fileId) !== fileId)
-            return;
-        if (callback instanceof Function)
-            return callback(result);
-        if (action !== 'onFetch')
-            (_b = callback.onEvent) === null || _b === void 0 ? void 0 : _b.call(callback, action, result);
-        (_c = callback[action]) === null || _c === void 0 ? void 0 : _c.call(callback, result);
-    };
-    runQuery(createQuery(getFile, fileId), result => result.data && router(result, 'onFetch'));
-    return () => {
-        log(`observeFile(tmpid: ${timestamp}) > dispose`);
-    };
-};
-
 var index$i = /*#__PURE__*/Object.freeze({
   __proto__: null,
   getFile: getFile,
@@ -29049,11 +28451,7 @@ var index$i = /*#__PURE__*/Object.freeze({
   deleteFile: deleteFile,
   fileUrlWithSize: fileUrlWithSize,
   uploadVideo: uploadVideo,
-  uploadImage: uploadImage,
-  createImage: createImage,
-  createFile: createFile,
-  createVideo: createVideo,
-  observeFile: observeFile
+  uploadImage: uploadImage
 });
 
 /**
@@ -29074,16 +28472,12 @@ var index$i = /*#__PURE__*/Object.freeze({
 const queryRoles = async (query) => {
     const client = getActiveClient();
     client.log('role/queryRoles', query);
-    const _a = query !== null && query !== void 0 ? query : {}, { page, limit = 10, queryToken, displayName, sortBy } = _a, params = __rest(_a, ["page", "limit", "queryToken", "displayName", "sortBy"]);
+    const _a = query !== null && query !== void 0 ? query : {}, { limit = 10, queryToken, displayName, sortBy } = _a, params = __rest(_a, ["limit", "queryToken", "displayName", "sortBy"]);
     const options = (() => {
         if (queryToken)
             return { token: queryToken };
         if (limit)
             return { limit };
-        if (page)
-            return {
-                token: toToken(page, 'skiplimit'),
-            };
         return undefined;
     })();
     // API-FIX: parameters should be querystring.
@@ -29211,12 +28605,9 @@ const dispatchReactable = (referenceType, model) => {
  * @category Message API
  * @async
  */
-const getMessage$2 = async (messageId, isLive = false) => {
+const getMessage$1 = async (messageId, isLive = false) => {
     const client = getActiveClient();
     client.log('message/getMessage', messageId);
-    if (!isLive) {
-        console.log('getMessage will be deprecated on 15th November 2022, please use liveMessage instead.');
-    }
     isInTombstone('message', messageId);
     let data;
     try {
@@ -29253,7 +28644,7 @@ const getMessage$2 = async (messageId, isLive = false) => {
  *
  * @category Message API
  */
-getMessage$2.locally = (messageId) => {
+getMessage$1.locally = (messageId) => {
     const client = getActiveClient();
     client.log('message/getMessage.locally', messageId);
     if (!client.cache)
@@ -31182,7 +30573,7 @@ const getChannel$1 = async (channelId) => {
         ingestInCache(data, { cachedAt });
     const { channels } = data;
     return {
-        data: constructChannelDynamicValue(channels.find(channel => channel.channelId === channelId)),
+        data: channels.find(channel => channel.channelId === channelId),
         cachedAt,
     };
 };
@@ -31212,7 +30603,7 @@ getChannel$1.locally = (channelId) => {
     if (!cached || (cached === null || cached === void 0 ? void 0 : cached.length) === 0)
         return;
     return {
-        data: constructChannelDynamicValue(cached[0].data),
+        data: cached[0].data,
         cachedAt: cached[0].cachedAt,
     };
 };
@@ -31237,7 +30628,7 @@ const deleteChannel = async (channelId) => {
     await client.http.delete(`/api/v3/channels/${encodeURIComponent(channelId)}`);
     const deleted = await getChannel$1(channelId);
     // no need for event, fired by server
-    return deleted.data;
+    return constructChannelDynamicValue(deleted.data);
 };
 
 /* begin_public_function
@@ -31359,81 +30750,6 @@ const unmuteChannel = async (channelId) => {
 };
 /* end_public_function */
 
-/**
- * ```js
- * import { observeChannel } from '@amityco/ts-sdk'
- *
- * let channel = {}
- * const dispose = observeChannel(channelId, ({ data }) => channel = data)
- * ```
- *
- * Observe all mutation on a given {@link Amity.Channel}
- *
- * @param channelId the ID of the channel 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 channel
- *
- * @category Channel Observer
- */
-const observeChannel = (channelId, callback) => {
-    const { log } = getActiveClient();
-    const timestamp = Date.now();
-    log(`observeChannel(tmpid: ${timestamp}) > listen`);
-    // wrapper function to make sure
-    const router = (result, action) => {
-        var _a, _b, _c;
-        // filter function
-        if (((_a = result.data) === null || _a === void 0 ? void 0 : _a.channelId) !== channelId)
-            return;
-        if (callback instanceof Function)
-            return callback(Object.assign(Object.assign({}, result), { data: LinkedObject.channel(constructChannelDynamicValue(result.data)) }));
-        if (action !== 'onFetch')
-            (_b = callback.onEvent) === null || _b === void 0 ? void 0 : _b.call(callback, action, Object.assign(Object.assign({}, result), { data: LinkedObject.channel(constructChannelDynamicValue(result.data)) }));
-        (_c = callback[action]) === null || _c === void 0 ? void 0 : _c.call(callback, Object.assign(Object.assign({}, result), { data: LinkedObject.channel(constructChannelDynamicValue(result.data)) }));
-    };
-    const disposers = [];
-    disposers.push(onChannelUpdated(data => router({ data, loading: false, origin: 'event' }, "onUpdate" /* Amity.ChannelActionType.OnUpdate */)), onChannelDeleted(data => router({ data, loading: false, origin: 'event' }, "onDelete" /* Amity.ChannelActionType.OnDelete */)), onChannelJoined(data => router({ data, loading: false, origin: 'event' }, "onJoin" /* Amity.ChannelActionType.OnJoin */)), onChannelLeft(data => router({ data, loading: false, origin: 'event' }, "onLeft" /* Amity.ChannelActionType.OnLeft */)), onChannelMuted(data => router({ data, loading: false, origin: 'event' }, "onMute" /* Amity.ChannelActionType.OnMute */)), onChannelMemberAdded(data => router({ data, loading: false, origin: 'event' }, "onMemberAdded" /* Amity.ChannelActionType.OnMemberAdded */)), onChannelMemberRemoved(data => router({ data, loading: false, origin: 'event' }, "onMemberRemoved" /* Amity.ChannelActionType.OnMemberRemoved */)), convertEventPayload(onChannelMarkerFetched, 'entityId', 'channel')(data => router({ data, loading: false, origin: 'event' }, "onUpdate" /* Amity.ChannelActionType.OnUpdate */)));
-    runQuery(createQuery(getChannel$1, channelId), result => result.data && router(result, "onFetch" /* Amity.ChannelActionType.OnFetch */));
-    return () => {
-        log(`observeChannel(tmpid: ${timestamp}) > dispose`);
-        disposers.forEach(fn => fn());
-    };
-};
-
-/**
- * ```js
- * import { observeChannels } from '@amityco/ts-sdk'
- *
- * let channels = []
- * const unsub = observeChannels(channel => merge(channels, channel))
- * ```
- *
- * Observe all mutations on a list of {@link Amity.Channel} for a 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 the channels
- *
- * @category Channel Observer
- */
-const observeChannels = (callback) => {
-    const { log } = getActiveClient();
-    const timestamp = Date.now();
-    log(`observeChannels(tmpid: ${timestamp}) > listen`);
-    const disposers = [];
-    const router = (channel, action) => {
-        var _a, _b;
-        if (callback instanceof Function)
-            return callback(LinkedObject.channel(constructChannelDynamicValue(channel)));
-        (_a = callback.onEvent) === null || _a === void 0 ? void 0 : _a.call(callback, action, LinkedObject.channel(constructChannelDynamicValue(channel)));
-        (_b = callback[action]) === null || _b === void 0 ? void 0 : _b.call(callback, LinkedObject.channel(constructChannelDynamicValue(channel)));
-    };
-    disposers.push(onChannelCreated(data => router(data, "onCreate" /* Amity.ChannelActionType.OnCreate */)), onChannelUpdated(data => router(data, "onUpdate" /* Amity.ChannelActionType.OnUpdate */)), onChannelDeleted(data => router(data, "onDelete" /* Amity.ChannelActionType.OnDelete */)), onChannelJoined(data => router(data, "onJoin" /* Amity.ChannelActionType.OnJoin */)), onChannelLeft(data => router(data, "onLeft" /* Amity.ChannelActionType.OnLeft */)), onChannelMuted(data => router(data, "onMute" /* Amity.ChannelActionType.OnMute */)), onChannelMemberAdded(data => router(data, "onMemberAdded" /* Amity.ChannelActionType.OnMemberAdded */)), onChannelMemberRemoved(data => router(data, "onMemberRemoved" /* Amity.ChannelActionType.OnMemberRemoved */)), convertEventPayload(onChannelMarkerFetched, 'entityId', 'channel')(data => router(data, "onUpdate" /* Amity.ChannelActionType.OnUpdate */)));
-    return () => {
-        log(`observeChannels(tmpid: ${timestamp}) > dispose`);
-        disposers.forEach(fn => fn());
-    };
-};
-
 /**
  * ```js
  * import { onMessageUpdated } from '@amityco/ts-sdk'
@@ -31712,69 +31028,6 @@ const onSubChannelFetched = (callback) => {
     return createEventSubscriber(getActiveClient(), 'onSubChannelFetched', 'local.message-feed.fetched', payload => callback(payload.messageFeeds[0]));
 };
 
-/**
- * ```js
- * import { getMessages } from '@amityco/ts-sdk'
- * const messages = await getMessages(['foo', 'bar'])
- * ```
- *
- * Fetches a collection of {@link Amity.Message} objects
- *
- * @param messageIds the IDs of the {@link Amity.Message} to fetch
- * @returns the associated collection of {@link Amity.Message} objects
- *
- * @category Message API
- * @async
- */
-const getMessages$1 = async (messageIds) => {
-    const client = getActiveClient();
-    client.log('message/getMessages', messageIds);
-    const { data: payload } = await client.http.get(`/api/v5/messages/list`, {
-        params: { messageIds: messageIds.map(encodeURIComponent) },
-    });
-    const data = await prepareMessagePayload(payload);
-    const cachedAt = client.cache && Date.now();
-    if (client.cache)
-        ingestInCache(data, { cachedAt });
-    const { messages } = data;
-    fireEvent('local.message.fetched', { messages });
-    return {
-        data: messages.map(message => LinkedObject.message(message)),
-        cachedAt,
-    };
-};
-/**
- * ```js
- * import { getMessages } from '@amityco/ts-sdk'
- * const messages = getMessages.locally(['foo', 'bar']) ?? []
- * ```
- *
- * Fetches a collection of {@link Amity.Message} objects from cache
- *
- * @param messageIds the IDs of the {@link Amity.Message} to fetch
- * @returns the associated collection of {@link Amity.Message} objects
- *
- * @category Message API
- */
-getMessages$1.locally = (messageIds) => {
-    var _a;
-    const client = getActiveClient();
-    client.log('message/getMessages.locally', messageIds);
-    if (!client.cache)
-        return;
-    const cached = messageIds
-        .map(messageId => pullFromCache(['message', 'get', messageId]))
-        .filter(Boolean);
-    const messages = cached.map(({ data }) => data);
-    const oldest = (_a = cached.sort((a, b) => (a.cachedAt < b.cachedAt ? -1 : 1))) === null || _a === void 0 ? void 0 : _a[0];
-    if ((cached === null || cached === void 0 ? void 0 : cached.length) < messageIds.length)
-        return;
-    return {
-        data: messages,
-        cachedAt: oldest.cachedAt,
-    };
-};
-
 const getLocalId = () => `LOCAL_${uuid()}`;
 // FIXME: temp solution
 let uniqueId;
@@ -31799,7 +31052,11 @@ const createMessageOptimistic = (bundle) => {
     if (subChannel) {
         upsertInCache(['subChannel', 'get', bundle.subChannelId], Object.assign(Object.assign({}, subChannel.data), { messageCount: subChannel.data.messageCount + 1 }));
         if (subChannel.data.channelId === subChannel.data.subChannelId) {
-            const channel = pullFromCache(['channel', 'get', subChannel.data.channelId]);
+            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 }));
             }
@@ -32087,7 +31344,7 @@ const softDeleteMessage = async (messageId) => {
     client.log('message/softDeleteMessage', messageId);
     // API-FIX: This endpoint has not been implemented yet.
     await client.http.delete(`/api/v5/messages/${encodeURIComponent(messageId)}`);
-    const deleted = await getMessage$2(messageId);
+    const deleted = await getMessage$1(messageId);
     fireEvent('local.message.deleted', { messages: [deleted.data] });
     return LinkedObject.message(deleted.data);
 };
@@ -32561,12 +31818,12 @@ const onMessageFetched = (callback) => {
  *
  * @category Message Live Object
  */
-const getMessage$1 = (messageId, callback) => {
+const getMessage = (messageId, callback) => {
     const responder = (snapshot) => {
         const { data } = snapshot;
         callback(Object.assign(Object.assign({}, snapshot), { data: data ? LinkedObject.message(snapshot.data) : data }));
     };
-    return liveObject(messageId, responder, 'messageId', getMessage$2, [
+    return liveObject(messageId, responder, 'messageId', getMessage$1, [
         onMessageFetched,
         onMessageUpdated,
         onMessageDeleted,
@@ -32615,7 +31872,7 @@ class MessageQueryStreamController extends QueryStreamController {
     }
     reactor(action) {
         return (payload) => {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c;
             if (action === 'onCreate') {
                 const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
                 const { referenceId } = payload;
@@ -32625,14 +31882,9 @@ class MessageQueryStreamController extends QueryStreamController {
                     return;
                 if (this.query.type && this.query.type !== payload.dataType)
                     return;
-                if (this.query.dataType && this.query.dataType !== payload.dataType)
-                    return;
                 if (this.query.excludingTags &&
                     ((_b = this.query.excludingTags) === null || _b === void 0 ? void 0 : _b.some(value => { var _a; return (_a = payload.tags) === null || _a === void 0 ? void 0 : _a.includes(value); })))
                     return;
-                if (this.query.excludeTags &&
-                    ((_c = this.query.excludeTags) === null || _c === void 0 ? void 0 : _c.some(value => { var _a; return (_a = payload.tags) === null || _a === void 0 ? void 0 : _a.includes(value); })))
-                    return;
                 if (!!this.query.hasFlags !== !!payload.flagCount)
                     return;
                 if (this.query.parentId && this.query.parentId !== payload.parentId)
@@ -32642,9 +31894,7 @@ class MessageQueryStreamController extends QueryStreamController {
                     payload.isDeleted)
                     return;
                 if (this.query.includingTags &&
-                    !((_d = this.query.includingTags) === null || _d === void 0 ? void 0 : _d.some(value => { var _a; return (_a = payload.tags) === null || _a === void 0 ? void 0 : _a.includes(value); })))
-                    return;
-                if (this.query.tags && !((_e = this.query.tags) === null || _e === void 0 ? void 0 : _e.some(value => { var _a; return (_a = payload.tags) === null || _a === void 0 ? void 0 : _a.includes(value); })))
+                    !((_c = this.query.includingTags) === null || _c === void 0 ? void 0 : _c.some(value => { var _a; return (_a = payload.tags) === null || _a === void 0 ? void 0 : _a.includes(value); })))
                     return;
                 if ((!this.query.sortBy || this.query.sortBy === 'segmentDesc') &&
                     !this.paginationController.getPrevToken()) {
@@ -32744,26 +31994,6 @@ class MessageLiveCollectionController extends LiveCollectionController {
     }
     applyFilter(data) {
         let messages = data;
-        messages = messages.filter(m => {
-            if (this.query.tags) {
-                return this.query.tags.find(value => {
-                    if (!m.tags)
-                        return false;
-                    return m.tags.includes(value);
-                });
-            }
-            return true;
-        });
-        messages = messages.filter(m => {
-            if (this.query.excludeTags) {
-                return (this.query.excludeTags || []).find(value => {
-                    if (!m.tags)
-                        return true;
-                    return !m.tags.includes(value);
-                });
-            }
-            return true;
-        });
         /*
          * for cases when message is deleted via RTE, this flag is used to get
          * items from cache that are !deleted
@@ -32800,7 +32030,6 @@ class MessageLiveCollectionController extends LiveCollectionController {
     }
 }
 
-/* eslint-disable no-use-before-define */
 /* begin_public_function
   id: message.query
 */
@@ -32843,164 +32072,8 @@ const getMessages = (params, callback, config) => {
 };
 /* end_public_function */
 
-/**
- * ```js
- * import { getMessage } from '@amityco/ts-sdk'
- * const message = await getMessage('foobar')
- * ```
- *
- * Fetches a {@link Amity.Message} object
- *
- * @param messageId the ID of the {@link Amity.Message} to fetch
- * @returns the associated {@link Amity.Message} object
- *
- * @category Message API
- * @async
- */
-const getMessage = async (messageId, isLive = false) => {
-    const client = getActiveClient();
-    client.log('message/getMessage', messageId);
-    if (!isLive) {
-        console.log('getMessage will be deprecated on 15th November 2022, please use liveMessage instead.');
-    }
-    isInTombstone('message', messageId);
-    let data;
-    try {
-        // API-FIX: endpoint should not be /list, parameters should be querystring.
-        const { data: payload } = await client.http.get(`/api/v5/messages/${encodeURIComponent(messageId)}`);
-        data = await prepareMessagePayload(payload);
-    }
-    catch (error) {
-        if (checkIfShouldGoesToTombstone(error === null || error === void 0 ? void 0 : error.code)) {
-            pushToTombstone('message', messageId);
-        }
-        throw error;
-    }
-    const cachedAt = client.cache && Date.now();
-    if (client.cache)
-        ingestInCache(data, { cachedAt });
-    const { messages } = data;
-    fireEvent('local.message.fetched', { messages });
-    return {
-        data: LinkedObject.message(messages.find(message => message.messageId === messageId)),
-        cachedAt,
-    };
-};
-/**
- * ```js
- * import { getMessage } from '@amityco/ts-sdk'
- * const message = getMessage.locally('foobar')
- * ```
- *
- * Fetches a {@link Amity.Message} object
- *
- * @param messageId the ID of the {@link Amity.Message} to fetch
- * @returns the associated {@link Amity.Message} object
- *
- * @category Message API
- */
-getMessage.locally = (messageId) => {
-    const client = getActiveClient();
-    client.log('message/getMessage.locally', messageId);
-    if (!client.cache)
-        return;
-    const cached = pullFromCache(['message', 'get', messageId]);
-    if (!cached)
-        return;
-    return {
-        data: cached.data,
-        cachedAt: cached.cachedAt,
-    };
-};
-
-/**
- * ```js
- * import { observeMessage } from '@amityco/ts-sdk'
- *
- * let message = {}
- *
- * const unsub = observeMessage(messageId, updated => message = updated)
- * ```
- *
- * Observe all mutations on a {@link Amity.Message} given a single messageId
- *
- * @param client the client to observe the message with
- * @param messageId the ID of the message to observe
- * @param callback the function to call when new data are available
- * @param policy a query policy option for this observer
- * @returns An {@link Amity.Unsubscriber} function to run when willing to stop observing the message
- *
- * @category Message Observer
- */
-const observeMessage = (messageId, callback, policy = 'cache_then_server') => {
-    const { log } = getActiveClient();
-    const timestamp = Date.now();
-    log(`observeMessage(tmpid: ${timestamp}) > listen`);
-    console.log('observeMessage will be deprecated on 15th November 2022, please use liveMessage instead.');
-    // wrapper function to make sure
-    const router = (result, action) => {
-        var _a, _b, _c;
-        // filter function
-        if (((_a = result.data) === null || _a === void 0 ? void 0 : _a.messageId) !== messageId)
-            return;
-        if (callback instanceof Function)
-            return callback(result);
-        if (action !== 'onFetch')
-            (_b = callback.onEvent) === null || _b === void 0 ? void 0 : _b.call(callback, action, result);
-        (_c = callback[action]) === null || _c === void 0 ? void 0 : _c.call(callback, result);
-    };
-    const disposers = [];
-    disposers.push(onMessageUpdated(data => router({ data: LinkedObject.message(data), loading: false, origin: 'event' }, 'onUpdate')), onMessageDeleted(data => router({ data: LinkedObject.message(data), loading: false, origin: 'event' }, 'onDelete')), convertEventPayload(onMessageMarkerFetched, 'contentId', 'message')(data => router({ data: LinkedObject.message(data), loading: false, origin: 'event' }, 'onUpdate')), convertEventPayload(onMessageMarked, 'contentId', 'message')(data => router({ data: LinkedObject.message(data), loading: false, origin: 'event' }, 'onUpdate')));
-    if (policy !== 'no_fetch') {
-        runQuery(createQuery(getMessage, messageId), result => result.data && router(result, 'onFetch'), queryOptions(policy));
-    }
-    return () => {
-        log(`observeMessages(tmpid: ${timestamp}) > dispose`);
-        disposers.forEach(fn => fn());
-    };
-};
-
-/**
- * ```js
- * import { observeMessages } from '@amityco/ts-sdk'
- *
- * let messages = []
- *
- * const unsubscribe = observeMessages(channelId, message => merge(messages, message))
- * ```
- *
- * Observe all mutations on a list of {@link Amity.Message} for a given {@link Amity.SubChannel} object
- *
- * @param subChannelId the ID of the channel where to observe the messages
- * @param callback the function to call when new data are available
- * @returns An {@link Amity.Unsubscriber} function to run when willing to stop observing the messages
- *
- * @category Message Observer
- */
-const observeMessages = (subChannelId, callback) => {
-    const { log } = getActiveClient();
-    const timestamp = Date.now();
-    log(`observeMessages(tmpid: ${timestamp}) > listen`);
-    const disposers = [];
-    const router = (message, action) => {
-        var _a, _b, _c;
-        if (((_a = message.data) === null || _a === void 0 ? void 0 : _a.subChannelId) !== subChannelId)
-            return;
-        if (callback instanceof Function)
-            return callback(message);
-        (_b = callback.onEvent) === null || _b === void 0 ? void 0 : _b.call(callback, action, message);
-        (_c = callback[action]) === null || _c === void 0 ? void 0 : _c.call(callback, message);
-    };
-    disposers.push(onMessageCreatedMqtt(data => router({ data: LinkedObject.message(data), loading: false, origin: 'event' }, 'onCreate')), onMessageCreatedLocal(data => router({ data: LinkedObject.message(data), loading: false, origin: 'event' }, 'onCreate')), onMessageUpdated(data => router({ data: LinkedObject.message(data), loading: false, origin: 'event' }, 'onUpdate')), onMessageDeleted(data => router({ data: LinkedObject.message(data), loading: false, origin: 'event' }, 'onDelete')), convertEventPayload(onMessageMarkerFetched, 'contentId', 'message')(data => router({ data: LinkedObject.message(data), loading: false, origin: 'event' }, 'onCreate')), convertEventPayload(onMessageMarked, 'contentId', 'message')(data => router({ data: LinkedObject.message(data), loading: false, origin: 'event' }, 'onCreate')));
-    return () => {
-        log(`observeMessages(tmpid: ${timestamp}) > dispose`);
-        disposers.forEach(fn => fn());
-    };
-};
-
 var index$g = /*#__PURE__*/Object.freeze({
   __proto__: null,
-  getMessageByIds: getMessages$1,
   createMessage: createMessage,
   updateMessage: updateMessage,
   editMessage: editMessage,
@@ -33022,10 +32095,8 @@ var index$g = /*#__PURE__*/Object.freeze({
   onMessageReactionAdded: onMessageReactionAdded,
   onMessageReactionRemoved: onMessageReactionRemoved,
   onMessageFetched: onMessageFetched,
-  getMessage: getMessage$1,
+  getMessage: getMessage,
   getMessages: getMessages,
-  observeMessage: observeMessage,
-  observeMessages: observeMessages,
   convertFromRaw: convertFromRaw$1,
   prepareMessagePayload: prepareMessagePayload,
   convertParams: convertParams,
@@ -33542,8 +32613,6 @@ var index$f = /*#__PURE__*/Object.freeze({
   getSubChannel: getSubChannel,
   getSubChannels: getSubChannels,
   markReadEngineOnLoginHandler: markReadEngineOnLoginHandler,
-  startReading: startReading,
-  stopReading: stopReading,
   startMessageReceiptSync: startMessageReceiptSync,
   stopMessageReceiptSync: stopMessageReceiptSync
 });
@@ -33594,7 +32663,7 @@ const getChannel = (channelId, callback) => {
     const reactor = async (response) => {
         if (!response.data)
             return callback(response);
-        const data = Object.assign(Object.assign({}, response), { data: LinkedObject.channel(constructChannelDynamicValue(getChannelMessagePreviewWithUser(response.data))) });
+        const data = Object.assign(Object.assign({}, response), { data: constructChannelObject(response.data) });
         const newSnapshot = __rest(data, ["origin"]);
         /**
          * check equality of previous data and current data to avoid redundancy
@@ -33628,7 +32697,11 @@ const getChannel = (channelId, callback) => {
                 if (message.channelId !== channelId)
                     return;
                 // channelId from message is channelInternalId
-                const channel = (_a = pullFromCache(['channel', 'get', channelId])) === null || _a === void 0 ? void 0 : _a.data;
+                const channel = (_a = pullFromCache([
+                    'channel',
+                    'get',
+                    channelId,
+                ])) === null || _a === void 0 ? void 0 : _a.data;
                 if (!channel)
                     return;
                 updateChannelCache(channel, {
@@ -33651,7 +32724,11 @@ const getChannel = (channelId, callback) => {
                 if (message.channelId !== channelId)
                     return;
                 // channelId from message is channelInternalId
-                const channel = (_a = pullFromCache(['channel', 'get', channelId])) === null || _a === void 0 ? void 0 : _a.data;
+                const channel = (_a = pullFromCache([
+                    'channel',
+                    'get',
+                    channelId,
+                ])) === null || _a === void 0 ? void 0 : _a.data;
                 if (!channel)
                     return;
                 updateChannelCache(channel, {
@@ -33664,7 +32741,11 @@ const getChannel = (channelId, callback) => {
         convertEventPayload((callback) => {
             const updateMessagePreview = async (message) => {
                 var _a;
-                const channel = (_a = pullFromCache(['channel', 'get', channelId])) === null || _a === void 0 ? void 0 : _a.data;
+                const channel = (_a = pullFromCache([
+                    'channel',
+                    'get',
+                    channelId,
+                ])) === null || _a === void 0 ? void 0 : _a.data;
                 if (!channel || channel.messagePreviewId !== message.messageId)
                     return;
                 const messagePreviewSetting = await client.getMessagePreviewSetting(false);
@@ -33678,7 +32759,11 @@ const getChannel = (channelId, callback) => {
         convertEventPayload((callback) => {
             const updateMessagePreview = async (message) => {
                 var _a;
-                const channel = (_a = pullFromCache(['channel', 'get', channelId])) === null || _a === void 0 ? void 0 : _a.data;
+                const channel = (_a = pullFromCache([
+                    'channel',
+                    'get',
+                    channelId,
+                ])) === null || _a === void 0 ? void 0 : _a.data;
                 if (!channel || channel.messagePreviewId !== message.messageId)
                     return;
                 const messagePreviewSetting = await client.getMessagePreviewSetting(false);
@@ -33711,7 +32796,11 @@ const getChannel = (channelId, callback) => {
                 if (messagePreviewSetting === "no-message-preview" /* Amity.MessagePreviewSetting.NO_MESSAGE_PREVIEW */)
                     return;
                 await getChannel$1(channelId);
-                const channel = (_b = pullFromCache(['channel', 'get', channelId])) === null || _b === void 0 ? void 0 : _b.data;
+                const channel = (_b = pullFromCache([
+                    'channel',
+                    'get',
+                    channelId,
+                ])) === null || _b === void 0 ? void 0 : _b.data;
                 if (!channel)
                     return;
                 callback(subChannel);
@@ -33733,7 +32822,11 @@ const getChannel = (channelId, callback) => {
                 if (!messagePreviewCache ||
                     messagePreviewCache.subChannelId !== subChannel.subChannelId)
                     return;
-                const channel = (_b = pullFromCache(['channel', 'get', channelId])) === null || _b === void 0 ? void 0 : _b.data;
+                const channel = (_b = pullFromCache([
+                    'channel',
+                    'get',
+                    channelId,
+                ])) === null || _b === void 0 ? void 0 : _b.data;
                 if (!channel)
                     return;
                 callback(subChannel);
@@ -33929,9 +33022,7 @@ class ChannelLiveCollectionController extends LiveCollectionController {
             .map(channelId => pullFromCache(['channel', 'get', channelId]))
             .filter(Boolean)
             .map(({ data }) => data)
-            .map(getChannelMessagePreviewWithUser)
-            .map(constructChannelDynamicValue)
-            .map(LinkedObject.channel)) !== null && _b !== void 0 ? _b : [];
+            .map(constructChannelObject)) !== null && _b !== void 0 ? _b : [];
         if (this.paginationController instanceof ChannelPaginationController) {
             data = this.applyFilter(data);
         }
@@ -34578,11 +33669,6 @@ class ChannelMemberLiveCollectionController extends LiveCollectionController {
                 return false;
             });
         }
-        if (this.query.search) {
-            // eslint-disable-next-line no-console
-            console.warn('`search` param will be deprecated in the next major release. If you want to search channel members by displayName, Please use `searchMembers()` instead.');
-            channelMembers = filterBySearchTerm(channelMembers, this.query.search);
-        }
         if (this.query.includeDeleted === false) {
             channelMembers = channelMembers.filter(member => { var _a; return ((_a = member.user) === null || _a === void 0 ? void 0 : _a.isDeleted) !== true; });
         }
@@ -34616,11 +33702,6 @@ const applyFilter$1 = (data, params) => {
             return params.memberships.includes(member.membership);
         });
     }
-    if (params.search) {
-        // eslint-disable-next-line no-console
-        console.warn('`search` param will be deprecated in the next major release. If you want to search channel members by displayName, Please use `searchMembers()` instead.');
-        channelMembers = filterBySearchTerm(channelMembers, params.search);
-    }
     // sort, 'lastCreated' is the default sort order
     const sortBy = params.sortBy ? params.sortBy : 'lastCreated';
     channelMembers = channelMembers.sort(sortBy === 'lastCreated' ? sortByLastCreated : sortByFirstCreated);
@@ -34912,7 +33993,7 @@ var index$c = /*#__PURE__*/Object.freeze({
   __proto__: null,
   Membership: index$e,
   Moderation: index$d,
-  getChannelByIds: getChannelByIds,
+  getChannelByIds: getChannelByIds$1,
   createChannel: createChannel,
   updateChannel: updateChannel,
   deleteChannel: deleteChannel,
@@ -34920,7 +34001,6 @@ var index$c = /*#__PURE__*/Object.freeze({
   leaveChannel: leaveChannel,
   muteChannel: muteChannel,
   unmuteChannel: unmuteChannel,
-  markAsRead: markAsRead,
   onChannelCreated: onChannelCreated,
   onChannelUpdated: onChannelUpdated,
   onChannelDeleted: onChannelDeleted,
@@ -34933,8 +34013,6 @@ var index$c = /*#__PURE__*/Object.freeze({
   onChannelMemberUnbanned: onChannelMemberUnbanned,
   onChannelMemberRoleAdded: onChannelMemberRoleAdded,
   onChannelMemberRoleRemoved: onChannelMemberRoleRemoved,
-  observeChannel: observeChannel,
-  observeChannels: observeChannels,
   getChannel: getChannel,
   getChannels: getChannels,
   MARKER_INCLUDED_CHANNEL_TYPE: MARKER_INCLUDED_CHANNEL_TYPE,
@@ -35245,77 +34323,6 @@ const leaveCommunity = async (communityId) => {
 };
 /* end_public_function */
 
-/* begin_public_function
-  id: community.query.trending_communities
-*/
-/**
- * @deprecated This API renamed to `getTrendingCommunities()`.
- * Please use getTrendingCommunities() instead.
- *
- * ```js
- * import { CommunityRepository } from '@amityco/ts-sdk'
- * const trendingCommunities = await CommunityRepository.getTrendingCommunities()
- * ```
- *
- * Gets a list of top trending {@link Amity.Community} objects
- *
- * @param query The query parameters
- * @returns A list of {@link Amity.Community} objects
- *
- * @category Community API
- * @async
- */
-const getTopTrendingCommunities = async (query) => {
-    const client = getActiveClient();
-    client.log('channel/getTopTrendingCommunities', query);
-    const { limit = 5 } = query !== null && query !== void 0 ? query : {};
-    // API-FIX: backend doesnt answer Amity.Response
-    // const { data } = await client.http.get<Amity.Response<CommunityPayload>>(
-    const { data: payload } = await client.http.get(`/api/v3/communities/top-trending`, { 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', 'top-trending', { params: { options: { limit } } }];
-        pushToCache(cacheKey, { communities: communities.map(getResolver('community')) });
-    }
-    return { data: communities, cachedAt };
-};
-/* end_public_function */
-/**
- * ```js
- * import { getTopTrendingCommunities } from '@amityco/ts-sdk'
- * const communities = getTopTrendingCommunities.locally()
- * ```
- *
- * Gets a list of top trending {@link Amity.Community} objects from cache
- *
- * @param query The query parameters
- * @returns communities
- *
- * @category Community API
- */
-getTopTrendingCommunities.locally = (query) => {
-    var _a, _b;
-    const client = getActiveClient();
-    client.log('community/getTopTrendingCommunities.locally', query);
-    if (!client.cache)
-        return;
-    const { limit = 5 } = query !== null && query !== void 0 ? query : {};
-    const queryKey = ['community', 'top-trending', { 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) => {
@@ -35386,7 +34393,224 @@ const onCommunityUpdated = (callback) => createCommunityEventSubscriber('communi
  *
  * @category Community Events
  */
-const onCommunityDeleted = (callback) => createCommunityEventSubscriber('community.deleted', callback);
+const onCommunityDeleted = (callback) => createCommunityEventSubscriber('community.deleted', callback);
+
+/**
+ * TODO: handle cache receive cache option, and cache policy
+ * TODO: check if querybyIds is supported
+ */
+class CommunitiesPaginationController$1 extends PaginationController {
+    async getRequest(queryParams, token) {
+        const { limit = COLLECTION_DEFAULT_PAGINATION_LIMIT } = queryParams, params = __rest(queryParams, ["limit"]);
+        const options = token ? { token } : { limit };
+        const { data: queryResponse } = await this.http.get(`/api/v3/communities`, {
+            params: Object.assign(Object.assign({}, params), { isDeleted: inferIsDeleted(params.includeDeleted), keyword: params.displayName, filter: params.membership, options }),
+        });
+        return queryResponse;
+    }
+}
+
+class CommunitiesQueryStreamController$1 extends QueryStreamController {
+    constructor(query, cacheKey, notifyChange, preparePayload) {
+        super(query, cacheKey);
+        this.notifyChange = notifyChange;
+        this.preparePayload = preparePayload;
+    }
+    async saveToMainDB(response) {
+        const processedPayload = await this.preparePayload(response);
+        const client = getActiveClient();
+        const cachedAt = client.cache && Date.now();
+        if (client.cache) {
+            ingestInCache(processedPayload, { cachedAt });
+        }
+    }
+    appendToQueryStream(response, direction, refresh = false) {
+        var _a, _b;
+        if (refresh) {
+            pushToCache(this.cacheKey, {
+                data: response.communities.map(getResolver('community')),
+            });
+        }
+        else {
+            const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+            const communities = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
+            pushToCache(this.cacheKey, Object.assign(Object.assign({}, collection), { data: [...new Set([...communities, ...response.communities.map(getResolver('community'))])] }));
+        }
+    }
+    reactor(action) {
+        return (community) => {
+            var _a;
+            const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+            if (!collection)
+                return;
+            pushToCache(this.cacheKey, collection);
+            this.notifyChange({ origin: "event" /* Amity.LiveDataOrigin.EVENT */, loading: false });
+        };
+    }
+    subscribeRTE(createSubscriber) {
+        return createSubscriber.map(subscriber => subscriber.fn(this.reactor(subscriber.action)));
+    }
+}
+
+var EnumCommunityActions$4;
+(function (EnumCommunityActions) {
+    EnumCommunityActions["OnCommunityCreated"] = "onCommunityCreated";
+    EnumCommunityActions["OnCommunityDeleted"] = "onCommunityDeleted";
+    EnumCommunityActions["OnCommunityUpdated"] = "onCommunityUpdated";
+})(EnumCommunityActions$4 || (EnumCommunityActions$4 = {}));
+
+var EnumCommunityMemberActions$1;
+(function (EnumCommunityMemberActions) {
+    EnumCommunityMemberActions["OnCommunityJoined"] = "onCommunityJoined";
+    EnumCommunityMemberActions["OnCommunityLeft"] = "onCommunityLeft";
+    EnumCommunityMemberActions["OnCommunityUserBanned"] = "onCommunityUserBanned";
+    EnumCommunityMemberActions["OnCommunityUserChanged"] = "onCommunityUserChanged";
+    EnumCommunityMemberActions["OnCommunityUserRoleAdded"] = "onCommunityUserRoleAdded";
+    EnumCommunityMemberActions["OnCommunityUserRoleRemoved"] = "onCommunityUserRoleRemoved";
+    EnumCommunityMemberActions["OnCommunityUserUnbanned"] = "onCommunityUserUnbanned";
+    EnumCommunityMemberActions["OnMemberCountChanged"] = "OnMemberCountChanged";
+    EnumCommunityMemberActions["OnCommunityUserAdded"] = "OnCommunityUserAdded";
+    EnumCommunityMemberActions["onCommunityUserRemoved"] = "onCommunityUserRemoved";
+    EnumCommunityMemberActions["OnUserDeleted"] = "OnUserDeleted";
+})(EnumCommunityMemberActions$1 || (EnumCommunityMemberActions$1 = {}));
+
+/* begin_public_function
+  id: community.membership.add_members
+*/
+/**
+ * ```js
+ * import { CommunityRepository } from '@amityco/ts-sdk'
+ * const updated = await CommunityRepository.moderation.addMembers(communityId, ['foo', 'bar'])
+ * ```
+ *
+ * Adds a list of {@link Amity.InternalUser} to a {@link Amity.Community} to add users to
+ *
+ * @param communityId The ID of the {@link Amity.Community} to perform
+ * @param userIds The list of IDs {@link Amity.InternalUser} to add
+ * @returns A success boolean if the {@link Amity.InternalUser} were added to the {@link Amity.Community}
+ *
+ * @category Community API
+ * @async
+ */
+const addMembers = async (communityId, userIds) => {
+    const client = getActiveClient();
+    client.log('community/moderation/addMembers', communityId, userIds);
+    const { data: payload } = await client.http.post(`/api/v3/communities/${communityId}/users`, { communityId, userIds });
+    fireEvent('local.community.userAdded', payload);
+    const data = prepareMembershipPayload(payload, 'communityUsers');
+    if (client.cache)
+        ingestInCache(data);
+    const { communityUsers } = data;
+    return !!communityUsers.find(communityUser => communityUser.communityId === communityId && communityUser.communityMembership === 'member');
+};
+/* end_public_function */
+
+/* begin_public_function
+  id: community.membership.remove_member
+*/
+/**
+ * ```js
+ * import { CommunityRepository } from '@amityco/ts-sdk'
+ * const updated = await CommunityRepository.moderation.removeMembers(communityId, ['foo', 'bar'])
+ * ```
+ *
+ * Removes a list of {@link Amity.InternalUser} from a {@link Amity.Community}
+ *
+ * @param communityId The ID of the {@link Amity.Community} to edit
+ * @param userIds The list of IDs {@link Amity.InternalUser} to remove
+ * @returns A success boolean if the list of {@link Amity.InternalUser} were removed from the {@link Amity.Community}
+ *
+ * @category Community API
+ * @async
+ */
+const removeMembers = async (communityId, userIds) => {
+    const client = getActiveClient();
+    client.log('community/moderation/removeMembers', communityId, userIds);
+    const { data: payload } = await client.http.delete(`/api/v3/communities/${communityId}/users`, { data: { communityId, userIds } });
+    fireEvent('local.community.userRemoved', payload);
+    const data = prepareMembershipPayload(payload, 'communityUsers');
+    if (client.cache)
+        ingestInCache(data);
+    const { communityUsers } = data;
+    return !!communityUsers.find(communityUser => communityUser.communityId === communityId && communityUser.communityMembership !== 'member');
+};
+/* end_public_function */
+
+/**
+ * TODO: handle cache receive cache option, and cache policy
+ * TODO: check if querybyIds is supported
+ */
+class CommunityMembersPaginationController extends PaginationController {
+    async getRequest(queryParams, token) {
+        const { limit = COLLECTION_DEFAULT_PAGINATION_LIMIT, includeDeleted } = queryParams, params = __rest(queryParams, ["limit", "includeDeleted"]);
+        const options = token ? { token } : { limit };
+        const isDeleted = includeDeleted === false ? false : undefined;
+        const { data: queryResponse } = await this.http.get(`/api/v3/communities/${params.communityId}/users`, {
+            params: Object.assign(Object.assign({}, params), { options,
+                isDeleted }),
+        });
+        return queryResponse;
+    }
+}
+
+class CommunityMembersQueryStreamController extends QueryStreamController {
+    constructor(query, cacheKey, notifyChange, preparePayload) {
+        super(query, cacheKey);
+        this.notifyChange = notifyChange;
+        this.preparePayload = preparePayload;
+    }
+    async saveToMainDB(response) {
+        const processedPayload = await this.preparePayload(response);
+        const client = getActiveClient();
+        const cachedAt = client.cache && Date.now();
+        if (client.cache) {
+            ingestInCache(processedPayload, { cachedAt });
+        }
+    }
+    appendToQueryStream(response, direction, refresh = false) {
+        var _a, _b;
+        if (refresh) {
+            pushToCache(this.cacheKey, {
+                data: response.communityUsers.map(({ communityId, userId }) => getResolver('communityUsers')({ communityId, userId })),
+            });
+        }
+        else {
+            const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+            const communityUsers = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
+            pushToCache(this.cacheKey, Object.assign(Object.assign({}, collection), { data: [
+                    ...new Set([
+                        ...communityUsers,
+                        ...response.communityUsers.map(({ communityId, userId }) => getResolver('communityUsers')({ communityId, userId })),
+                    ]),
+                ] }));
+        }
+    }
+    reactor(action) {
+        return (community, communityMembers) => {
+            var _a;
+            const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+            if (!collection)
+                return;
+            communityMembers.forEach(communityMember => {
+                const communityMemberCacheId = getResolver('communityUsers')({
+                    communityId: this.query.communityId,
+                    userId: communityMember.userId,
+                });
+                if (communityMember.communityMembership === 'none') {
+                    collection.data = collection.data.filter(m => m !== communityMemberCacheId);
+                }
+                else if (!collection.data.includes(communityMemberCacheId)) {
+                    collection.data = [communityMemberCacheId, ...collection.data];
+                }
+            });
+            pushToCache(this.cacheKey, collection);
+            this.notifyChange({ origin: "event" /* Amity.LiveDataOrigin.EVENT */, loading: false });
+        };
+    }
+    subscribeRTE(createSubscriber) {
+        return createSubscriber.map(subscriber => subscriber.fn(this.reactor(subscriber.action)));
+    }
+}
 
 function hasPermission(member, payload, permission) {
     if (member.permissions.some(x => x === permission)) {
@@ -35680,271 +34904,6 @@ const onLocalCommunityJoined = (callback) => createLocalCommunityMemberEventSubs
 
 const onLocalCommunityLeft = (callback) => createLocalCommunityMemberEventSubscriber('local.community.left', callback);
 
-/**
- * ```js
- * import { observeCommunity } from '@amityco/ts-sdk'
- *
- * let community = {}
- * const dispose = observeCommunity(communityId, updated => community = updated)
- * ```
- *
- * Observe all mutation on a given {@link Amity.Community}
- *
- * @param communityId the ID of the community 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 community
- *
- * @category Community Observer
- */
-const observeCommunity = (communityId, callback) => {
-    const { log } = getActiveClient();
-    const timestamp = Date.now();
-    log(`observeCommunity(tmpid: ${timestamp}) > listen`);
-    // wrapper function to make sure
-    const router = (result, action) => {
-        var _a, _b;
-        if (callback instanceof Function)
-            return callback(result);
-        if (action !== 'onFetch')
-            (_a = callback.onEvent) === null || _a === void 0 ? void 0 : _a.call(callback, action, result);
-        (_b = callback[action]) === null || _b === void 0 ? void 0 : _b.call(callback, result);
-    };
-    const realtimeRouter = (result, action) => {
-        var _a;
-        if (((_a = result.data) === null || _a === void 0 ? void 0 : _a.communityId) !== communityId)
-            return;
-        router(result, action);
-    };
-    const disposers = [];
-    disposers.push(onCommunityUpdated(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onUpdate')), onCommunityDeleted(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onDelete')), onCommunityJoined(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onJoin')), onCommunityLeft(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onLeft')), onCommunityUserAdded(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onUserAdded')), onCommunityUserRemoved(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onUserRemoved')), onCommunityUserBanned(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onUserBanned')), onCommunityUserUnbanned(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onUserUnbanned')));
-    runQuery(createQuery(getCommunity$1, communityId), result => (result.data || result.error) && router(result, 'onFetch'));
-    return () => {
-        log(`observeCommunity(tmpid: ${timestamp}) > dispose`);
-        disposers.forEach(fn => fn());
-    };
-};
-
-/**
- * TODO: handle cache receive cache option, and cache policy
- * TODO: check if querybyIds is supported
- */
-class CommunitiesPaginationController$1 extends PaginationController {
-    async getRequest(queryParams, token) {
-        const { limit = COLLECTION_DEFAULT_PAGINATION_LIMIT } = queryParams, params = __rest(queryParams, ["limit"]);
-        const options = token ? { token } : { limit };
-        const { data: queryResponse } = await this.http.get(`/api/v3/communities`, {
-            params: Object.assign(Object.assign({}, params), { isDeleted: inferIsDeleted(params.includeDeleted), keyword: params.displayName, filter: params.membership, options }),
-        });
-        return queryResponse;
-    }
-}
-
-class CommunitiesQueryStreamController$1 extends QueryStreamController {
-    constructor(query, cacheKey, notifyChange, preparePayload) {
-        super(query, cacheKey);
-        this.notifyChange = notifyChange;
-        this.preparePayload = preparePayload;
-    }
-    async saveToMainDB(response) {
-        const processedPayload = await this.preparePayload(response);
-        const client = getActiveClient();
-        const cachedAt = client.cache && Date.now();
-        if (client.cache) {
-            ingestInCache(processedPayload, { cachedAt });
-        }
-    }
-    appendToQueryStream(response, direction, refresh = false) {
-        var _a, _b;
-        if (refresh) {
-            pushToCache(this.cacheKey, {
-                data: response.communities.map(getResolver('community')),
-            });
-        }
-        else {
-            const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-            const communities = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
-            pushToCache(this.cacheKey, Object.assign(Object.assign({}, collection), { data: [...new Set([...communities, ...response.communities.map(getResolver('community'))])] }));
-        }
-    }
-    reactor(action) {
-        return (community) => {
-            var _a;
-            const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-            if (!collection)
-                return;
-            pushToCache(this.cacheKey, collection);
-            this.notifyChange({ origin: "event" /* Amity.LiveDataOrigin.EVENT */, loading: false });
-        };
-    }
-    subscribeRTE(createSubscriber) {
-        return createSubscriber.map(subscriber => subscriber.fn(this.reactor(subscriber.action)));
-    }
-}
-
-var EnumCommunityActions$4;
-(function (EnumCommunityActions) {
-    EnumCommunityActions["OnCommunityCreated"] = "onCommunityCreated";
-    EnumCommunityActions["OnCommunityDeleted"] = "onCommunityDeleted";
-    EnumCommunityActions["OnCommunityUpdated"] = "onCommunityUpdated";
-})(EnumCommunityActions$4 || (EnumCommunityActions$4 = {}));
-
-var EnumCommunityMemberActions$1;
-(function (EnumCommunityMemberActions) {
-    EnumCommunityMemberActions["OnCommunityJoined"] = "onCommunityJoined";
-    EnumCommunityMemberActions["OnCommunityLeft"] = "onCommunityLeft";
-    EnumCommunityMemberActions["OnCommunityUserBanned"] = "onCommunityUserBanned";
-    EnumCommunityMemberActions["OnCommunityUserChanged"] = "onCommunityUserChanged";
-    EnumCommunityMemberActions["OnCommunityUserRoleAdded"] = "onCommunityUserRoleAdded";
-    EnumCommunityMemberActions["OnCommunityUserRoleRemoved"] = "onCommunityUserRoleRemoved";
-    EnumCommunityMemberActions["OnCommunityUserUnbanned"] = "onCommunityUserUnbanned";
-    EnumCommunityMemberActions["OnMemberCountChanged"] = "OnMemberCountChanged";
-    EnumCommunityMemberActions["OnCommunityUserAdded"] = "OnCommunityUserAdded";
-    EnumCommunityMemberActions["onCommunityUserRemoved"] = "onCommunityUserRemoved";
-    EnumCommunityMemberActions["OnUserDeleted"] = "OnUserDeleted";
-})(EnumCommunityMemberActions$1 || (EnumCommunityMemberActions$1 = {}));
-
-/* begin_public_function
-  id: community.membership.add_members
-*/
-/**
- * ```js
- * import { CommunityRepository } from '@amityco/ts-sdk'
- * const updated = await CommunityRepository.moderation.addMembers(communityId, ['foo', 'bar'])
- * ```
- *
- * Adds a list of {@link Amity.InternalUser} to a {@link Amity.Community} to add users to
- *
- * @param communityId The ID of the {@link Amity.Community} to perform
- * @param userIds The list of IDs {@link Amity.InternalUser} to add
- * @returns A success boolean if the {@link Amity.InternalUser} were added to the {@link Amity.Community}
- *
- * @category Community API
- * @async
- */
-const addMembers = async (communityId, userIds) => {
-    const client = getActiveClient();
-    client.log('community/moderation/addMembers', communityId, userIds);
-    const { data: payload } = await client.http.post(`/api/v3/communities/${communityId}/users`, { communityId, userIds });
-    fireEvent('local.community.userAdded', payload);
-    const data = prepareMembershipPayload(payload, 'communityUsers');
-    if (client.cache)
-        ingestInCache(data);
-    const { communityUsers } = data;
-    return !!communityUsers.find(communityUser => communityUser.communityId === communityId && communityUser.communityMembership === 'member');
-};
-/* end_public_function */
-
-/* begin_public_function
-  id: community.membership.remove_member
-*/
-/**
- * ```js
- * import { CommunityRepository } from '@amityco/ts-sdk'
- * const updated = await CommunityRepository.moderation.removeMembers(communityId, ['foo', 'bar'])
- * ```
- *
- * Removes a list of {@link Amity.InternalUser} from a {@link Amity.Community}
- *
- * @param communityId The ID of the {@link Amity.Community} to edit
- * @param userIds The list of IDs {@link Amity.InternalUser} to remove
- * @returns A success boolean if the list of {@link Amity.InternalUser} were removed from the {@link Amity.Community}
- *
- * @category Community API
- * @async
- */
-const removeMembers = async (communityId, userIds) => {
-    const client = getActiveClient();
-    client.log('community/moderation/removeMembers', communityId, userIds);
-    const { data: payload } = await client.http.delete(`/api/v3/communities/${communityId}/users`, { data: { communityId, userIds } });
-    fireEvent('local.community.userRemoved', payload);
-    const data = prepareMembershipPayload(payload, 'communityUsers');
-    if (client.cache)
-        ingestInCache(data);
-    const { communityUsers } = data;
-    return !!communityUsers.find(communityUser => communityUser.communityId === communityId && communityUser.communityMembership !== 'member');
-};
-/* end_public_function */
-
-/**
- * TODO: handle cache receive cache option, and cache policy
- * TODO: check if querybyIds is supported
- */
-class CommunityMembersPaginationController extends PaginationController {
-    async getRequest(queryParams, token) {
-        const { limit = COLLECTION_DEFAULT_PAGINATION_LIMIT, includeDeleted } = queryParams, params = __rest(queryParams, ["limit", "includeDeleted"]);
-        const options = token ? { token } : { limit };
-        const isDeleted = includeDeleted === false ? false : undefined;
-        const { data: queryResponse } = await this.http.get(`/api/v3/communities/${params.communityId}/users`, {
-            params: Object.assign(Object.assign({}, params), { options,
-                isDeleted }),
-        });
-        return queryResponse;
-    }
-}
-
-class CommunityMembersQueryStreamController extends QueryStreamController {
-    constructor(query, cacheKey, notifyChange, preparePayload) {
-        super(query, cacheKey);
-        this.notifyChange = notifyChange;
-        this.preparePayload = preparePayload;
-    }
-    async saveToMainDB(response) {
-        const processedPayload = await this.preparePayload(response);
-        const client = getActiveClient();
-        const cachedAt = client.cache && Date.now();
-        if (client.cache) {
-            ingestInCache(processedPayload, { cachedAt });
-        }
-    }
-    appendToQueryStream(response, direction, refresh = false) {
-        var _a, _b;
-        if (refresh) {
-            pushToCache(this.cacheKey, {
-                data: response.communityUsers.map(({ communityId, userId }) => getResolver('communityUsers')({ communityId, userId })),
-            });
-        }
-        else {
-            const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-            const communityUsers = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
-            pushToCache(this.cacheKey, Object.assign(Object.assign({}, collection), { data: [
-                    ...new Set([
-                        ...communityUsers,
-                        ...response.communityUsers.map(({ communityId, userId }) => getResolver('communityUsers')({ communityId, userId })),
-                    ]),
-                ] }));
-        }
-    }
-    reactor(action) {
-        return (community, communityMembers) => {
-            var _a;
-            const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-            if (!collection)
-                return;
-            if (action === EnumCommunityMemberActions$1.OnCommunityUserRoleAdded &&
-                this.query.sortBy === 'displayName') {
-                return;
-            }
-            communityMembers.forEach(communityMember => {
-                const communityMemberCacheId = getResolver('communityUsers')({
-                    communityId: this.query.communityId,
-                    userId: communityMember.userId,
-                });
-                if (communityMember.communityMembership === 'none') {
-                    collection.data = collection.data.filter(m => m !== communityMemberCacheId);
-                }
-                else if (!collection.data.includes(communityMemberCacheId)) {
-                    collection.data = [communityMemberCacheId, ...collection.data];
-                }
-            });
-            pushToCache(this.cacheKey, collection);
-            this.notifyChange({ origin: "event" /* Amity.LiveDataOrigin.EVENT */, loading: false });
-        };
-    }
-    subscribeRTE(createSubscriber) {
-        return createSubscriber.map(subscriber => subscriber.fn(this.reactor(subscriber.action)));
-    }
-}
-
 /**
  * ```js
  * import { onLocalCommunityRoleRemoved } from '@amityco/ts-sdk'
@@ -36122,9 +35081,6 @@ class CommunityMembersLiveCollectionController extends LiveCollectionController
                 return memberships.includes(communityMembership);
             });
         }
-        if (this.query.search) {
-            communityMembers = filterBySearchTerm(communityMembers, this.query.search);
-        }
         if (this.query.includeDeleted === false) {
             communityMembers = communityMembers.filter(({ user }) => (user === null || user === void 0 ? void 0 : user.isDeleted) !== true);
         }
@@ -36132,15 +35088,6 @@ class CommunityMembersLiveCollectionController extends LiveCollectionController
             case 'firstCreated':
                 communityMembers = communityMembers.sort(sortByFirstCreated);
                 break;
-            case 'displayName':
-                communityMembers = communityMembers.sort((a, b) => {
-                    var _a, _b, _c, _d;
-                    if (((_a = a === null || a === void 0 ? void 0 : a.user) === null || _a === void 0 ? void 0 : _a.displayName) && ((_b = b === null || b === void 0 ? void 0 : b.user) === null || _b === void 0 ? void 0 : _b.displayName)) {
-                        return (_c = a === null || a === void 0 ? void 0 : a.user) === null || _c === void 0 ? void 0 : _c.displayName.localeCompare((_d = b === null || b === void 0 ? void 0 : b.user) === null || _d === void 0 ? void 0 : _d.displayName);
-                    }
-                    return 0;
-                });
-                break;
             case 'lastCreated':
             default:
                 communityMembers = communityMembers.sort(sortByLastCreated);
@@ -36162,9 +35109,6 @@ const applyFilter = (data, params) => {
             return membership.includes(communityMembership);
         });
     }
-    if (params.search) {
-        communityMembers = filterBySearchTerm(communityMembers, params.search);
-    }
     const sortBy = params.sortBy ? params.sortBy : 'lastCreated';
     communityMembers = communityMembers.sort(sortBy === 'lastCreated' ? sortByLastCreated : sortByFirstCreated);
     return communityMembers;
@@ -36521,209 +35465,202 @@ class SearchCommunityLiveCollectionController extends LiveCollectionController {
         if (this.query.membership && userId) {
             communities = filterByCommunityMembership(communities, this.query.membership, userId);
         }
-        return communities;
-    }
-}
-
-/* begin_public_function
-  id: community.query
-*/
-/**
- * ```js
- * import { CommunityRepository } from '@amityco/ts-sdk'
- *
- * let communities = []
- * const unsub = CommunityRepository.searchCommunities({
- *   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 searchCommunities = (params, callback, config) => {
-    const { log, cache } = getActiveClient();
-    if (!cache) {
-        console.log(ENABLE_CACHE_MESSAGE);
-    }
-    const timestamp = Date.now();
-    log(`searchCommunities(tmpid: ${timestamp}) > listen`);
-    const searchCommunitiesLiveCollection = new SearchCommunityLiveCollectionController(params, callback);
-    const disposers = searchCommunitiesLiveCollection.startSubscription();
-    const cacheKey = searchCommunitiesLiveCollection.getCacheKey();
-    disposers.push(() => dropFromCache(cacheKey));
-    return () => {
-        log(`searchCommunities(tmpid: ${timestamp}) > dispose`);
-        disposers.forEach(fn => fn());
-    };
-};
-/* end_public_function */
-
-/**
- * TODO: handle cache receive cache option, and cache policy
- * TODO: check if querybyIds is supported
- */
-class CommunitiesPaginationController extends PaginationController {
-    async getRequest(queryParams, token) {
-        const { limit = COLLECTION_DEFAULT_PAGINATION_LIMIT } = queryParams, params = __rest(queryParams, ["limit"]);
-        const options = token ? { token } : { limit };
-        const { data: queryResponse } = await this.http.get(`/api/v3/communities`, {
-            params: Object.assign(Object.assign({}, params), { isDeleted: inferIsDeleted(params.includeDeleted), keyword: params.displayName, filter: params.membership, options }),
-        });
-        return queryResponse;
-    }
-}
-
-var EnumCommunityActions$3;
-(function (EnumCommunityActions) {
-    EnumCommunityActions["OnCommunityCreated"] = "onCommunityCreated";
-    EnumCommunityActions["OnCommunityDeleted"] = "onCommunityDeleted";
-    EnumCommunityActions["OnCommunityUpdated"] = "onCommunityUpdated";
-})(EnumCommunityActions$3 || (EnumCommunityActions$3 = {}));
-
-class CommunitiesQueryStreamController extends QueryStreamController {
-    constructor(query, cacheKey, notifyChange, preparePayload) {
-        super(query, cacheKey);
-        this.notifyChange = notifyChange;
-        this.preparePayload = preparePayload;
-    }
-    async saveToMainDB(response) {
-        const processedPayload = await this.preparePayload(response);
-        const client = getActiveClient();
-        const cachedAt = client.cache && Date.now();
-        if (client.cache) {
-            ingestInCache(processedPayload, { cachedAt });
-            saveCommunityUsers(response.communities, response.communityUsers);
-        }
-    }
-    appendToQueryStream(response, direction, refresh = false) {
-        var _a, _b;
-        if (refresh) {
-            pushToCache(this.cacheKey, {
-                data: response.communities.map(getResolver('community')),
-            });
-        }
-        else {
-            const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-            const communities = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
-            pushToCache(this.cacheKey, Object.assign(Object.assign({}, collection), { data: [...new Set([...communities, ...response.communities.map(getResolver('community'))])] }));
-        }
-    }
-    reactor(action) {
-        return (community) => {
-            var _a;
-            const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-            if (!collection)
-                return;
-            if (this.query.displayName && action === EnumCommunityActions$3.OnCommunityCreated) {
-                return;
-            }
-            /*
-             * Simply update a collection and let responder decide what to do with data
-             */
-            collection.data = [...new Set([community.communityId, ...collection.data])];
-            pushToCache(this.cacheKey, collection);
-            this.notifyChange({ origin: "event" /* Amity.LiveDataOrigin.EVENT */, loading: false });
-        };
-    }
-    subscribeRTE(createSubscriber) {
-        return createSubscriber.map(subscriber => subscriber.fn(this.reactor(subscriber.action)));
-    }
-}
-
-class CommunityLiveCollectionController extends LiveCollectionController {
-    constructor(query, callback) {
-        const queryStreamId = hash(query);
-        const cacheKey = ['community', 'collection', queryStreamId];
-        const paginationController = new CommunitiesPaginationController(query);
-        super(paginationController, queryStreamId, cacheKey, callback);
-        this.query = query;
-        this.queryStreamController = new CommunitiesQueryStreamController(this.query, this.cacheKey, this.notifyChange.bind(this), prepareCommunityPayload);
-        this.callback = callback.bind(this);
-        this.loadPage({ initial: true });
-    }
-    setup() {
-        var _a;
-        const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-        if (!collection) {
-            pushToCache(this.cacheKey, {
-                data: [],
-                params: {},
-            });
-        }
-    }
-    async persistModel(queryPayload) {
-        await this.queryStreamController.saveToMainDB(queryPayload);
-    }
-    persistQueryStream({ response, direction, refresh, }) {
-        this.queryStreamController.appendToQueryStream(response, direction, refresh);
-    }
-    startSubscription() {
-        return this.queryStreamController.subscribeRTE([
-            { fn: onCommunityCreated, action: EnumCommunityActions$3.OnCommunityCreated },
-            { fn: onCommunityDeleted, action: EnumCommunityActions$3.OnCommunityDeleted },
-            { fn: onCommunityUpdated, action: EnumCommunityActions$3.OnCommunityUpdated },
-            { fn: onCommunityJoined, action: EnumCommunityMemberActions$1.OnCommunityJoined },
-            { fn: onCommunityLeft, action: EnumCommunityMemberActions$1.OnCommunityLeft },
-            { fn: onCommunityUserChanged, action: EnumCommunityMemberActions$1.OnMemberCountChanged },
-            { fn: onLocalCommunityJoined, action: EnumCommunityMemberActions$1.OnCommunityJoined },
-            { fn: onLocalCommunityLeft, action: EnumCommunityMemberActions$1.OnCommunityLeft },
-        ]);
-    }
-    notifyChange({ origin, loading, error }) {
-        var _a, _b;
-        const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-        if (!collection)
-            return;
-        const data = this.applyFilter((_b = collection.data
-            .map(id => pullFromCache(['community', 'get', id]))
-            .filter(isNonNullable)
-            .map(({ data }) => data)) !== null && _b !== void 0 ? _b : []);
-        if (!this.shouldNotify(data) && origin === 'event')
-            return;
-        this.callback({
-            onNextPage: () => this.loadPage({ direction: "next" /* Amity.LiveCollectionPageDirection.NEXT */ }),
-            data,
-            hasNextPage: !!this.paginationController.getNextToken(),
-            loading,
-            error,
-        });
-    }
-    applyFilter(data) {
-        const { userId } = getActiveClient();
-        let communities = data;
-        if (!this.query.includeDeleted) {
-            communities = filterByPropEquality(communities, 'isDeleted', false);
-        }
-        if (this.query.categoryId) {
-            communities = communities.filter(c => { var _a; return (_a = c.categoryIds) === null || _a === void 0 ? void 0 : _a.includes(this.query.categoryId); });
-        }
-        if (this.query.tags) {
-            communities = communities.filter(c => { var _a; return (_a = c.tags) === null || _a === void 0 ? void 0 : _a.some(t => { var _a; return (_a = this.query.tags) === null || _a === void 0 ? void 0 : _a.includes(t); }); });
-        }
-        if (this.query.membership && userId) {
-            communities = filterByCommunityMembership(communities, this.query.membership, userId);
-        }
-        if (!this.query.displayName) {
-            const sortFn = (() => {
-                switch (this.query.sortBy) {
-                    case 'firstCreated':
-                        return sortByFirstCreated;
-                    case 'lastCreated':
-                        return sortByLastCreated;
-                    case 'displayName':
-                        return sortByDisplayName;
-                    default:
-                        return sortByLastCreated;
-                }
-            })();
-            communities = communities.sort(sortFn);
+        return communities;
+    }
+}
+
+/* begin_public_function
+  id: community.query
+*/
+/**
+ * ```js
+ * import { CommunityRepository } from '@amityco/ts-sdk'
+ *
+ * let communities = []
+ * const unsub = CommunityRepository.searchCommunities({
+ *   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 searchCommunities = (params, callback, config) => {
+    const { log, cache } = getActiveClient();
+    if (!cache) {
+        console.log(ENABLE_CACHE_MESSAGE);
+    }
+    const timestamp = Date.now();
+    log(`searchCommunities(tmpid: ${timestamp}) > listen`);
+    const searchCommunitiesLiveCollection = new SearchCommunityLiveCollectionController(params, callback);
+    const disposers = searchCommunitiesLiveCollection.startSubscription();
+    const cacheKey = searchCommunitiesLiveCollection.getCacheKey();
+    disposers.push(() => dropFromCache(cacheKey));
+    return () => {
+        log(`searchCommunities(tmpid: ${timestamp}) > dispose`);
+        disposers.forEach(fn => fn());
+    };
+};
+/* end_public_function */
+
+/**
+ * TODO: handle cache receive cache option, and cache policy
+ * TODO: check if querybyIds is supported
+ */
+class CommunitiesPaginationController extends PaginationController {
+    async getRequest(queryParams, token) {
+        const { limit = COLLECTION_DEFAULT_PAGINATION_LIMIT } = queryParams, params = __rest(queryParams, ["limit"]);
+        const options = token ? { token } : { limit };
+        const { data: queryResponse } = await this.http.get(`/api/v3/communities`, {
+            params: Object.assign(Object.assign({}, params), { isDeleted: inferIsDeleted(params.includeDeleted), filter: params.membership, options }),
+        });
+        return queryResponse;
+    }
+}
+
+class CommunitiesQueryStreamController extends QueryStreamController {
+    constructor(query, cacheKey, notifyChange, preparePayload) {
+        super(query, cacheKey);
+        this.notifyChange = notifyChange;
+        this.preparePayload = preparePayload;
+    }
+    async saveToMainDB(response) {
+        const processedPayload = await this.preparePayload(response);
+        const client = getActiveClient();
+        const cachedAt = client.cache && Date.now();
+        if (client.cache) {
+            ingestInCache(processedPayload, { cachedAt });
+            saveCommunityUsers(response.communities, response.communityUsers);
+        }
+    }
+    appendToQueryStream(response, direction, refresh = false) {
+        var _a, _b;
+        if (refresh) {
+            pushToCache(this.cacheKey, {
+                data: response.communities.map(getResolver('community')),
+            });
+        }
+        else {
+            const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+            const communities = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
+            pushToCache(this.cacheKey, Object.assign(Object.assign({}, collection), { data: [...new Set([...communities, ...response.communities.map(getResolver('community'))])] }));
+        }
+    }
+    reactor(action) {
+        return (community) => {
+            var _a;
+            const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+            if (!collection)
+                return;
+            /*
+             * Simply update a collection and let responder decide what to do with data
+             */
+            collection.data = [...new Set([community.communityId, ...collection.data])];
+            pushToCache(this.cacheKey, collection);
+            this.notifyChange({ origin: "event" /* Amity.LiveDataOrigin.EVENT */, loading: false });
+        };
+    }
+    subscribeRTE(createSubscriber) {
+        return createSubscriber.map(subscriber => subscriber.fn(this.reactor(subscriber.action)));
+    }
+}
+
+var EnumCommunityActions$3;
+(function (EnumCommunityActions) {
+    EnumCommunityActions["OnCommunityCreated"] = "onCommunityCreated";
+    EnumCommunityActions["OnCommunityDeleted"] = "onCommunityDeleted";
+    EnumCommunityActions["OnCommunityUpdated"] = "onCommunityUpdated";
+})(EnumCommunityActions$3 || (EnumCommunityActions$3 = {}));
+
+class CommunityLiveCollectionController extends LiveCollectionController {
+    constructor(query, callback) {
+        const queryStreamId = hash(query);
+        const cacheKey = ['community', 'collection', queryStreamId];
+        const paginationController = new CommunitiesPaginationController(query);
+        super(paginationController, queryStreamId, cacheKey, callback);
+        this.query = query;
+        this.queryStreamController = new CommunitiesQueryStreamController(this.query, this.cacheKey, this.notifyChange.bind(this), prepareCommunityPayload);
+        this.callback = callback.bind(this);
+        this.loadPage({ initial: true });
+    }
+    setup() {
+        var _a;
+        const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+        if (!collection) {
+            pushToCache(this.cacheKey, {
+                data: [],
+                params: {},
+            });
+        }
+    }
+    async persistModel(queryPayload) {
+        await this.queryStreamController.saveToMainDB(queryPayload);
+    }
+    persistQueryStream({ response, direction, refresh, }) {
+        this.queryStreamController.appendToQueryStream(response, direction, refresh);
+    }
+    startSubscription() {
+        return this.queryStreamController.subscribeRTE([
+            { fn: onCommunityCreated, action: EnumCommunityActions$3.OnCommunityCreated },
+            { fn: onCommunityDeleted, action: EnumCommunityActions$3.OnCommunityDeleted },
+            { fn: onCommunityUpdated, action: EnumCommunityActions$3.OnCommunityUpdated },
+            { fn: onCommunityJoined, action: EnumCommunityMemberActions$1.OnCommunityJoined },
+            { fn: onCommunityLeft, action: EnumCommunityMemberActions$1.OnCommunityLeft },
+            { fn: onCommunityUserChanged, action: EnumCommunityMemberActions$1.OnMemberCountChanged },
+            { fn: onLocalCommunityJoined, action: EnumCommunityMemberActions$1.OnCommunityJoined },
+            { fn: onLocalCommunityLeft, action: EnumCommunityMemberActions$1.OnCommunityLeft },
+        ]);
+    }
+    notifyChange({ origin, loading, error }) {
+        var _a, _b;
+        const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+        if (!collection)
+            return;
+        const data = this.applyFilter((_b = collection.data
+            .map(id => pullFromCache(['community', 'get', id]))
+            .filter(isNonNullable)
+            .map(({ data }) => data)) !== null && _b !== void 0 ? _b : []);
+        if (!this.shouldNotify(data) && origin === 'event')
+            return;
+        this.callback({
+            onNextPage: () => this.loadPage({ direction: "next" /* Amity.LiveCollectionPageDirection.NEXT */ }),
+            data,
+            hasNextPage: !!this.paginationController.getNextToken(),
+            loading,
+            error,
+        });
+    }
+    applyFilter(data) {
+        const { userId } = getActiveClient();
+        let communities = data;
+        if (!this.query.includeDeleted) {
+            communities = filterByPropEquality(communities, 'isDeleted', false);
+        }
+        if (this.query.categoryId) {
+            communities = communities.filter(c => { var _a; return (_a = c.categoryIds) === null || _a === void 0 ? void 0 : _a.includes(this.query.categoryId); });
+        }
+        if (this.query.tags) {
+            communities = communities.filter(c => { var _a; return (_a = c.tags) === null || _a === void 0 ? void 0 : _a.some(t => { var _a; return (_a = this.query.tags) === null || _a === void 0 ? void 0 : _a.includes(t); }); });
+        }
+        if (this.query.membership && userId) {
+            communities = filterByCommunityMembership(communities, this.query.membership, userId);
         }
+        const sortFn = (() => {
+            switch (this.query.sortBy) {
+                case 'firstCreated':
+                    return sortByFirstCreated;
+                case 'lastCreated':
+                    return sortByLastCreated;
+                default:
+                    return sortByLastCreated;
+            }
+        })();
+        communities = communities.sort(sortFn);
         return communities;
     }
 }
@@ -37477,11 +36414,9 @@ var index$9 = /*#__PURE__*/Object.freeze({
   deleteCommunity: deleteCommunity,
   joinCommunity: joinCommunity,
   leaveCommunity: leaveCommunity,
-  getTopTrendingCommunities: getTopTrendingCommunities,
   onCommunityCreated: onCommunityCreated,
   onCommunityUpdated: onCommunityUpdated,
   onCommunityDeleted: onCommunityDeleted,
-  observeCommunity: observeCommunity,
   searchCommunities: searchCommunities,
   getCommunities: getCommunities,
   getCommunity: getCommunity,
@@ -37731,21 +36666,10 @@ var index$8 = /*#__PURE__*/Object.freeze({
 const queryGlobalFeed = async (query) => {
     const client = getActiveClient();
     client.log('feed/queryGlobalFeed', query);
-    const _a = query !== null && query !== void 0 ? query : {}, { useCustomRanking, page, queryToken } = _a, params = __rest(_a, ["useCustomRanking", "page", "queryToken"]);
-    /*
-     * TODO: Remove useCustomRanking key from query
-     */
-    if (useCustomRanking)
-        console.warn('The param "useCustomRanking" has been deprecated. To get custom ranking feed use FeedRepository.getCustomRankingGlobalFeed instead');
-    if (page)
-        console.warn('The param "page" has been deprecated. Please use "queryToken" instead.');
+    const _a = query !== null && query !== void 0 ? query : {}, { queryToken } = _a, params = __rest(_a, ["queryToken"]);
     const options = (() => {
         if (queryToken)
             return { token: queryToken };
-        if (page)
-            return {
-                token: toToken(page, 'skiplimit'),
-            };
         return undefined;
     })();
     const { data: queryPayload } = await client.http.get(`/api/v4/me/global-feeds`, {
@@ -37758,20 +36682,12 @@ const queryGlobalFeed = async (query) => {
     const cachedAt = client.cache && Date.now();
     if (client.cache) {
         ingestInCache(Object.assign(Object.assign({}, data), { communitis: processedCommunity }));
-        const cacheKey = [
-            'globalFeed',
-            'query',
-            Object.assign(Object.assign({}, params), { options: Object.assign({}, page) }),
-        ];
+        const cacheKey = ['globalFeed', 'query', Object.assign(Object.assign({}, params), { options })];
         pushToCache(cacheKey, { posts: posts.map(getResolver('post')), paging });
     }
-    const nextPage = toPage(paging.next);
-    const prevPage = toPage(paging.previous);
     return {
         data: posts.map(LinkedObject.post),
         cachedAt,
-        prevPage,
-        nextPage,
         paging,
     };
 };
@@ -37796,12 +36712,8 @@ queryGlobalFeed.locally = (query) => {
     client.log('post/queryGlobalFeed.locally', query);
     if (!client.cache)
         return;
-    const _c = query !== null && query !== void 0 ? query : {}, { page } = _c, params = __rest(_c, ["page"]);
-    const queryKey = [
-        'globalFeed',
-        'query',
-        Object.assign(Object.assign({}, params), { options: Object.assign({}, page) }),
-    ];
+    const params = __rest(query !== null && query !== void 0 ? query : {}, []);
+    const queryKey = ['globalFeed', 'query', Object.assign({}, params)];
     const { data, cachedAt } = (_a = pullFromCache(queryKey)) !== null && _a !== void 0 ? _a : {};
     if (!(data === null || data === void 0 ? void 0 : data.posts.length))
         return;
@@ -37811,14 +36723,10 @@ queryGlobalFeed.locally = (query) => {
         .map(({ data }) => data)
         .map(LinkedObject.post);
     const { paging } = data;
-    const prevPage = toPage(data === null || data === void 0 ? void 0 : data.paging.previous);
-    const nextPage = toPage(data === null || data === void 0 ? void 0 : data.paging.next);
     return posts.length === ((_b = data === null || data === void 0 ? void 0 : data.posts) === null || _b === void 0 ? void 0 : _b.length)
         ? {
             data: posts,
             cachedAt,
-            prevPage,
-            nextPage,
             paging,
         }
         : undefined;
@@ -37844,14 +36752,10 @@ queryGlobalFeed.locally = (query) => {
 const getCustomRankingGlobalFeed = async (query) => {
     const client = getActiveClient();
     client.log('feed/getCustomRankingGlobalFeed', query);
-    const _a = query !== null && query !== void 0 ? query : {}, { page, queryToken, limit } = _a, params = __rest(_a, ["page", "queryToken", "limit"]);
+    const _a = query !== null && query !== void 0 ? query : {}, { queryToken, limit } = _a, params = __rest(_a, ["queryToken", "limit"]);
     const options = (() => {
         if (queryToken)
             return { token: queryToken };
-        if (page)
-            return {
-                token: toToken(page, 'skiplimit'),
-            };
         return undefined;
     })();
     const { data: queryPayload } = await client.http.get(`/api/v5/me/global-feeds`, {
@@ -37863,16 +36767,10 @@ const getCustomRankingGlobalFeed = async (query) => {
     const cachedAt = client.cache && Date.now();
     if (client.cache) {
         ingestInCache(data);
-        const cacheKey = [
-            'customGlobalFeed',
-            'query',
-            Object.assign(Object.assign({}, params), { options: Object.assign({}, page) }),
-        ];
+        const cacheKey = ['customGlobalFeed', 'query', Object.assign(Object.assign({}, params), { options })];
         pushToCache(cacheKey, { posts: posts.map(getResolver('post')), paging });
     }
-    const nextPage = toPage(paging.next);
-    const prevPage = toPage(paging.previous);
-    return { data: posts.map(LinkedObject.post), cachedAt, prevPage, nextPage, paging };
+    return { data: posts.map(LinkedObject.post), cachedAt, paging };
 };
 /* end_public_function */
 /**
@@ -37895,12 +36793,8 @@ getCustomRankingGlobalFeed.locally = (query) => {
     client.log('post/getCustomRankingGlobalFeed.locally', query);
     if (!client.cache)
         return;
-    const _c = query !== null && query !== void 0 ? query : {}, { page } = _c, params = __rest(_c, ["page"]);
-    const queryKey = [
-        'customGlobalFeed',
-        'query',
-        Object.assign(Object.assign({}, params), { options: Object.assign({}, page) }),
-    ];
+    const params = __rest(query !== null && query !== void 0 ? query : {}, []);
+    const queryKey = ['customGlobalFeed', 'query', Object.assign({}, params)];
     const { data, cachedAt } = (_a = pullFromCache(queryKey)) !== null && _a !== void 0 ? _a : {};
     if (!(data === null || data === void 0 ? void 0 : data.posts.length))
         return;
@@ -37908,11 +36802,9 @@ getCustomRankingGlobalFeed.locally = (query) => {
         .map(postId => pullFromCache(['post', 'get', postId]))
         .filter(Boolean)
         .map(({ data }) => data);
-    const prevPage = toPage(data === null || data === void 0 ? void 0 : data.paging.previous);
-    const nextPage = toPage(data === null || data === void 0 ? void 0 : data.paging.next);
     const { paging } = data;
     return posts.length === ((_b = data === null || data === void 0 ? void 0 : data.posts) === null || _b === void 0 ? void 0 : _b.length)
-        ? { data: posts.map(LinkedObject.post), cachedAt, prevPage, nextPage, paging }
+        ? { data: posts.map(LinkedObject.post), cachedAt, paging }
         : undefined;
 };
 
@@ -38043,44 +36935,6 @@ const createPost = async (bundle) => {
 };
 /* end_public_function */
 
-/* begin_public_function
-  id: post.edit
-*/
-/**
- * ```js
- * import { updatePost } from '@amityco/ts-sdk'
- * const updated = await updatePost(postId, {
- *   data: { text: 'hello world' }
- * })
- * ```
- *
- * Updates an {@link Amity.Post}
- *
- * @param postId The ID of the {@link Amity.Post} to edit
- * @param patch The patch data to apply
- * @returns the updated {@link Amity.Post} object
- *
- * @category Post API
- * @async
- */
-const updatePost = async (postId, patch) => {
-    const client = getActiveClient();
-    client.log('user/updatePost', patch);
-    console.warn('Deprecation: updatePost has been renamed to editPost. Update post API will be deprecated soon.');
-    const { data: payload } = await client.http.put(`/api/v4/posts/${encodeURIComponent(postId)}`, patch);
-    const data = prepareMembershipPayload(payload, 'communityUsers');
-    const cachedAt = client.cache && Date.now();
-    if (client.cache)
-        ingestInCache(data, { cachedAt });
-    fireEvent('local.post.updated', payload);
-    const { posts } = data;
-    return {
-        data: LinkedObject.post(posts.find(post => post.postId === postId)),
-        cachedAt,
-    };
-};
-/* end_public_function */
-
 /* begin_public_function
   id: post.edit, post.edit.custom_post
 */
@@ -38398,91 +37252,6 @@ const isPostFlaggedByMe = async (postId) => {
 };
 /* end_public_function */
 
-/**
- * ```js
- * import { PostRepository } from '@amityco/ts-sdk'
- *
- * let posts = []
- * const unsub = PostRepository.observePosts({
- *   targetType: Amity.PostTargetType,
- *   targetId: Amity.InternalPost['targetId'],
- * }, post => merge(posts, post))
- * ```
- *
- * Observe all mutations on a list of {@link Amity.Post} for a given target object
- *
- * @param params
- * @param callback the function to call when new data are available
- * @returns An {@link Amity.Unsubscriber} function to run when willing to stop observing the messages
- *
- * @category Post Observer
- */
-const observePosts = (params, callback) => {
-    const { log } = getActiveClient();
-    const timestamp = Date.now();
-    log(`observePosts(tmpid: ${timestamp}) > listen`);
-    const disposers = [];
-    const router = (post, action) => {
-        var _a, _b;
-        if (params.targetId !== post.targetId || params.targetType !== post.targetType)
-            return;
-        if (callback instanceof Function)
-            return callback(LinkedObject.post(post));
-        (_a = callback.onEvent) === null || _a === void 0 ? void 0 : _a.call(callback, action, LinkedObject.post(post));
-        (_b = callback[action]) === null || _b === void 0 ? void 0 : _b.call(callback, LinkedObject.post(post));
-    };
-    disposers.push(onPostCreated(post => router(post, 'onCreate')), onPostUpdated(post => router(post, 'onUpdate')), onPostDeleted(post => router(post, 'onDelete')), onPostApproved(post => router(post, 'onApproved')), onPostDeclined(post => router(post, 'onDeclined')), onPostFlagged(post => router(post, 'onFlagged')), onPostUnflagged(post => router(post, 'onUnflagged')), onPostReactionAdded(post => router(post, 'onReactionAdded')), onPostReactionRemoved(post => router(post, 'onReactionRemoved')));
-    return () => {
-        log(`observePosts(tmpid: ${timestamp}) > dispose`);
-        disposers.forEach(fn => fn());
-    };
-};
-
-/**
- * ```js
- * import { observePost } from '@amityco/ts-sdk'
- *
- * let post = {}
- * const dispose = observePost(postId, updated => post = updated)
- * ```
- *
- * Observe all mutations on a given {@link Amity.Post}
- *
- * @param postId the ID of the post 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 post
- *
- * @category Post Observer
- */
-const observePost = (postId, callback, policy = 'cache_then_server') => {
-    const { log } = getActiveClient();
-    const timestamp = Date.now();
-    log(`observePost(tmpid: ${timestamp}) > listen`);
-    // wrapper function to make sure
-    const router = (result, action) => {
-        var _a, _b;
-        if (callback instanceof Function)
-            return callback(result);
-        if (action !== 'onFetch')
-            (_a = callback.onEvent) === null || _a === void 0 ? void 0 : _a.call(callback, action, result);
-        (_b = callback[action]) === null || _b === void 0 ? void 0 : _b.call(callback, result);
-    };
-    const realtimeRouter = (result, action) => {
-        var _a;
-        if (((_a = result.data) === null || _a === void 0 ? void 0 : _a.postId) !== postId)
-            return;
-        router(Object.assign(Object.assign({}, result), { data: result.data && LinkedObject.post(result.data) }), action);
-    };
-    const disposers = [];
-    disposers.push(onPostUpdated(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onUpdate')), onPostDeleted(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onDelete')), onPostApproved(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onApproved')), onPostDeclined(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onDeclined')), onPostFlagged(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onFlagged')), onPostUnflagged(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onUnflagged')), onPostReactionAdded(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onReactionAdded')), onPostReactionRemoved(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onReactionRemoved')));
-    runQuery(createQuery(getPost$2, postId), result => (result.data || result.error) &&
-        router(Object.assign(Object.assign({}, result), { data: result.data && LinkedObject.post(result.data) }), 'onFetch'), queryOptions(policy));
-    return () => {
-        log(`observePosts(tmpid: ${timestamp}) > dispose`);
-        disposers.forEach(fn => fn());
-    };
-};
-
 /* begin_public_function
   id: comment.get_by_ids
 */
@@ -38958,43 +37727,6 @@ const isCommentFlaggedByMe = async (commentId) => {
 };
 /* end_public_function */
 
-/**
- * ```js
- * import { observeComments } from '@amityco/ts-sdk'
- *
- * let comments = []
- * const unsub = observeComments(postId, comment => merge(comments, comment))
- * ```
- *
- * Observe all mutations on a list of {@link Amity.InternalComment} for a given {@link Amity.Post} object
- *
- * @param postId the ID of the post where to observe the comments
- * @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 comments
- *
- * @category InternalComment Observer
- */
-const observeComments = (postId, callback) => {
-    const { log } = getActiveClient();
-    const timestamp = Date.now();
-    log(`observeComments(tmpid: ${timestamp}) > listen`);
-    const disposers = [];
-    const router = (comment, action) => {
-        var _a, _b;
-        if (comment.referenceId !== postId)
-            return;
-        if (callback instanceof Function)
-            return callback(comment);
-        (_a = callback.onEvent) === null || _a === void 0 ? void 0 : _a.call(callback, action, comment);
-        (_b = callback[action]) === null || _b === void 0 ? void 0 : _b.call(callback, comment);
-    };
-    disposers.push(onCommentCreated(comment => router(comment, 'onCreate')), onCommentUpdated(comment => router(comment, 'onUpdate')), onCommentDeleted(comment => router(comment, 'onDelete')), onCommentFlagged(comment => router(comment, 'onFlagged')), onCommentUnflagged(comment => router(comment, 'onUnflagged')), onCommentReactionAdded(comment => router(comment, 'onReactionAdded')), onCommentReactionRemoved(comment => router(comment, 'onReactionRemoved')));
-    return () => {
-        log(`observeComments(tmpid: ${timestamp}) > dispose`);
-        disposers.forEach(fn => fn());
-    };
-};
-
 const getComment$1 = async (commentId) => {
     const client = getActiveClient();
     client.log('comment/getComment', commentId);
@@ -39034,50 +37766,6 @@ getComment$1.locally = (commentId) => {
     };
 };
 
-/**
- * ```js
- * import { observeComment } from '@amityco/ts-sdk'
- *
- * let comment = {}
- * const dispose = observeComment(commentId, ({ data }) => comment = data)
- * ```
- *
- * Observe all mutation on a given {@link Amity.InternalComment}
- *
- * @param commentId the ID of the comment 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 comment
- *
- * @category InternalComment Observer
- */
-const observeComment = (commentId, callback, policy = 'cache_then_server') => {
-    const { log } = getActiveClient();
-    const timestamp = Date.now();
-    log(`observeComment(tmpid: ${timestamp}) > listen`);
-    // wrapper function to make sure
-    const router = (result, action) => {
-        var _a, _b;
-        if (callback instanceof Function)
-            return callback(result);
-        if (action !== 'onFetch')
-            (_a = callback.onEvent) === null || _a === void 0 ? void 0 : _a.call(callback, action, result);
-        (_b = callback[action]) === null || _b === void 0 ? void 0 : _b.call(callback, result);
-    };
-    const realtimeRouter = (result, action) => {
-        var _a;
-        if (((_a = result.data) === null || _a === void 0 ? void 0 : _a.commentId) !== commentId)
-            return;
-        router(result, action);
-    };
-    const disposers = [];
-    disposers.push(onCommentUpdated(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onUpdate')), onCommentDeleted(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onDelete')), onCommentFlagged(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onFlagged')), onCommentUnflagged(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onUnflagged')), onCommentReactionAdded(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onReactionAdded')), onCommentReactionRemoved(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onReactionRemoved')));
-    runQuery(createQuery(getComment$1, commentId), result => (result.data || result.error) && router(result, 'onFetch'), queryOptions(policy));
-    return () => {
-        log(`observeComment(tmpid: ${timestamp}) > dispose`);
-        disposers.forEach(fn => fn());
-    };
-};
-
 /**
  * ```js
  * import { onCommentDeleteLocal } from '@amityco/ts-sdk'
@@ -39453,8 +38141,6 @@ var index$6 = /*#__PURE__*/Object.freeze({
   onCommentUnflagged: onCommentUnflagged,
   onCommentReactionAdded: onCommentReactionAdded,
   onCommentReactionRemoved: onCommentReactionRemoved,
-  observeComments: observeComments,
-  observeComment: observeComment,
   getComment: getComment,
   getComments: getComments
 });
@@ -40448,7 +39134,6 @@ var index$5 = /*#__PURE__*/Object.freeze({
   __proto__: null,
   getPostByIds: getPostByIds,
   createPost: createPost,
-  updatePost: updatePost,
   editPost: editPost,
   deletePost: deletePost,
   softDeletePost: softDeletePost,
@@ -40467,8 +39152,6 @@ var index$5 = /*#__PURE__*/Object.freeze({
   onPostUnflagged: onPostUnflagged,
   onPostReactionAdded: onPostReactionAdded,
   onPostReactionRemoved: onPostReactionRemoved,
-  observePosts: observePosts,
-  observePost: observePost,
   getPost: getPost$1,
   getPosts: getPosts,
   getPinnedPosts: getPinnedPosts,
@@ -40661,47 +39344,6 @@ const disposeStream = async (streamId) => {
 };
 /* end_public_function */
 
-/* begin_public_function
-  id: stream.query
-*/
-/**
- * @deprecated This API renamed to `getStreams`.
- * Please use getStreams() instead.
- * ```js
- * import { getStreams } from '@amityco/ts-sdk'
- * const streams = await getStreams()
- * ```
- *
- * Queries a paginable list of {@link Amity.InternalStream} objects
- *
- * @param query The query parameters
- * @returns A page of {@link Amity.InternalStream} objects
- *
- * @category Stream API
- * @async
- */
-const queryStreams = async (query) => {
-    const client = getActiveClient();
-    client.log('stream/queryStreams', query);
-    const _a = query !== null && query !== void 0 ? query : {}, { page } = _a, params = __rest(_a, ["page"]);
-    const { data } = await client.http.get(`/api/v3/video-streaming`, {
-        params: Object.assign(Object.assign({}, params), { options: {
-                token: toToken(page, 'skiplimit'),
-            } }),
-    });
-    // API-FIX: backend to response Amity.Response: const { paging, videoStreamings } = unwrapPayload(data)
-    // API-FIX: seems returned data has a results identifier on top of data, like no other apis, and this is beautiful
-    const { paging, results: payload } = data;
-    const { videoStreamings } = payload;
-    const cachedAt = client.cache && Date.now();
-    if (client.cache)
-        ingestInCache(payload, { cachedAt });
-    const nextPage = toPage(paging.next);
-    const prevPage = toPage(paging.previous);
-    return { data: videoStreamings, cachedAt, prevPage, nextPage };
-};
-/* end_public_function */
-
 /**
  * ```js
  * import { onStreamStarted } from '@amityco/ts-sdk'
@@ -40723,7 +39365,7 @@ const onStreamStarted = (callback) => {
         ingestInCache(payload);
         callback(payload.videoStreamings[0]);
     };
-    return createEventSubscriber(client, 'stream/onStreamStarted', 'v3.video-streaming.didStart', filter);
+    return createEventSubscriber(client, 'stream/onStreamStarted', 'video-streaming.didStart', filter);
 };
 
 /**
@@ -40747,7 +39389,7 @@ const onStreamStopped = (callback) => {
         ingestInCache(payload);
         callback(payload.videoStreamings[0]);
     };
-    return createEventSubscriber(client, 'stream/onStreamStropped', 'v3.video-streaming.didStop', filter);
+    return createEventSubscriber(client, 'stream/onStreamStropped', 'video-streaming.didStop', filter);
 };
 
 /**
@@ -40771,7 +39413,7 @@ const onStreamRecorded = (callback) => {
         ingestInCache(payload);
         callback(payload.videoStreamings[0]);
     };
-    return createEventSubscriber(client, 'stream/onStreamRecorded', 'v3.video-streaming.didRecord', filter);
+    return createEventSubscriber(client, 'stream/onStreamRecorded', 'video-streaming.didRecord', filter);
 };
 
 /**
@@ -40795,7 +39437,7 @@ const onStreamFlagged = (callback) => {
         ingestInCache(payload);
         callback(payload.videoStreamings[0]);
     };
-    return createEventSubscriber(client, 'stream/onStreamFlagged', 'v3.video-streaming.didFlag', filter);
+    return createEventSubscriber(client, 'stream/onStreamFlagged', 'video-streaming.didFlag', filter);
 };
 
 /**
@@ -40819,7 +39461,7 @@ const onStreamTerminated = (callback) => {
         ingestInCache(payload);
         callback(payload.videoStreamings[0]);
     };
-    return createEventSubscriber(client, 'stream/onStreamTerminated', 'v3.video-streaming.didTerminate', filter);
+    return createEventSubscriber(client, 'stream/onStreamTerminated', 'video-streaming.didTerminate', filter);
 };
 
 /* eslint-disable no-use-before-define */
@@ -41028,8 +39670,6 @@ var index$4 = /*#__PURE__*/Object.freeze({
   updateStream: updateStream,
   deleteStream: deleteStream,
   disposeStream: disposeStream,
-  queryStreams: queryStreams,
-  getStream: getStream,
   onStreamStarted: onStreamStarted,
   onStreamStopped: onStreamStopped,
   onStreamRecorded: onStreamRecorded,
@@ -41284,50 +39924,6 @@ const onPollDeleted = (callback) => {
     return createEventSubscriber(client, 'poll/onPollDeleted', 'poll.deleted', filter);
 };
 
-/**
- * ```js
- * import { observePoll } from '@amityco/ts-sdk'
- *
- * let poll = {}
- * const dispose = observePoll(pollId, updated => poll = updated)
- * ```
- *
- * 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 Observer
- */
-const observePoll = (pollId, callback, policy = 'cache_then_server') => {
-    const { log } = getActiveClient();
-    const timestamp = Date.now();
-    log(`observePoll(tmpid: ${timestamp}) > listen`);
-    // wrapper function to make sure
-    const router = (result, action) => {
-        var _a, _b;
-        if (callback instanceof Function)
-            return callback(result);
-        if (action !== 'onFetch')
-            (_a = callback.onEvent) === null || _a === void 0 ? void 0 : _a.call(callback, action, result);
-        (_b = callback[action]) === null || _b === void 0 ? void 0 : _b.call(callback, result);
-    };
-    const realtimeRouter = (result, action) => {
-        var _a;
-        if (((_a = result.data) === null || _a === void 0 ? void 0 : _a.pollId) !== pollId)
-            return;
-        router(result, action);
-    };
-    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$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
 */
@@ -41363,7 +39959,6 @@ var index$3 = /*#__PURE__*/Object.freeze({
   votePoll: votePoll,
   onPollUpdated: onPollUpdated,
   onPollDeleted: onPollDeleted,
-  observePoll: observePoll,
   getPoll: getPoll
 });
 
@@ -41821,7 +40416,7 @@ const createOptimisticTarget = async ({ targetId, targetType, }) => {
             optimisticTarget = Object.assign(Object.assign({}, optimisticTarget), { targetPublicId: community.data.communityId, targetUpdatedAt: (_a = community.data.updatedAt) !== null && _a !== void 0 ? _a : new Date().toISOString() });
         }
         if (targetType === 'user') {
-            const user = await getUser$2(targetId);
+            const user = await getUser$1(targetId);
             optimisticTarget = Object.assign(Object.assign({}, optimisticTarget), { targetPublicId: user.data.userPublicId, targetUpdatedAt: (_b = user.data.updatedAt) !== null && _b !== void 0 ? _b : new Date().toISOString() });
         }
         pushToCache(["storyTarget" /* STORY_KEY_CACHE.STORY_TARGET */, 'get', targetId], optimisticTarget);
@@ -42964,4 +41559,4 @@ const createUserToken = async (apiKey, apiRegion, params) => {
     return { accessToken: data.accessToken };
 };
 
-export { API_REGIONS, index as AdRepository, index$8 as CategoryRepository, index$c as ChannelRepository, index$l as Client, index$6 as CommentRepository, CommunityPostSettingMaps, CommunityPostSettings, index$9 as CommunityRepository, ContentFeedType, DefaultCommunityPostSetting, index$7 as FeedRepository, FileAccessTypeEnum, index$i as FileRepository, FileType, index$2 as LiveStreamPlayer, MessageContentType, index$g as MessageRepository, index$3 as PollRepository, PostContentType, index$5 as PostRepository, index$h as ReactionRepository, index$1 as StoryRepository, index$4 as StreamRepository, index$f as SubChannelRepository, SubscriptionLevels, index$j as UserRepository, VERSION, VideoResolution, VideoSize, VideoTranscodingStatus, backupCache, createQuery, createReport, createUserToken, deleteReport, disableCache, dropFromCache, enableCache, filterByChannelMembership, filterByCommunityMembership, filterByFeedType, filterByPostDataTypes, filterByPropEquality, filterByPropInclusion, filterByPropIntersection, filterBySearchTerm, filterByStringComparePartially, getChannelTopic, getCommentTopic, getCommunityStoriesTopic, getCommunityTopic, getMarkedMessageTopic, getMarkerUserFeedTopic, getMessageTopic, getMyFollowersTopic, getMyFollowingsTopic, getNetworkTopic, getPostTopic, getRole, getSmartFeedChannelTopic, getSmartFeedMessageTopic, getSmartFeedSubChannelTopic, getStoryTopic, getSubChannelTopic, getUserTopic, isAfterBefore, isAfterBeforeRaw, isCachable, isFetcher, isFresh, isLocal, isMutator, isOffline, isPaged, isReportedByMe, isSkip, mergeInCache, onChannelMarkerFetched, onFeedMarkerFetched, onFeedMarkerUpdated, onMessageMarked, onMessageMarkerFetched, onSubChannelMarkerFetched, onSubChannelMarkerUpdated, onUserMarkerFetched, onUserMarkerFetchedLegacy, pullFromCache, pushToCache, queryCache, queryOptions, queryRoles, restoreCache, runQuery, sortByChannelSegment, sortByDisplayName, sortByFirstCreated, sortByFirstUpdated, sortByLastActivity, sortByLastCreated, sortByLastUpdated, sortByLocalSortingDate, sortByName, sortBySegmentNumber, subscribeTopic, toPage, toPageRaw, toToken, upsertInCache, wipeCache };
+export { API_REGIONS, index as AdRepository, index$8 as CategoryRepository, index$c as ChannelRepository, index$l as Client, index$6 as CommentRepository, CommunityPostSettingMaps, CommunityPostSettings, index$9 as CommunityRepository, ContentFeedType, DefaultCommunityPostSetting, index$7 as FeedRepository, FileAccessTypeEnum, index$i as FileRepository, FileType, index$2 as LiveStreamPlayer, MessageContentType, index$g as MessageRepository, index$3 as PollRepository, PostContentType, index$5 as PostRepository, index$h as ReactionRepository, index$1 as StoryRepository, index$4 as StreamRepository, index$f as SubChannelRepository, SubscriptionLevels, index$j as UserRepository, VERSION, VideoResolution, VideoSize, VideoTranscodingStatus, backupCache, createQuery, createReport, createUserToken, deleteReport, disableCache, dropFromCache, enableCache, filterByChannelMembership, filterByCommunityMembership, filterByFeedType, filterByPostDataTypes, filterByPropEquality, filterByPropInclusion, filterByPropIntersection, filterBySearchTerm, filterByStringComparePartially, getChannelTopic, getCommentTopic, getCommunityStoriesTopic, getCommunityTopic, getLiveStreamTopic, getMarkedMessageTopic, getMarkerUserFeedTopic, getMessageTopic, getMyFollowersTopic, getMyFollowingsTopic, getNetworkTopic, getPostTopic, getRole, getSmartFeedChannelTopic, getSmartFeedMessageTopic, getSmartFeedSubChannelTopic, getStoryTopic, getSubChannelTopic, getUserTopic, isAfterBefore, isAfterBeforeRaw, isCachable, isFetcher, isFresh, isLocal, isMutator, isOffline, isPaged, isReportedByMe, isSkip, mergeInCache, onChannelMarkerFetched, onFeedMarkerFetched, onFeedMarkerUpdated, onMessageMarked, onMessageMarkerFetched, onSubChannelMarkerFetched, onSubChannelMarkerUpdated, onUserMarkerFetched, onUserMarkerFetchedLegacy, pullFromCache, pushToCache, queryCache, queryOptions, queryRoles, restoreCache, runQuery, sortByChannelSegment, sortByDisplayName, sortByFirstCreated, sortByFirstUpdated, sortByLastActivity, sortByLastCreated, sortByLastUpdated, sortByLocalSortingDate, sortByName, sortBySegmentNumber, subscribeTopic, toPage, toPageRaw, toToken, upsertInCache, wipeCache };