@amityco/ts-sdk 6.3.2-de32ca2.0 → 6.3.2-eee54e8.0

package/dist/channelRepsitory/channelMembership/observers/getMembers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getMembers.d.ts","sourceRoot":"","sources":["../../../../src/channelRepsitory/channelMembership/observers/getMembers.ts"],"names":[],"mappings":"AA+BA;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,UAAU,WACb,MAAM,4BAA4B,YAChC,MAAM,sBAAsB,CAAC,MAAM,UAAU,CAAC,SAAS,CAAC,CAAC,WAC1D,MAAM,oBAAoB,eA2IpC,CAAC"}
+{"version":3,"file":"getMembers.d.ts","sourceRoot":"","sources":["../../../../src/channelRepsitory/channelMembership/observers/getMembers.ts"],"names":[],"mappings":"AA+BA;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,UAAU,WACb,MAAM,4BAA4B,YAChC,MAAM,sBAAsB,CAAC,MAAM,UAAU,CAAC,SAAS,CAAC,CAAC,WAC1D,MAAM,oBAAoB,eAkJpC,CAAC"}

package/dist/commentRepository/api/tests/deleteComment.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=deleteComment.test.d.ts.map

package/dist/commentRepository/api/tests/deleteComment.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"deleteComment.test.d.ts","sourceRoot":"","sources":["../../../../src/commentRepository/api/tests/deleteComment.test.ts"],"names":[],"mappings":""}

package/dist/communityRepository/communityMembership/observers/getMembers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getMembers.d.ts","sourceRoot":"","sources":["../../../../src/communityRepository/communityMembership/observers/getMembers.ts"],"names":[],"mappings":"AAgCA;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,UAAU,WACb,MAAM,6BAA6B,YACjC,MAAM,sBAAsB,CAAC,MAAM,UAAU,CAAC,WAAW,CAAC,CAAC,WAC5D,MAAM,oBAAoB,eA8HpC,CAAC"}
+{"version":3,"file":"getMembers.d.ts","sourceRoot":"","sources":["../../../../src/communityRepository/communityMembership/observers/getMembers.ts"],"names":[],"mappings":"AAgCA;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,UAAU,WACb,MAAM,6BAA6B,YACjC,MAAM,sBAAsB,CAAC,MAAM,UAAU,CAAC,WAAW,CAAC,CAAC,WAC5D,MAAM,oBAAoB,eAkIpC,CAAC"}

package/dist/core/transports/mqtt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mqtt.d.ts","sourceRoot":"","sources":["../../../src/core/transports/mqtt.ts"],"names":[],"mappings":"AAEA,OAAa,EAAE,cAAc,EAAsB,UAAU,EAAE,MAAM,gBAAgB,CAAC;AActF,wBAAgB,cAAc,CAAC,MAAM,EAAE;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,cAAc,CAiBjB;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,mBAAmB,aAAc,MAAM,KAAG,gBAiHtD,CAAC"}
+{"version":3,"file":"mqtt.d.ts","sourceRoot":"","sources":["../../../src/core/transports/mqtt.ts"],"names":[],"mappings":"AAEA,OAAa,EAAE,cAAc,EAAsB,UAAU,EAAE,MAAM,gBAAgB,CAAC;AActF,wBAAgB,cAAc,CAAC,MAAM,EAAE;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,cAAc,CAiBjB;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,mBAAmB,aAAc,MAAM,KAAG,gBAuGtD,CAAC"}

package/dist/index.cjs.js

@@ -20416,15 +20416,15 @@ var mqtt = /*@__PURE__*/getDefaultExportFromCjs(mqtt$1.exports);
 /* eslint-disable no-console */
 const QOS_FAILURE_CODE = 128;
 const RETRY_BASE_TIMEOUT = 1000;
