@amityco/ts-sdk 6.12.2-d8fe0d5.0 → 6.12.2-e1d8270.0

package/dist/index.cjs.js

@@ -10,6 +10,7 @@ var axios = require('axios');
 var HttpAgent = require('agentkeepalive');
 var io = require('socket.io-client');
 var uuid$1 = require('react-native-uuid');
+var hash = require('object-hash');
 var Hls = require('hls.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -21,6 +22,7 @@ var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios);
 var HttpAgent__default = /*#__PURE__*/_interopDefaultLegacy(HttpAgent);
 var io__default = /*#__PURE__*/_interopDefaultLegacy(io);
 var uuid__default = /*#__PURE__*/_interopDefaultLegacy(uuid$1);
+var hash__default = /*#__PURE__*/_interopDefaultLegacy(hash);
 var Hls__default = /*#__PURE__*/_interopDefaultLegacy(Hls);
 
 const CommunityPostSettings = Object.freeze({
@@ -5570,6 +5572,7 @@ function convertParams(_a) {
 }
 function convertQueryParams$1(_a) {
     var { page, sortBy, subChannelId, tags, includeDeleted } = _a, rest = __rest(_a, ["page", "sortBy", "subChannelId", "tags", "includeDeleted"]);
+    console.log('convertQueryParams', page);
     const out = Object.assign(Object.assign({}, rest), { messageFeedId: subChannelId, isDeleted: inferIsDeleted(includeDeleted), options: { token: toToken(page || { limit: 10 }, 'afterbeforeraw') } });
     if (sortBy !== undefined) {
         out.options.sortBy = sortBy;
@@ -5577,6 +5580,7 @@ function convertQueryParams$1(_a) {
     if (tags) {
         out.includeTags = tags;
     }
+    console.log('out', out);
     return out;
 }
 
@@ -7312,6 +7316,18 @@ function isEqual(x, y) {
     if (Array.isArray(x) && x.length !== y.length) {
         return false;
     }
+    // check each element of the array for equality
+    if (Array.isArray(x) && Array.isArray(y)) {
+        if (x.length !== y.length)
+            return false;
+        // eslint-disable-next-line no-plusplus
+        for (let i = 0; i < x.length; i++) {
+            if (!isEqual(x[i], y[i]))
+                return false;
+        }
+        // if all elements are equal, the arrays are equal
+        return true;
+    }
     // if they are dates, they must had equal valueOf
     if (x instanceof Date) {
         return false;
@@ -8885,7 +8901,7 @@ queryChannelMembers.locally = (query) => {
  * Exported for testing
  * @hidden
  */
-const applyFilter$3 = (data, params) => {
+const applyFilter$2 = (data, params) => {
     let channelMembers = filterByPropIntersection(data, 'roles', params.roles);
     if (params.memberships) {
         /*
@@ -8960,7 +8976,7 @@ const getMembers$1 = (params, callback, config) => {
             /*
              * Only apply filter to RTE Model
              */
-            data: isEventModel ? applyFilter$3(channelMembers, params) : channelMembers,
+            data: isEventModel ? applyFilter$2(channelMembers, params) : channelMembers,
             hasNextPage: !!((_b = data.params) === null || _b === void 0 ? void 0 : _b.page),
             loading: data.loading,
             error: data.error,
@@ -9050,7 +9066,7 @@ var index$j = /*#__PURE__*/Object.freeze({
   __proto__: null,
   addMembers: addMembers$1,
   removeMembers: removeMembers$1,
-  applyFilter: applyFilter$3,
+  applyFilter: applyFilter$2,
   getMembers: getMembers$1,
   searchMembers: searchMembers
 });
@@ -11351,7 +11367,7 @@ queryUsers.locally = (query = {}) => {
  * Exported for testing
  * @hidden
  */
-const applyFilter$2 = (data, params) => {
+const applyFilter$1 = (data, params) => {
     let users = filterByStringComparePartially(data, 'displayName', params.displayName);
     switch (params.sortBy) {
         case 'firstCreated':
@@ -11412,7 +11428,7 @@ const getUsers = (params, callback, config) => {
             /*
              * Only apply filter to RTE Model
              */
-            data: isEventModel ? applyFilter$2(users, params) : users,
+            data: isEventModel ? applyFilter$1(users, params) : users,
             hasNextPage: !!((_b = data.params) === null || _b === void 0 ? void 0 : _b.page),
             loading: data.loading,
             error: data.error,
@@ -14228,103 +14244,341 @@ const getMessage = (messageId, callback) => {
 };
 /* end_public_function */
 
+/* eslint-disable no-use-before-define */
+class PaginationController {
+    constructor(queryParams, cacheKey) {
+        const { log, cache, userId, http } = getActiveClient();
+        this.queryParams = queryParams;
+        this.cacheKey = cacheKey;
+        this.http = http;
+    }
+    loadFirstPage() {
+        return this.onFetch('first');
+    }
+    loadNextPage() {
+        return this.onFetch('next');
+    }
+    loadPreviousPage() {
+        return this.onFetch('prev');
+    }
+    async onFetch(direction = '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;
+    }
+}
+
+/* eslint-disable no-use-before-define */
 /**
- * ```js
- * import { queryMessages } from '@amityco/ts-sdk'
- * const messages = await queryMessages({ channelId })
- * ```
- *
- * Queries a paginable list of {@link Amity.Message} objects
- *
- * @param query The query parameters
- * @returns A page of {@link Amity.Message} objects
- *
- * @category Message API
- * @async
+ * TODO: handle cache receive cache option, and cache policy
+ * TODO: check if querybyIds is supported
  */
-const queryMessages = async (query) => {
-    const client = getActiveClient();
-    client.log('message/queryMessages', query);
-    const _a = convertQueryParams$1(query), { pageToken } = _a, params = __rest(_a, ["pageToken"]);
-    // API-FIX: parameters should be querystring. (1)
-    // API-FIX: backend should answer Amity.Response (2)
-    // API-FIX: pagination should not be indexed on channelSegment (3)
-    // const { data } = await client.http.get<Amity.Response<Amity.Paged<Amity.MessagePayload>>>(
-    const { data: queryPayload } = await client.http.get(`/api/v5/messages`, {
-        params: Object.assign(Object.assign({}, params), (pageToken
-            ? {
-                options: { token: pageToken },
-            }
-            : {})),
-    });
-    // API-FIX: backend should answer Amity.Response (2)
-    // const { paging, messages } = unwrapPayload(data)
-    const { paging } = queryPayload, payload = __rest(queryPayload, ["paging"]);
-    const data = await prepareMessagePayload(payload);
-    const { messages } = data;
-    const cachedAt = client.cache && Date.now();
-    if (client.cache) {
-        /*
-         * queryMessages.locally is unsupported for messages as message list updates
-         * frequently and leads to bugs when user switches between channels, i.e. when
-         * the public function (live messages) calls unmount. The list fetched on
-         * after from the cache is stale.
-         */
-        ingestInCache(data, { cachedAt });
-        const cacheKey = ['message', 'query', Object.assign({}, params)];
-        pushToCache(cacheKey, { messages: messages.map(getResolver('message')), paging });
+class MessagePaginationController extends PaginationController {
+    // eslint-disable-next-line no-useless-constructor
+    constructor(queryParams, cacheKey) {
+        super(queryParams, cacheKey);
+    }
+    async getRequest(queryParams, token) {
+        const { limit, aroundMessageId } = queryParams, params = __rest(queryParams, ["limit", "aroundMessageId"]);
+        const processedQueryParams = convertQueryParams$1(params);
+        const { data: queryResponse } = await this.http.get(`/api/v5/messages`, {
+            params: Object.assign(Object.assign({}, processedQueryParams), { options: token
+                    ? {
+                        token,
+                    }
+                    : {
+                        limit,
+                        around: aroundMessageId,
+                    } }),
+        });
+        return queryResponse;
     }
-    fireEvent('local.message.fetched', { messages });
-    const nextPage = toPageRaw(paging.next);
-    const prevPage = toPageRaw(paging.previous);
-    return { data: messages, cachedAt, prevPage, nextPage, paging };
-};
-/* end_public_function */
+}
 
-/*
- * Exported for testing
- * @hidden
- */
-const applyFilter$1 = (data, params) => {
-    let messages = data;
-    messages = messages.filter(m => {
-        if (params.tags) {
-            return params.tags.find(value => {
-                if (!m.tags)
-                    return false;
-                return m.tags.includes(value);
-            });
+/* eslint-disable no-use-before-define */
+class QueryStreamController {
+    constructor(query, cacheKey) {
+        this.query = query;
+        this.cacheKey = cacheKey;
+    }
+}
+
+/* eslint-disable no-use-before-define */
+class MessageQueryStreamController extends QueryStreamController {
+    // private fetchMessageMarker: (response: Amity.MessagePayload) => Promise<void>;
+    constructor(query, cacheKey, notifyChange) {
+        super(query, cacheKey);
+        this.notifyChange = notifyChange;
+    }
+    // eslint-disable-next-line class-methods-use-this
+    async saveToMainDB(response) {
+        const processedPayload = await prepareMessagePayload(response);
+        const client = getActiveClient();
+        const cachedAt = client.cache && Date.now();
+        if (client.cache) {
+            ingestInCache(processedPayload, { cachedAt });
         }
-        return true;
-    });
-    messages = messages.filter(m => {
-        if (params.excludeTags) {
-            return (params.excludeTags || []).find(value => {
-                if (!m.tags)
-                    return true;
-                return !m.tags.includes(value);
+    }
+    appendToQueryStream(response, direction, refresh = false) {
+        var _a, _b, _c, _d, _e, _f;
+        if (refresh) {
+            pushToCache(this.cacheKey, {
+                data: response.messages.map(getResolver('message')),
+                params: {
+                    page: {
+                        after: toPage((_a = response.paging) === null || _a === void 0 ? void 0 : _a.next),
+                        before: toPage((_b = response.paging) === null || _b === void 0 ? void 0 : _b.previous),
+                    },
+                },
             });
         }
+        else {
+            const collection = (_c = pullFromCache(this.cacheKey)) === null || _c === void 0 ? void 0 : _c.data;
+            const messages = (_d = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _d !== void 0 ? _d : [];
+            pushToCache(this.cacheKey, Object.assign(Object.assign({}, collection), { data: direction === 'next'
+                    ? [...new Set([...messages, ...response.messages.map(getResolver('message'))])]
+                    : [...new Set([...response.messages.map(getResolver('message')), ...messages])], params: {
+                    page: {
+                        before: toPage((_e = response.paging) === null || _e === void 0 ? void 0 : _e.previous),
+                        after: toPage((_f = response.paging) === null || _f === void 0 ? void 0 : _f.next),
+                    },
+                } }));
+        }
+    }
+    reactor(action) {
+        return (payload) => {
+            var _a, _b, _c, _d, _e;
+            if (action === 'onCreate') {
+                const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+                if (!collection)
+                    return;
+                if (this.query.subChannelId !== (payload === null || payload === void 0 ? void 0 : payload.subChannelId) || !collection)
+                    return;
+                if (this.query.dataType && this.query.dataType !== payload.dataType)
+                    return;
+                if (this.query.excludeTags &&
+                    ((_b = this.query.excludeTags) === 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.hasFlags !== !!payload.flagCount)
+                    return;
+                if (this.query.parentId && this.query.parentId !== payload.parentId)
+                    return;
+                if (this.query.hasOwnProperty('includeDeleted') &&
+                    !this.query.includeDeleted &&
+                    payload.isDeleted)
+                    return;
+                if (this.query.tags && !((_c = this.query.tags) === 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') &&
+                    !((_d = collection.params.page) === null || _d === void 0 ? void 0 : _d.before)) {
+                    collection.data = [...new Set([payload.messageId, ...collection.data])];
+                }
+                if (this.query.sortBy === 'segmentAsc' && !((_e = collection.params.page) === null || _e === void 0 ? void 0 : _e.after)) {
+                    collection.data = [...new Set([...collection.data, payload.messageId])];
+                }
+                pushToCache(this.cacheKey, collection);
+            }
+            this.notifyChange(false);
+        };
+    }
+    subscribeRTE(createSubscriber) {
+        return createSubscriber.map(subscriber => subscriber.fn(this.reactor(subscriber.action)));
+    }
+}
+
+class LiveCollectionController {
+    constructor(paginationController, queryStreamId, cacheKey, callback) {
+        this.paginationController = paginationController;
+        this.queryStreamId = queryStreamId;
+        this.cacheKey = cacheKey;
+        this.callback = callback;
+    }
+    async refresh() {
+        try {
+            const result = await this.paginationController.loadFirstPage();
+            if (!result)
+                return;
+            await this.persistModel(result);
+            this.persistQueryStream(result, 'next', true);
+            this.notifyChange(false);
+        }
+        catch (e) {
+            this.notifyChange(false, e);
+        }
+    }
+    loadPage(initial = false) {
+        this.setup();
+        this.notifyChange(true);
+        if (initial) {
+            this.refresh();
+        }
+        else {
+            this.loadNextPage();
+        }
+    }
+    async loadNextPage() {
+        try {
+            const result = await this.paginationController.loadNextPage();
+            if (!result)
+                return;
+            await this.persistModel(result);
+            this.persistQueryStream(result, 'next');
+            this.notifyChange(false);
+        }
+        catch (e) {
+            this.notifyChange(false, e);
+        }
+    }
+    async loadPrevPage() {
+        try {
+            const result = await this.paginationController.loadPreviousPage();
+            if (!result)
+                return;
+            await this.persistModel(result);
+            this.persistQueryStream(result, 'prev');
+            this.notifyChange(false);
+        }
+        catch (e) {
+            this.notifyChange(false, e);
+        }
+    }
+    shouldNotify(loading, data) {
+        var _a;
+        if (((_a = this.snapshot) === null || _a === void 0 ? void 0 : _a.loading) === loading && isEqual(this.snapshot.data, data))
+            return false;
+        this.snapshot = { loading, data };
         return true;
-    });
-    /*
-     * for cases when message is deleted via RTE, this flag is used to get
-     * items from cache that are !deleted
-     */
-    if (!params.includeDeleted) {
-        messages = filterByPropEquality(messages, 'isDeleted', false);
     }
-    messages = messages.sort((message1, message2) => {
-        if (params.sortBy === 'segmentAsc') {
-            return message1.channelSegment - message2.channelSegment;
+    getCacheKey() {
+        return this.cacheKey;
+    }
+}
+
+/* eslint-disable no-use-before-define */
+class MessageLiveCollectionController extends LiveCollectionController {
+    constructor(query, callback) {
+        const queryStreamId = hash__default["default"](query);
+        const cacheKey = ['message', 'collection', queryStreamId];
+        const paginationController = new MessagePaginationController(query, cacheKey);
+        super(paginationController, queryStreamId, cacheKey, callback);
+        this.query = query;
+        this.queryStreamController = new MessageQueryStreamController(this.query, this.cacheKey, this.notifyChange.bind(this));
+        this.callback = callback.bind(this);
+        this.loadPage(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: {},
+            });
         }
-        if (params.sortBy === 'segmentDesc') {
-            return message2.channelSegment - message1.channelSegment;
+    }
+    async persistModel(queryPayload) {
+        await this.queryStreamController.saveToMainDB(queryPayload);
+    }
+    persistQueryStream(queryPayload, direction, refresh) {
+        this.queryStreamController.appendToQueryStream(queryPayload, direction, refresh);
+    }
+    startSubscription() {
+        return this.queryStreamController.subscribeRTE([
+            { fn: onMessageCreated, action: 'onCreate' },
+            { fn: onMessageDeleted, action: 'onDelete' },
+            { fn: onMessageUpdated, action: 'onUpdate' },
+            { fn: onMessageFlagged, action: 'onFlagged' },
+            { fn: onMessageUnflagged, action: 'onUnflagged' },
+            { fn: onMessageFlagCleared, action: 'onFlagCleared' },
+            { fn: onMessageReactionAdded, action: 'onReactionAdded' },
+            { fn: onMessageReactionRemoved, action: 'onReactionRemoved' },
+            {
+                fn: convertEventPayload(onMessageMarkerFetched, 'contentId', 'message'),
+                action: 'onUpdate',
+            },
+            { fn: convertEventPayload(onMessageMarked, 'contentId', 'message'), action: 'onUpdate' },
+        ]);
+    }
+    notifyChange(loading, error) {
+        var _a, _b, _c, _d, _e, _f;
+        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(messageId => pullFromCache(['message', 'get', messageId]))
+            .filter(Boolean)
+            .map(({ data }) => data)) !== null && _b !== void 0 ? _b : []);
+        if (!loading && !error && !this.shouldNotify(loading, data))
+            return;
+        this.callback({
+            onNextPage: () => this.loadNextPage(),
+            onPrevPage: () => this.loadPrevPage(),
+            data,
+            hasNextPage: !!((_d = (_c = collection.params) === null || _c === void 0 ? void 0 : _c.page) === null || _d === void 0 ? void 0 : _d.after),
+            hasPrevPage: !!((_f = (_e = collection.params) === null || _e === void 0 ? void 0 : _e.page) === null || _f === void 0 ? void 0 : _f.before),
+            loading,
+            error,
+        });
+    }
+    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
+         */
+        if (!this.query.includeDeleted) {
+            messages = filterByPropEquality(messages, 'isDeleted', false);
         }
-        return 0;
-    });
-    return messages;
-};
+        messages = messages.sort((message1, message2) => {
+            if (this.query.sortBy === 'segmentAsc') {
+                return message1.channelSegment - message2.channelSegment;
+            }
+            if (this.query.sortBy === 'segmentDesc') {
+                return message2.channelSegment - message1.channelSegment;
+            }
+            return 0;
+        });
+        return messages;
+    }
+}
+
 /* begin_public_function
   id: message.query
 */
@@ -14354,76 +14608,12 @@ const getMessages = (params, callback, config) => {
     }
     const timestamp = Date.now();
     log(`getMessages(tmpid: ${timestamp}) > listen`);
-    const { limit: queryLimit } = params, queryParams = __rest(params, ["limit"]);
-    const limit = queryLimit !== null && queryLimit !== void 0 ? queryLimit : COLLECTION_DEFAULT_PAGINATION_LIMIT;
-    const { policy = COLLECTION_DEFAULT_CACHING_POLICY } = config !== null && config !== void 0 ? config : {};
-    const disposers = [];
-    const uniqueId = uuid();
-    const cacheKey = ['message', 'collection', params, uniqueId];
-    const responder = (data) => {
-        var _a, _b;
-        const messages = applyFilter$1((_a = data.data
-            .map(messageId => pullFromCache(['message', 'get', messageId]))
-            .filter(Boolean)
-            .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [], params);
-        callback({
-            onNextPage: onFetch,
-            data: messages,
-            hasNextPage: !!((_b = data.params) === null || _b === void 0 ? void 0 : _b.page),
-            loading: data.loading,
-            error: data.error,
-        });
-    };
-    const realtimeRouter = (action) => (message) => {
-        var _a, _b, _c;
-        const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-        if (params.subChannelId !== (message === null || message === void 0 ? void 0 : message.subChannelId) || !collection)
-            return;
-        // /*
-        //  * check if RTE message event payload is with the params in order to update in the colleciton cache
-        //  */
-        if (params.dataType && params.dataType !== message.dataType)
-            return;
-        if (params.excludeTags && ((_b = params.excludeTags) === null || _b === void 0 ? void 0 : _b.some(value => { var _a; return (_a = message.tags) === null || _a === void 0 ? void 0 : _a.includes(value); })))
-            return;
-        if (!!params.hasFlags !== !!message.flagCount)
-            return;
-        if (params.parentId && params.parentId !== message.parentId)
-            return;
-        if (params.hasOwnProperty('includeDeleted') && !params.includeDeleted && message.isDeleted)
-            return;
-        if (params.tags && !((_c = params.tags) === null || _c === void 0 ? void 0 : _c.some(value => { var _a; return (_a = message.tags) === null || _a === void 0 ? void 0 : _a.includes(value); })))
-            return;
-        if (!collection.data.includes(message.messageId) && action === 'onCreate') {
-            collection.data = [...new Set([message.messageId, ...collection.data])];
-        }
-        pushToCache(cacheKey, collection);
-        responder(collection);
-    };
-    const onFetch = (initial = false) => {
-        var _a, _b, _c, _d, _e, _f, _g;
-        const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-        const messages = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
-        if (!initial && messages.length > 0 && !((_d = (_c = collection === null || collection === void 0 ? void 0 : collection.params) === null || _c === void 0 ? void 0 : _c.paging) === null || _d === void 0 ? void 0 : _d.next))
-            return;
-        const query = createQuery(queryMessages, Object.assign(Object.assign({}, queryParams), { page: (_e = (!initial ? collection === null || collection === void 0 ? void 0 : collection.params.page : undefined)) !== null && _e !== void 0 ? _e : { limit }, pageToken: (_g = (_f = collection === null || collection === void 0 ? void 0 : collection.params) === null || _f === void 0 ? void 0 : _f.paging) === null || _g === void 0 ? void 0 : _g.next }));
-        runQuery(query, ({ data: result, error, loading, nextPage: page, paging }) => {
-            const data = {
-                loading,
-                error,
-                params: { page, paging },
-                data: messages,
-            };
-            if (result) {
-                data.data = [...new Set([...messages, ...result.map(getResolver('message'))])];
-            }
-            pushToCache(cacheKey, data);
-            responder(data);
-        }, queryOptions(policy, CACHE_SHORTEN_LIFESPAN));
-    };
-    disposers.push(onMessageFetched(realtimeRouter('onFetch')), onMessageCreated(realtimeRouter('onCreate')), onMessageUpdated(realtimeRouter('onUpdate')), onMessageDeleted(realtimeRouter('onDelete')), onMessageFlagged(realtimeRouter('onFlagged')), onMessageUnflagged(realtimeRouter('onUnflagged')), onMessageFlagCleared(realtimeRouter('onFlagCleared')), onMessageReactionAdded(realtimeRouter('onReactionAdded')), onMessageReactionRemoved(realtimeRouter('onReactionRemoved')), convertEventPayload(onMessageMarkerFetched, 'contentId', 'message')(realtimeRouter('onUpdate')), convertEventPayload(onMessageMarked, 'contentId', 'message')(realtimeRouter('onUpdate')));
-    onFetch(true);
-    disposers.push(() => dropFromCache(cacheKey));
+    const messagesLiveCollection = new MessageLiveCollectionController(params, callback);
+    const disposers = messagesLiveCollection.startSubscription();
+    const cacheKey = messagesLiveCollection.getCacheKey();
+    disposers.push(() => {
+        dropFromCache(cacheKey);
+    });
     return () => {
         log(`getMessages(tmpid: ${timestamp}) > dispose`);
         disposers.forEach(fn => fn());
@@ -16663,10 +16853,10 @@ queryCommunityMembers.locally = (query) => {
  */
 const applyFilter = (data, params) => {
     let communityMembers = filterByPropIntersection(data, 'roles', params.roles);
-    if (params.membership) {
+    if (params.memberships) {
         communityMembers = communityMembers.filter(({ communityMembership }) => 
         // @ts-ignore
-        params.membership.includes(communityMembership));
+        params.memberships.includes(communityMembership));
     }
     if (params.search) {
         communityMembers = filterBySearchTerm(communityMembers, params.search);