-const RETRY_COUNT_MAX = 10;
+const RETRY_MAX_TIMEOUT = 8000;
 var MqttError;
 (function (MqttError) {
     MqttError[MqttError["IDENTIFIER_REJECTED"] = 2] = "IDENTIFIER_REJECTED";
-    MqttError[MqttError["BAD_USERNAME_OR_PASSWORD"] = 4] = "BAD_USERNAME_OR_PASSWORD";
-    MqttError[MqttError["NOT_AUTHORIZED"] = 5] = "NOT_AUTHORIZED";
+    MqttError[MqttError["BAD_USERNAME_OR_PASSWORD"] = 134] = "BAD_USERNAME_OR_PASSWORD";
+    MqttError[MqttError["NOT_AUTHORIZED"] = 135] = "NOT_AUTHORIZED";
 })(MqttError || (MqttError = {}));
 function getMqttOptions(params) {
-    return Object.assign({ clean: false, clientId: `mqttjs_ + ${Math.random().toString(16).substring(2, 10)}`, protocolId: 'MQTT', protocolVersion: 4, reconnectPeriod: 0, will: {
+    return Object.assign({ clean: false, clientId: `mqttjs_ + ${Math.random().toString(16).substring(2, 10)}`, protocolId: 'MQTT', protocolVersion: 5, reconnectPeriod: RETRY_BASE_TIMEOUT, will: {
             topic: 'WillMsg',
             payload: 'Connection Closed abnormally..!',
             qos: 0,
@@ -20442,14 +20442,6 @@ function getMqttOptions(params) {
  */
 const createMqttTransport = (endpoint) => {
     let mqttClient;
-    let retryCount = 0;
-    let allowReconnection = true;
-    const reconnect = () => {
-        setTimeout(() => {
-            retryCount += 1;
-            mqttClient.reconnect();
-        }, RETRY_BASE_TIMEOUT * 2 ** (retryCount > RETRY_COUNT_MAX ? RETRY_COUNT_MAX : retryCount));
-    };
     async function connect(params) {
         if (mqttClient) {
             mqttClient.removeAllListeners();
@@ -20457,29 +20449,26 @@ const createMqttTransport = (endpoint) => {
         }
         mqttClient = mqtt.connect(endpoint, getMqttOptions({ username: params.userId, password: params.accessToken }));
         mqttClient.on('connect', () => {
-            retryCount = 0;
-            allowReconnection = true;
+            mqttClient.options.reconnectPeriod = RETRY_BASE_TIMEOUT;
         });
         mqttClient.on('error', (error) => {
             // eslint-disable-next-line default-case
             switch (error.code) {
                 case 2 /* MqttError.IDENTIFIER_REJECTED */:
-                case 4 /* MqttError.BAD_USERNAME_OR_PASSWORD */:
-                case 5 /* MqttError.NOT_AUTHORIZED */:
-                    allowReconnection = false;
+                case 134 /* MqttError.BAD_USERNAME_OR_PASSWORD */:
+                case 135 /* MqttError.NOT_AUTHORIZED */:
+                    mqttClient.end();
             }
         });
-        mqttClient.on('close', () => {
-            if (allowReconnection) {
-                reconnect();
-            }
+        mqttClient.on('reconnect', () => {
+            // Double the reconnect period for each attempt
+            mqttClient.options.reconnectPeriod = Math.min((mqttClient.options.reconnectPeriod || RETRY_BASE_TIMEOUT) * 2, RETRY_MAX_TIMEOUT);
         });
         return new Promise(resolve => mqttClient.once('connect', () => resolve()));
     }
     return {
         connect,
         async disconnect() {
-            allowReconnection = false;
             if (this.connected) {
                 return new Promise(resolve => mqttClient === null || mqttClient === void 0 ? void 0 : mqttClient.end(true, undefined, () => resolve()));
             }
@@ -24509,13 +24498,8 @@ const getUsers = (params, callback, config) => {
     const { policy = COLLECTION_DEFAULT_CACHING_POLICY } = config !== null && config !== void 0 ? config : {};
     const disposers = [];
     const cacheKey = ['user', 'collection', {}];
-    const responder = (data) => {
-        var _a, _b;
-        let users = (_a = data.data
-            .map(userId => pullFromCache(['user', 'get', userId]))
-            .filter(Boolean)
-            .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
-        users = filterByPropEquality(users, 'displayName', params.displayName);
+    const applyFilter = (data) => {
+        let users = filterByPropEquality(data, 'displayName', params.displayName);
         switch (params.sortBy) {
             case 'firstCreated':
                 users = users.sort(sortByFirstCreated);
@@ -24530,9 +24514,20 @@ const getUsers = (params, callback, config) => {
                     // @ts-ignore
                     .sort(sortByDisplayName);
         }
+        return users;
+    };
+    const responder = (data, isEventModel = false) => {
+        var _a, _b;
+        const users = (_a = data.data
+            .map(userId => pullFromCache(['user', 'get', userId]))
+            .filter(Boolean)
+            .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
         callback({
             onNextPage: onFetch,
-            data: users,
+            /*
+             * Only apply filter to RTE Model
+             */
+            data: isEventModel ? applyFilter(users) : users,
             hasNextPage: !!((_b = data.params) === null || _b === void 0 ? void 0 : _b.page),
             loading: data.loading,
             error: data.error,
@@ -24545,7 +24540,7 @@ const getUsers = (params, callback, config) => {
             return;
         collection.data = [...new Set([user.userId, ...collection.data])];
         pushToCache(cacheKey, collection);
-        responder(collection);
+        responder(collection, true);
     };
     const onFetch = (initial = false) => {
         var _a, _b, _c;
@@ -27590,13 +27585,8 @@ const getMembers$1 = (params, callback, config) => {
     const { policy = COLLECTION_DEFAULT_CACHING_POLICY } = config !== null && config !== void 0 ? config : {};
     const disposers = [];
     const cacheKey = ['channelUsers', 'collection', { channelId: params.channelId }];
-    const responder = (data) => {
-        var _a, _b;
-        let channelMembers = (_a = data.data
-            .map(id => pullFromCache(['channelUsers', 'get', id]))
-            .filter(Boolean)
-            .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
-        channelMembers = filterByPropIntersection(channelMembers, 'roles', params.roles);
+    const applyFilter = (data) => {
+        let channelMembers = filterByPropIntersection(data, 'roles', params.roles);
         if (params.memberships) {
             /*
              * even though membership includes muted as a possible value
@@ -27619,9 +27609,20 @@ const getMembers$1 = (params, callback, config) => {
         // sort, 'lastCreated' is the default sort order
         const sortBy = params.sortBy ? params.sortBy : 'lastCreated';
         channelMembers = channelMembers.sort(sortBy === 'lastCreated' ? sortByLastCreated : sortByFirstCreated);
+        return channelMembers;
+    };
+    const responder = (data, isEventModel = false) => {
+        var _a, _b;
+        const channelMembers = (_a = data.data
+            .map(id => pullFromCache(['channelUsers', 'get', id]))
+            .filter(Boolean)
+            .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
         callback({
             onNextPage: onFetch,
-            data: channelMembers,
+            /*
+             * Only apply filter to RTE Model
+             */
+            data: isEventModel ? applyFilter(channelMembers) : channelMembers,
             hasNextPage: !!((_b = data.params) === null || _b === void 0 ? void 0 : _b.page),
             loading: data.loading,
             error: data.error,
@@ -27646,7 +27647,7 @@ const getMembers$1 = (params, callback, config) => {
             collection.data = [channelMemberCacheId, ...collection.data];
         }
         pushToCache(cacheKey, collection);
-        responder(collection);
+        responder(collection, true);
     };
     const onFetch = (initial = false) => {
         var _a, _b, _c;
@@ -28685,7 +28686,7 @@ const getMessages = (params, callback, config) => {
     const limit = queryLimit !== null && queryLimit !== void 0 ? queryLimit : COLLECTION_DEFAULT_PAGINATION_LIMIT;
     const { policy = COLLECTION_DEFAULT_CACHING_POLICY } = config !== null && config !== void 0 ? config : {};
     const disposers = [];
-    const cacheKey = ['message', 'collection', { subChannelId: params.subChannelId }];
+    const cacheKey = ['message', 'collection', params];
     const responder = (data) => {
         var _a, _b;
         let messages = (_a = data.data
@@ -30639,13 +30640,8 @@ const getMembers = (params, callback, config) => {
     const { policy = COLLECTION_DEFAULT_CACHING_POLICY } = config !== null && config !== void 0 ? config : {};
     const disposers = [];
     const cacheKey = ['communityUsers', 'collection', { communityId: params.communityId }];
-    const responder = (data) => {
-        var _a, _b;
-        let communityMembers = (_a = data.data
-            .map(id => pullFromCache(['communityUsers', 'get', id]))
-            .filter(Boolean)
-            .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
-        communityMembers = filterByPropIntersection(communityMembers, 'roles', params.roles);
+    const applyFilter = (data) => {
+        let communityMembers = filterByPropIntersection(data, 'roles', params.roles);
         if (params.membership) {
             communityMembers = communityMembers.filter(({ communityMembership }) => 
             // @ts-ignore
@@ -30656,9 +30652,17 @@ const getMembers = (params, callback, config) => {
         }
         const sortBy = params.sortBy ? params.sortBy : 'lastCreated';
         communityMembers = communityMembers.sort(sortBy === 'lastCreated' ? sortByLastCreated : sortByFirstCreated);
+        return communityMembers;
+    };
+    const responder = (data, isEventModel = false) => {
+        var _a, _b;
+        const communityMembers = (_a = data.data
+            .map(id => pullFromCache(['communityUsers', 'get', id]))
+            .filter(Boolean)
+            .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
         callback({
             onNextPage: onFetch,
-            data: communityMembers,
+            data: isEventModel ? applyFilter(communityMembers) : communityMembers,
             hasNextPage: !!((_b = data.params) === null || _b === void 0 ? void 0 : _b.page),
             loading: data.loading,
             error: data.error,
@@ -30678,7 +30682,7 @@ const getMembers = (params, callback, config) => {
         });
         collection.data = [...new Set([communityMemberCacheId, ...collection.data])];
         pushToCache(cacheKey, collection);
-        responder(collection);
+        responder(collection, true);
     };
     const onFetch = (initial = false) => {
         var _a, _b, _c;

package/dist/index.esm.js

@@ -20402,15 +20402,15 @@ var mqtt = /*@__PURE__*/getDefaultExportFromCjs(mqtt$1.exports);
 /* eslint-disable no-console */
 const QOS_FAILURE_CODE = 128;
 const RETRY_BASE_TIMEOUT = 1000;
-const RETRY_COUNT_MAX = 10;
+const RETRY_MAX_TIMEOUT = 8000;
 var MqttError;
 (function (MqttError) {
     MqttError[MqttError["IDENTIFIER_REJECTED"] = 2] = "IDENTIFIER_REJECTED";
-    MqttError[MqttError["BAD_USERNAME_OR_PASSWORD"] = 4] = "BAD_USERNAME_OR_PASSWORD";
-    MqttError[MqttError["NOT_AUTHORIZED"] = 5] = "NOT_AUTHORIZED";
+    MqttError[MqttError["BAD_USERNAME_OR_PASSWORD"] = 134] = "BAD_USERNAME_OR_PASSWORD";
+    MqttError[MqttError["NOT_AUTHORIZED"] = 135] = "NOT_AUTHORIZED";
 })(MqttError || (MqttError = {}));
 function getMqttOptions(params) {
-    return Object.assign({ clean: false, clientId: `mqttjs_ + ${Math.random().toString(16).substring(2, 10)}`, protocolId: 'MQTT', protocolVersion: 4, reconnectPeriod: 0, will: {
+    return Object.assign({ clean: false, clientId: `mqttjs_ + ${Math.random().toString(16).substring(2, 10)}`, protocolId: 'MQTT', protocolVersion: 5, reconnectPeriod: RETRY_BASE_TIMEOUT, will: {
             topic: 'WillMsg',
             payload: 'Connection Closed abnormally..!',
             qos: 0,
@@ -20428,14 +20428,6 @@ function getMqttOptions(params) {
  */
 const createMqttTransport = (endpoint) => {
     let mqttClient;
-    let retryCount = 0;
-    let allowReconnection = true;
-    const reconnect = () => {
-        setTimeout(() => {
-            retryCount += 1;
-            mqttClient.reconnect();
-        }, RETRY_BASE_TIMEOUT * 2 ** (retryCount > RETRY_COUNT_MAX ? RETRY_COUNT_MAX : retryCount));
-    };
     async function connect(params) {
         if (mqttClient) {
             mqttClient.removeAllListeners();
@@ -20443,29 +20435,26 @@ const createMqttTransport = (endpoint) => {
         }
         mqttClient = mqtt.connect(endpoint, getMqttOptions({ username: params.userId, password: params.accessToken }));
         mqttClient.on('connect', () => {
-            retryCount = 0;
-            allowReconnection = true;
+            mqttClient.options.reconnectPeriod = RETRY_BASE_TIMEOUT;
         });
         mqttClient.on('error', (error) => {
             // eslint-disable-next-line default-case
             switch (error.code) {
                 case 2 /* MqttError.IDENTIFIER_REJECTED */:
-                case 4 /* MqttError.BAD_USERNAME_OR_PASSWORD */:
-                case 5 /* MqttError.NOT_AUTHORIZED */:
-                    allowReconnection = false;
+                case 134 /* MqttError.BAD_USERNAME_OR_PASSWORD */:
+                case 135 /* MqttError.NOT_AUTHORIZED */:
+                    mqttClient.end();
             }
         });
-        mqttClient.on('close', () => {
-            if (allowReconnection) {
-                reconnect();
-            }
+        mqttClient.on('reconnect', () => {
+            // Double the reconnect period for each attempt
+            mqttClient.options.reconnectPeriod = Math.min((mqttClient.options.reconnectPeriod || RETRY_BASE_TIMEOUT) * 2, RETRY_MAX_TIMEOUT);
         });
         return new Promise(resolve => mqttClient.once('connect', () => resolve()));
     }
     return {
         connect,
         async disconnect() {
-            allowReconnection = false;
             if (this.connected) {
                 return new Promise(resolve => mqttClient === null || mqttClient === void 0 ? void 0 : mqttClient.end(true, undefined, () => resolve()));
             }
@@ -24495,13 +24484,8 @@ const getUsers = (params, callback, config) => {
     const { policy = COLLECTION_DEFAULT_CACHING_POLICY } = config !== null && config !== void 0 ? config : {};
     const disposers = [];
     const cacheKey = ['user', 'collection', {}];
-    const responder = (data) => {
-        var _a, _b;
-        let users = (_a = data.data
-            .map(userId => pullFromCache(['user', 'get', userId]))
-            .filter(Boolean)
-            .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
-        users = filterByPropEquality(users, 'displayName', params.displayName);
+    const applyFilter = (data) => {
+        let users = filterByPropEquality(data, 'displayName', params.displayName);
         switch (params.sortBy) {
             case 'firstCreated':
                 users = users.sort(sortByFirstCreated);
@@ -24516,9 +24500,20 @@ const getUsers = (params, callback, config) => {
                     // @ts-ignore
                     .sort(sortByDisplayName);
         }
+        return users;
+    };
+    const responder = (data, isEventModel = false) => {
+        var _a, _b;
+        const users = (_a = data.data
+            .map(userId => pullFromCache(['user', 'get', userId]))
+            .filter(Boolean)
+            .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
         callback({
             onNextPage: onFetch,
-            data: users,
+            /*
+             * Only apply filter to RTE Model
+             */
+            data: isEventModel ? applyFilter(users) : users,
             hasNextPage: !!((_b = data.params) === null || _b === void 0 ? void 0 : _b.page),
             loading: data.loading,
             error: data.error,
@@ -24531,7 +24526,7 @@ const getUsers = (params, callback, config) => {
             return;
         collection.data = [...new Set([user.userId, ...collection.data])];
         pushToCache(cacheKey, collection);
-        responder(collection);
+        responder(collection, true);
     };
     const onFetch = (initial = false) => {
         var _a, _b, _c;
@@ -27576,13 +27571,8 @@ const getMembers$1 = (params, callback, config) => {
     const { policy = COLLECTION_DEFAULT_CACHING_POLICY } = config !== null && config !== void 0 ? config : {};
     const disposers = [];
     const cacheKey = ['channelUsers', 'collection', { channelId: params.channelId }];
-    const responder = (data) => {
-        var _a, _b;
-        let channelMembers = (_a = data.data
-            .map(id => pullFromCache(['channelUsers', 'get', id]))
-            .filter(Boolean)
-            .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
-        channelMembers = filterByPropIntersection(channelMembers, 'roles', params.roles);
+    const applyFilter = (data) => {
+        let channelMembers = filterByPropIntersection(data, 'roles', params.roles);
         if (params.memberships) {
             /*
              * even though membership includes muted as a possible value
@@ -27605,9 +27595,20 @@ const getMembers$1 = (params, callback, config) => {
         // sort, 'lastCreated' is the default sort order
         const sortBy = params.sortBy ? params.sortBy : 'lastCreated';
         channelMembers = channelMembers.sort(sortBy === 'lastCreated' ? sortByLastCreated : sortByFirstCreated);
+        return channelMembers;
+    };
+    const responder = (data, isEventModel = false) => {
+        var _a, _b;
+        const channelMembers = (_a = data.data
+            .map(id => pullFromCache(['channelUsers', 'get', id]))
+            .filter(Boolean)
+            .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
         callback({
             onNextPage: onFetch,
-            data: channelMembers,
+            /*
+             * Only apply filter to RTE Model
+             */
+            data: isEventModel ? applyFilter(channelMembers) : channelMembers,
             hasNextPage: !!((_b = data.params) === null || _b === void 0 ? void 0 : _b.page),
             loading: data.loading,
             error: data.error,
@@ -27632,7 +27633,7 @@ const getMembers$1 = (params, callback, config) => {
             collection.data = [channelMemberCacheId, ...collection.data];
         }
         pushToCache(cacheKey, collection);
-        responder(collection);
+        responder(collection, true);
     };
     const onFetch = (initial = false) => {
         var _a, _b, _c;
@@ -28671,7 +28672,7 @@ const getMessages = (params, callback, config) => {
     const limit = queryLimit !== null && queryLimit !== void 0 ? queryLimit : COLLECTION_DEFAULT_PAGINATION_LIMIT;
     const { policy = COLLECTION_DEFAULT_CACHING_POLICY } = config !== null && config !== void 0 ? config : {};
     const disposers = [];
-    const cacheKey = ['message', 'collection', { subChannelId: params.subChannelId }];
+    const cacheKey = ['message', 'collection', params];
     const responder = (data) => {
         var _a, _b;
         let messages = (_a = data.data
@@ -30625,13 +30626,8 @@ const getMembers = (params, callback, config) => {
     const { policy = COLLECTION_DEFAULT_CACHING_POLICY } = config !== null && config !== void 0 ? config : {};
     const disposers = [];
     const cacheKey = ['communityUsers', 'collection', { communityId: params.communityId }];
-    const responder = (data) => {
-        var _a, _b;
-        let communityMembers = (_a = data.data
-            .map(id => pullFromCache(['communityUsers', 'get', id]))
-            .filter(Boolean)
-            .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
-        communityMembers = filterByPropIntersection(communityMembers, 'roles', params.roles);
+    const applyFilter = (data) => {
+        let communityMembers = filterByPropIntersection(data, 'roles', params.roles);
         if (params.membership) {
             communityMembers = communityMembers.filter(({ communityMembership }) => 
             // @ts-ignore
@@ -30642,9 +30638,17 @@ const getMembers = (params, callback, config) => {
         }
         const sortBy = params.sortBy ? params.sortBy : 'lastCreated';
         communityMembers = communityMembers.sort(sortBy === 'lastCreated' ? sortByLastCreated : sortByFirstCreated);
+        return communityMembers;
+    };
+    const responder = (data, isEventModel = false) => {
+        var _a, _b;
+        const communityMembers = (_a = data.data
+            .map(id => pullFromCache(['communityUsers', 'get', id]))
+            .filter(Boolean)
+            .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
         callback({
             onNextPage: onFetch,
-            data: communityMembers,
+            data: isEventModel ? applyFilter(communityMembers) : communityMembers,
             hasNextPage: !!((_b = data.params) === null || _b === void 0 ? void 0 : _b.page),
             loading: data.loading,
             error: data.error,
@@ -30664,7 +30668,7 @@ const getMembers = (params, callback, config) => {
         });
         collection.data = [...new Set([communityMemberCacheId, ...collection.data])];
         pushToCache(cacheKey, collection);
-        responder(collection);
+        responder(collection, true);
     };
     const onFetch = (initial = false) => {
         var _a, _b, _c;