@amityco/ts-sdk 6.17.0 → 6.17.1-1144fc8.0

package/dist/messageRepository/observers/getMessages/MessageLiveCollectionController.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"MessageLiveCollectionController.d.ts","sourceRoot":"","sources":["../../../../src/messageRepository/observers/getMessages/MessageLiveCollectionController.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAa5E,OAAO,EAAE,wBAAwB,EAAE,MAAM,gDAAgD,CAAC;AAK1F,qBAAa,+BAAgC,SAAQ,wBAAwB,CAC3E,SAAS,EACT,KAAK,CAAC,sBAAsB,EAC5B,KAAK,CAAC,OAAO,EACb,2BAA2B,CAC5B;IACC,OAAO,CAAC,qBAAqB,CAA+B;IAE5D,OAAO,CAAC,KAAK,CAA+B;gBAG1C,KAAK,EAAE,KAAK,CAAC,sBAAsB,EACnC,QAAQ,EAAE,KAAK,CAAC,sBAAsB,CAAC,KAAK,CAAC,OAAO,CAAC;IAqBvD,SAAS,CAAC,KAAK;cAUC,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,cAAc,GAAG,KAAK,CAAC,UAAU;IAI9E,SAAS,CAAC,kBAAkB,CAAC,EAC3B,QAAQ,EACR,SAAS,EACT,OAAO,GACR,EAAE,KAAK,CAAC,sCAAsC,CAAC,SAAS,CAAC;IAI1D,iBAAiB;IAkBjB,YAAY,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC,0BAA0B;IAwBzE,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,EAAE;CA2ClC"}

package/dist/messageRepository/observers/getMessages/MessagePaginationController.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"MessagePaginationController.d.ts","sourceRoot":"","sources":["../../../../src/messageRepository/observers/getMessages/MessagePaginationController.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAGlF;;;GAGG;AACH,qBAAa,2BAA4B,SAAQ,oBAAoB,CACnE,SAAS,EACT,KAAK,CAAC,sBAAsB,CAC7B;IACO,UAAU,CAAC,WAAW,EAAE,KAAK,CAAC,sBAAsB,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS;;;;CAmBtF"}

package/dist/messageRepository/observers/getMessages/MessageQueryStreamController.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"MessageQueryStreamController.d.ts","sourceRoot":"","sources":["../../../../src/messageRepository/observers/getMessages/MessageQueryStreamController.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AAKpF,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAE5E,qBAAa,4BAA6B,SAAQ,qBAAqB,CACrE,KAAK,CAAC,cAAc,EACpB,KAAK,CAAC,sBAAsB,CAC7B;IACC,OAAO,CAAC,YAAY,CAAqD;IAEzE,OAAO,CAAC,cAAc,CAEsB;IAE5C,OAAO,CAAC,oBAAoB,CAA8B;gBAGxD,KAAK,EAAE,KAAK,CAAC,sBAAsB,EACnC,QAAQ,EAAE,MAAM,EAAE,EAClB,YAAY,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,0BAA0B,KAAK,IAAI,EAChE,cAAc,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC,cAAc,KAAK,OAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC,EAC1F,oBAAoB,EAAE,2BAA2B;IAS7C,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,cAAc;IAWjD,mBAAmB,CACjB,QAAQ,EAAE,KAAK,CAAC,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,EAC1D,SAAS,EAAE,KAAK,CAAC,2BAA2B,EAC5C,OAAO,UAAQ;IAsBjB,OAAO,CAAC,MAAM,EAAE,MAAM,aACH,MAAM,OAAO;IA4DhC,YAAY,CACV,gBAAgB,EAAE;QAChB,EAAE,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,KAAK,CAAC,YAAY,CAAC;QACnE,MAAM,EAAE,MAAM,CAAC;KAChB,EAAE;CAIN"}

package/dist/messageRepository/observers/getMessages/getMessages.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getMessages.d.ts","sourceRoot":"","sources":["../../../../src/messageRepository/observers/getMessages/getMessages.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,WAAW,oDAEd,MAAM,sBAAsB,QA2CrC,CAAC;AAKF;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,WAAW,WACd,MAAM,sBAAsB,YAC1B,MAAM,sBAAsB,CAAC,MAAM,OAAO,CAAC,WAC5C,MAAM,oBAAoB,KAClC,MAAM,YAuBR,CAAC"}

package/dist/messageRepository/observers/getMessages/index.d.ts

@@ -0,0 +1,2 @@
+export * from './getMessages';
+//# sourceMappingURL=index.d.ts.map

package/dist/messageRepository/observers/getMessages/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/messageRepository/observers/getMessages/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC"}

package/dist/subChannelRepository/observers/{liveCollection → getSubChannels}/SubChannelLiveCollectionController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SubChannelLiveCollectionController.d.ts","sourceRoot":"","sources":["../../../../src/subChannelRepository/observers/liveCollection/SubChannelLiveCollectionController.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,wBAAwB,EAAE,MAAM,gDAAgD,CAAC;AAE1F,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AAuBlF,qBAAa,kCAAmC,SAAQ,wBAAwB,CAC9E,YAAY,EACZ,KAAK,CAAC,wBAAwB,EAC9B,KAAK,CAAC,UAAU,EAChB,8BAA8B,CAC/B;IACC,OAAO,CAAC,qBAAqB,CAAkC;IAE/D,OAAO,CAAC,KAAK,CAAiC;gBAG5C,KAAK,EAAE,KAAK,CAAC,wBAAwB,EACrC,QAAQ,EAAE,KAAK,CAAC,sBAAsB,CAAC,KAAK,CAAC,UAAU,CAAC;IAmB1D,SAAS,CAAC,KAAK;cASC,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,iBAAiB,GAAG,KAAK,CAAC,UAAU;IAIjF,SAAS,CAAC,kBAAkB,CAAC,EAC3B,QAAQ,EACR,SAAS,EACT,OAAO,GACR,EAAE,KAAK,CAAC,sCAAsC,CAAC,YAAY,CAAC;IAI7D,iBAAiB;IAoKjB,YAAY,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC,0BAA0B;IAuBzE,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,UAAU,EAAE;CAWrC"}
+{"version":3,"file":"SubChannelLiveCollectionController.d.ts","sourceRoot":"","sources":["../../../../src/subChannelRepository/observers/getSubChannels/SubChannelLiveCollectionController.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,wBAAwB,EAAE,MAAM,gDAAgD,CAAC;AAE1F,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AAuBlF,qBAAa,kCAAmC,SAAQ,wBAAwB,CAC9E,YAAY,EACZ,KAAK,CAAC,wBAAwB,EAC9B,KAAK,CAAC,UAAU,EAChB,8BAA8B,CAC/B;IACC,OAAO,CAAC,qBAAqB,CAAkC;IAE/D,OAAO,CAAC,KAAK,CAAiC;gBAG5C,KAAK,EAAE,KAAK,CAAC,wBAAwB,EACrC,QAAQ,EAAE,KAAK,CAAC,sBAAsB,CAAC,KAAK,CAAC,UAAU,CAAC;IAmB1D,SAAS,CAAC,KAAK;cASC,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,iBAAiB,GAAG,KAAK,CAAC,UAAU;IAIjF,SAAS,CAAC,kBAAkB,CAAC,EAC3B,QAAQ,EACR,SAAS,EACT,OAAO,GACR,EAAE,KAAK,CAAC,sCAAsC,CAAC,YAAY,CAAC;IAI7D,iBAAiB;IAoKjB,YAAY,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC,0BAA0B;IAuBzE,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,UAAU,EAAE;CAWrC"}

package/dist/subChannelRepository/observers/{liveCollection → getSubChannels}/SubChannelPaginationController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SubChannelPaginationController.d.ts","sourceRoot":"","sources":["../../../../src/subChannelRepository/observers/liveCollection/SubChannelPaginationController.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAKlF;;;GAGG;AACH,qBAAa,8BAA+B,SAAQ,oBAAoB,CACtE,YAAY,EACZ,KAAK,CAAC,wBAAwB,CAC/B;IACO,UAAU,CAAC,WAAW,EAAE,KAAK,CAAC,wBAAwB,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS;CAmBxF"}
+{"version":3,"file":"SubChannelPaginationController.d.ts","sourceRoot":"","sources":["../../../../src/subChannelRepository/observers/getSubChannels/SubChannelPaginationController.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAKlF;;;GAGG;AACH,qBAAa,8BAA+B,SAAQ,oBAAoB,CACtE,YAAY,EACZ,KAAK,CAAC,wBAAwB,CAC/B;IACO,UAAU,CAAC,WAAW,EAAE,KAAK,CAAC,wBAAwB,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS;CAmBxF"}

package/dist/subChannelRepository/observers/{liveCollection → getSubChannels}/SubChannelQueryStreamController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SubChannelQueryStreamController.d.ts","sourceRoot":"","sources":["../../../../src/subChannelRepository/observers/liveCollection/SubChannelQueryStreamController.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AAKpF,qBAAa,+BAAgC,SAAQ,qBAAqB,CACxE,KAAK,CAAC,iBAAiB,EACvB,KAAK,CAAC,wBAAwB,CAC/B;IACC,OAAO,CAAC,YAAY,CAAqD;IAEzE,OAAO,CAAC,cAAc,CAEyB;gBAG7C,KAAK,EAAE,KAAK,CAAC,wBAAwB,EACrC,QAAQ,EAAE,MAAM,EAAE,EAClB,YAAY,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,0BAA0B,KAAK,IAAI,EAChE,cAAc,EAAE,CACd,QAAQ,EAAE,KAAK,CAAC,iBAAiB,KAC9B,OAAO,CAAC,KAAK,CAAC,0BAA0B,CAAC;IAO1C,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,iBAAiB;IAWpD,mBAAmB,CACjB,QAAQ,EAAE,KAAK,CAAC,iBAAiB,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,EAC7D,SAAS,EAAE,KAAK,CAAC,2BAA2B,EAC5C,OAAO,UAAQ;IAuBjB,OAAO,CAAC,MAAM,EAAE,MAAM,aACH,MAAM,UAAU,GAAG,MAAM,UAAU,EAAE;IAkBxD,YAAY,CACV,gBAAgB,EAAE;QAChB,EAAE,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC,KAAK,KAAK,CAAC,YAAY,CAAC;QAC3F,MAAM,EAAE,MAAM,CAAC;KAChB,EAAE;CAIN"}
+{"version":3,"file":"SubChannelQueryStreamController.d.ts","sourceRoot":"","sources":["../../../../src/subChannelRepository/observers/getSubChannels/SubChannelQueryStreamController.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AAKpF,qBAAa,+BAAgC,SAAQ,qBAAqB,CACxE,KAAK,CAAC,iBAAiB,EACvB,KAAK,CAAC,wBAAwB,CAC/B;IACC,OAAO,CAAC,YAAY,CAAqD;IAEzE,OAAO,CAAC,cAAc,CAEyB;gBAG7C,KAAK,EAAE,KAAK,CAAC,wBAAwB,EACrC,QAAQ,EAAE,MAAM,EAAE,EAClB,YAAY,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,0BAA0B,KAAK,IAAI,EAChE,cAAc,EAAE,CACd,QAAQ,EAAE,KAAK,CAAC,iBAAiB,KAC9B,OAAO,CAAC,KAAK,CAAC,0BAA0B,CAAC;IAO1C,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,iBAAiB;IAWpD,mBAAmB,CACjB,QAAQ,EAAE,KAAK,CAAC,iBAAiB,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,EAC7D,SAAS,EAAE,KAAK,CAAC,2BAA2B,EAC5C,OAAO,UAAQ;IAuBjB,OAAO,CAAC,MAAM,EAAE,MAAM,aACH,MAAM,UAAU,GAAG,MAAM,UAAU,EAAE;IAkBxD,YAAY,CACV,gBAAgB,EAAE;QAChB,EAAE,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC,KAAK,KAAK,CAAC,YAAY,CAAC;QAC3F,MAAM,EAAE,MAAM,CAAC;KAChB,EAAE;CAIN"}

package/dist/subChannelRepository/observers/getSubChannels/getSubChannels.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getSubChannels.d.ts","sourceRoot":"","sources":["../../../../src/subChannelRepository/observers/getSubChannels/getSubChannels.ts"],"names":[],"mappings":"AASA;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,cAAc,WACjB,MAAM,wBAAwB,YAC5B,MAAM,sBAAsB,CAAC,MAAM,UAAU,CAAC,WAC/C,MAAM,oBAAoB,eAuBpC,CAAC"}

package/dist/subChannelRepository/observers/getSubChannels/index.d.ts

@@ -0,0 +1,2 @@
+export * from './getSubChannels';
+//# sourceMappingURL=index.d.ts.map

package/dist/subChannelRepository/observers/getSubChannels/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/subChannelRepository/observers/getSubChannels/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amityco/ts-sdk",
-  "version": "6.17.0",
+  "version": "6.17.1-1144fc8.0",
   "license": "CC-BY-ND-4.0",
   "author": "amity.co <developers@amity.co> (https://amity.co)",
   "description": "Amity Social Cloud Typescript SDK",

package/src/@types/core/permissions.ts

@@ -2,6 +2,16 @@ export {};
 
 declare global {
   namespace Amity {
+    const enum PermissionDomain {
+      Channel = 'channel',
+      Community = 'community',
+      CommunityCategory = 'communityCategory',
+      Network = 'network',
+      Notification = 'notification',
+      User = 'user',
+      UserFeed = 'userFeed',
+    }
+
     const enum Permission {
       EditUserPermission = 'EDIT_USER',
       BanUserPermission = 'BAN_USER',
@@ -71,5 +81,11 @@ declare global {
       permissions: Permission[];
     } & Amity.Timestamps &
       Amity.SoftDelete;
+
+    type PermissionChecker = {
+      community: (communityId: Amity.Community['communityId']) => boolean;
+      channel: (channelId: Amity.Channel['channelId']) => boolean;
+      currentUser: () => boolean;
+    };
   }
 }

package/src/@types/domains/client.ts

@@ -40,6 +40,8 @@ declare global {
       ws: SocketIOClient.Socket;
       emitter: Emitter<Amity.Events>;
 
+      hasPermission: (permission: string) => Amity.PermissionChecker;
+
       sessionState: Amity.SessionStates;
       sessionHandler?: Amity.SessionHandler;
 

package/src/analytic/api/queryReachUser.ts

@@ -23,7 +23,7 @@ export const queryReachUser = async ({
     params.limit = limit;
   }
 
-  const view = viewedType === 'post' ? 'posts' : 'stories'
+  const view = viewedType === 'post' ? 'posts' : 'stories';
   const url = `/api/v1/analytics/views/${view}/${viewId}/users`;
 
   const response = await client.http.get(url, {

package/src/channelRepository/channelMembership/observers/{getMembers.ts → getMembers/getMembers.ts}

@@ -7,8 +7,8 @@ import {
   sortByLastCreated,
 } from '~/core/query';
 import { ENABLE_CACHE_MESSAGE } from '~/utils/constants';
-import { ChannelMemberLiveCollectionController } from './liveCollection/ChannelMemberLiveCollectionController';
 import { dropFromCache } from '~/cache/api';
+import { ChannelMemberLiveCollectionController } from './ChannelMemberLiveCollectionController';
 
 /*
  * Exported for testing

package/src/channelRepository/channelMembership/observers/getMembers/index.ts

@@ -0,0 +1 @@
+export * from './getMembers';

package/src/channelRepository/observers/{getChannels.ts → getChannels/getChannels.ts}

@@ -3,7 +3,7 @@
 import { dropFromCache } from '~/cache/api';
 import { getActiveClient } from '~/client/api';
 import { ENABLE_CACHE_MESSAGE } from '~/utils/constants';
-import { ChannelLiveCollectionController } from './liveCollection/ChannelLiveCollectionController';
+import { ChannelLiveCollectionController } from './ChannelLiveCollectionController';
 
 /* begin_public_function
   id: channel.query

package/src/channelRepository/observers/getChannels/index.ts

@@ -0,0 +1 @@
+export * from './getChannels';

package/src/client/api/createClient.ts

@@ -12,9 +12,10 @@ import {
 import { createEventEmitter } from '~/core/events';
 
 import { getMessagePreviewSetting } from '~/client/utils/messagePreviewEngine';
+import { getSocialSettings } from '~/client/api/getSocialSettings';
+import { hasPermission } from '~/client/utils/hasPermission';
 import { getActiveClient, setActiveClient } from './activeClient';
 import { getFeedSettings } from './getFeedSettings';
-import { getSocialSettings } from '~/client/api/getSocialSettings';
 
 import { accessTokenExpiryWatcher } from './accessTokenExpiryWatcher';
 
@@ -96,6 +97,7 @@ export const createClient = (
     accessTokenExpiryWatcher,
     sessionHandler,
 
+    hasPermission,
     getFeedSettings,
     getSocialSettings,
     getMessagePreviewSetting,

package/src/client/utils/hasPermission/checkChannelPermission.ts

@@ -0,0 +1,22 @@
+import { pullFromCache } from '~/cache/api';
+import { checkUserPermission } from './checkUserPermission';
+
+export const checkChannelPermission = (
+  userId: Amity.User['userId'] | undefined,
+  permission: string,
+  channelId: Amity.Channel['channelId'],
+) => {
+  if (!userId) return false;
+
+  const member = pullFromCache<Amity.Membership<'channel'>>([
+    'channelUsers',
+    'get',
+    `${channelId}#${userId}`,
+  ])?.data;
+
+  if (!member) return false;
+
+  if (member.permissions.some(x => x === permission)) return true;
+
+  return checkUserPermission(userId, permission);
+};

package/src/client/utils/hasPermission/checkCommunityPermission.ts

@@ -0,0 +1,22 @@
+import { pullFromCache } from '~/cache/api';
+import { checkUserPermission } from './checkUserPermission';
+
+export const checkCommunityPermission = (
+  userId: Amity.User['userId'] | undefined,
+  permission: string,
+  communityId: Amity.Community['communityId'],
+) => {
+  if (!userId) return false;
+
+  const member = pullFromCache<Amity.Membership<'community'>>([
+    'communityUsers',
+    'get',
+    `${communityId}#${userId}`,
+  ])?.data;
+
+  if (!member) return false;
+
+  if (member.permissions.some(x => x === permission)) return true;
+
+  return checkUserPermission(userId, permission);
+};

package/src/client/utils/hasPermission/checkUserPermission.ts

@@ -0,0 +1,12 @@
+import { pullFromCache } from '~/cache/api';
+
+export const checkUserPermission = (
+  userId: Amity.User['userId'] | undefined,
+  permission: string,
+) => {
+  const user = pullFromCache<Amity.User>(['users', 'get', userId])?.data;
+
+  if (!user) return false;
+
+  return user.permissions.some(x => x === permission);
+};

package/src/client/utils/hasPermission/hasPermission.ts

@@ -0,0 +1,18 @@
+import { getActiveClient } from '~/client/api/activeClient';
+import { checkCommunityPermission } from '~/client/utils/hasPermission/checkCommunityPermission';
+import { checkChannelPermission } from '~/client/utils/hasPermission/checkChannelPermission';
+import { checkUserPermission } from '~/client/utils/hasPermission/checkUserPermission';
+
+export const hasPermission = (permission: string) => {
+  const { userId } = getActiveClient();
+
+  return {
+    currentUser: () => checkUserPermission(userId, permission),
+
+    community: (communityId: Amity.Community['communityId']) =>
+      checkCommunityPermission(userId, permission, communityId),
+
+    channel: (channelId: Amity.Channel['channelId']) =>
+      checkChannelPermission(userId, permission, channelId),
+  };
+};

package/src/client/utils/hasPermission/index.ts

@@ -0,0 +1 @@
+export * from './hasPermission';

package/src/commentRepository/events/utils.ts

@@ -44,8 +44,7 @@ export const createCommentEventSubscriber = (
           }
 
           const queries = queryCache<Amity.InternalComment[]>(['comment', 'query'])?.filter(
-            ({ key }) =>
-              (key[2] as Amity.QueryComments)?.referenceId === comment.data.referenceId,
+            ({ key }) => (key[2] as Amity.QueryComments)?.referenceId === comment.data.referenceId,
           );
 
           queries?.map(({ key, data }) => upsertInCache(key, data as any, { cachedAt: -1 }));

package/src/core/liveCollection/LiveCollectionController.ts

@@ -1,6 +1,6 @@
 import { convertGetterPropsToStatic } from '~/utils/object';
-import { PaginationController } from './PaginationController';
 import { isEqual } from '~/utils/isEqual';
+import { PaginationController } from './PaginationController';
 import { PaginationNoPageController } from './PaginationNoPageController';
 
 export abstract class LiveCollectionController<
@@ -116,7 +116,7 @@ export abstract class LiveCollectionController<
 
   protected abstract persistModel(
     response: Amity.Payloads[TPayloadDomain] & Partial<Amity.Pagination>,
-  ): Promise<void>;
+  ): Promise<void> | void;
 
   protected abstract persistQueryStream({
     response,

package/src/core/liveCollection/QueryStreamController.ts

@@ -11,7 +11,7 @@ export abstract class QueryStreamController<
     this.cacheKey = cacheKey;
   }
 
-  abstract saveToMainDB(response: TQueryResponse): Promise<void>;
+  abstract saveToMainDB(response: TQueryResponse): Promise<void> | void;
 
   abstract appendToQueryStream(
     response: TQueryResponse & Amity.Pagination,

package/src/messageRepository/observers/{getMessages.ts → getMessages/getMessages.ts}

@@ -1,32 +1,10 @@
 /* eslint-disable no-use-before-define */
-import { getResolver } from '~/core/model';
 import { getActiveClient } from '~/client/api';
-import { dropFromCache, pullFromCache, pushToCache } from '~/cache/api';
-import { createQuery, filterByPropEquality, queryOptions, runQuery } from '~/core/query';
-import { onMessageMarked, onMessageMarkerFetched } from '~/marker/events';
-import { uuid } from '~/core/uuid';
+import { dropFromCache } from '~/cache/api';
+import { filterByPropEquality } from '~/core/query';
 
-import {
-  COLLECTION_DEFAULT_CACHING_POLICY,
-  COLLECTION_DEFAULT_PAGINATION_LIMIT,
-  ENABLE_CACHE_MESSAGE,
-} from '~/utils/constants';
-
-import { CACHE_SHORTEN_LIFESPAN } from '~/cache/utils';
-import { convertEventPayload } from '~/utils/event';
-import {
-  onMessageCreated,
-  onMessageDeleted,
-  onMessageFlagCleared,
-  onMessageFlagged,
-  onMessageReactionAdded,
-  onMessageReactionRemoved,
-  onMessageUnflagged,
-  onMessageUpdated,
-} from '../events';
-import { onMessageFetched } from '../events/onMessageFetched';
-import { queryMessages } from '../api/queryMessages';
-import { MessageLiveCollectionController } from './liveCollection/MessageLiveCollectionController';
+import { ENABLE_CACHE_MESSAGE } from '~/utils/constants';
+import { MessageLiveCollectionController } from './MessageLiveCollectionController';
 
 /*
  * Exported for testing

package/src/messageRepository/observers/getMessages/index.ts

@@ -0,0 +1 @@
+export * from './getMessages';

package/src/subChannelRepository/observers/{getSubChannels.ts → getSubChannels/getSubChannels.ts}

@@ -2,7 +2,7 @@
 import { getActiveClient } from '~/client/api';
 import { ENABLE_CACHE_MESSAGE } from '~/utils/constants';
 import { dropFromCache } from '~/cache/api';
-import { SubChannelLiveCollectionController } from './liveCollection/SubChannelLiveCollectionController';
+import { SubChannelLiveCollectionController } from './SubChannelLiveCollectionController';
 
 /* begin_public_function
   id: subchannel.query

package/src/subChannelRepository/observers/getSubChannels/index.ts

@@ -0,0 +1 @@
+export * from './getSubChannels';

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

@@ -1 +0,0 @@
-{"version":3,"file":"getMembers.d.ts","sourceRoot":"","sources":["../../../../src/channelRepository/channelMembership/observers/getMembers.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,WAAW,6DAEd,MAAM,4BAA4B,QAqC3C,CAAC;AAKF;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,UAAU,WACb,MAAM,4BAA4B,YAChC,MAAM,sBAAsB,CAAC,MAAM,UAAU,CAAC,SAAS,CAAC,CAAC,WAC1D,MAAM,oBAAoB,eAyBpC,CAAC"}

package/dist/channelRepository/channelMembership/observers/liveCollection/ChannelMemberLiveCollectionController.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ChannelMemberLiveCollectionController.d.ts","sourceRoot":"","sources":["../../../../../src/channelRepository/channelMembership/observers/liveCollection/ChannelMemberLiveCollectionController.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iCAAiC,EAAE,MAAM,qCAAqC,CAAC;AAExF,OAAO,EAAE,wBAAwB,EAAE,MAAM,gDAAgD,CAAC;AAoB1F,qBAAa,qCAAsC,SAAQ,wBAAwB,CACjF,aAAa,EACb,KAAK,CAAC,4BAA4B,EAClC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,EAC3B,iCAAiC,CAClC;IACC,OAAO,CAAC,qBAAqB,CAAqC;IAElE,OAAO,CAAC,KAAK,CAAqC;gBAGhD,KAAK,EAAE,KAAK,CAAC,4BAA4B,EACzC,QAAQ,EAAE,KAAK,CAAC,sBAAsB,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAoBrE,SAAS,CAAC,KAAK;cAUC,YAAY,CAAC,YAAY,EAAE,KAAK,CAAC,wBAAwB,GAAG,KAAK,CAAC,UAAU;IAI5F,SAAS,CAAC,kBAAkB,CAAC,EAC3B,QAAQ,EACR,SAAS,EACT,OAAO,GACR,EAAE,KAAK,CAAC,sCAAsC,CAAC,aAAa,CAAC;IAI9D,iBAAiB;IAajB,YAAY,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC,0BAA0B;IAsBzE,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;CAuChD"}

package/dist/channelRepository/channelMembership/observers/liveCollection/ChannelMemberPaginationController.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ChannelMemberPaginationController.d.ts","sourceRoot":"","sources":["../../../../../src/channelRepository/channelMembership/observers/liveCollection/ChannelMemberPaginationController.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAGlF;;;GAGG;AACH,qBAAa,iCAAkC,SAAQ,oBAAoB,CACzE,aAAa,EACb,KAAK,CAAC,4BAA4B,CACnC;IACO,UAAU,CAAC,WAAW,EAAE,KAAK,CAAC,4BAA4B,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS;;;;;CAc5F"}

package/dist/channelRepository/channelMembership/observers/liveCollection/ChannelMemberQueryStreamController.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ChannelMemberQueryStreamController.d.ts","sourceRoot":"","sources":["../../../../../src/channelRepository/channelMembership/observers/liveCollection/ChannelMemberQueryStreamController.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AAMpF,qBAAa,kCAAmC,SAAQ,qBAAqB,CAC3E,KAAK,CAAC,wBAAwB,EAC9B,KAAK,CAAC,4BAA4B,CACnC;IACC,OAAO,CAAC,YAAY,CAAqD;IAEzE,OAAO,CAAC,cAAc,CAEsB;gBAG1C,KAAK,EAAE,KAAK,CAAC,4BAA4B,EACzC,QAAQ,EAAE,MAAM,EAAE,EAClB,YAAY,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,0BAA0B,KAAK,IAAI,EAChE,cAAc,EAAE,CACd,QAAQ,EAAE,KAAK,CAAC,wBAAwB,KACrC,OAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC;IAOvC,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,wBAAwB;IAW3D,mBAAmB,CACjB,QAAQ,EAAE,KAAK,CAAC,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,EAC1D,SAAS,EAAE,KAAK,CAAC,2BAA2B,EAC5C,OAAO,UAAQ;IA6BjB,OAAO,CAAC,MAAM,EAAE,MAAM,aACH,MAAM,OAAO,iBAAiB,MAAM,UAAU,CAAC,SAAS,CAAC;IAwB5E,YAAY,CACV,gBAAgB,EAAE;QAChB,EAAE,EAAE,CACF,OAAO,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,IAAI,KAClF,KAAK,CAAC,YAAY,CAAC;QACxB,MAAM,EAAE,MAAM,CAAC;KAChB,EAAE;CAIN"}

package/dist/channelRepository/observers/getChannels.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getChannels.d.ts","sourceRoot":"","sources":["../../../src/channelRepository/observers/getChannels.ts"],"names":[],"mappings":"AAUA;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,WAAW,WACd,MAAM,qBAAqB,YACzB,MAAM,sBAAsB,CAAC,MAAM,OAAO,CAAC,WAC5C,MAAM,oBAAoB,eAuBpC,CAAC"}

package/dist/channelRepository/observers/liveCollection/ChannelLiveCollectionController.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ChannelLiveCollectionController.d.ts","sourceRoot":"","sources":["../../../../src/channelRepository/observers/liveCollection/ChannelLiveCollectionController.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAE5E,OAAO,EAAE,wBAAwB,EAAE,MAAM,gDAAgD,CAAC;AAsC1F,OAAO,EAAE,iCAAiC,EAAE,MAAM,oCAAoC,CAAC;AAGvF,qBAAa,+BAAgC,SAAQ,wBAAwB,CAC3E,SAAS,EACT,KAAK,CAAC,qBAAqB,EAC3B,KAAK,CAAC,OAAO,EACb,2BAA2B,GAAG,iCAAiC,CAChE;IACC,OAAO,CAAC,qBAAqB,CAA+B;IAE5D,OAAO,CAAC,KAAK,CAA8B;gBAGzC,KAAK,EAAE,KAAK,CAAC,qBAAqB,EAClC,QAAQ,EAAE,KAAK,CAAC,sBAAsB,CAAC,KAAK,CAAC,OAAO,CAAC;IAsBvD,SAAS,CAAC,KAAK;cAUC,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,cAAc,GAAG,KAAK,CAAC,UAAU;IAI9E,SAAS,CAAC,kBAAkB,CAAC,EAC3B,QAAQ,EACR,SAAS,EACT,OAAO,GACR,EAAE,KAAK,CAAC,sCAAsC,CAAC,SAAS,CAAC;IAI1D,iBAAiB;IAIjB,YAAY,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC,0BAA0B;IAgCzE,OAAO,CAAC,WAAW;IA4DnB,OAAO,CAAC,WAAW;IAQnB,OAAO,CAAC,MAAM,CAAC,wBAAwB;IAKvC,OAAO,CAAC,MAAM,CAAC,uBAAuB;IAQtC,OAAO,CAAC,gBAAgB;CAiMzB"}

package/dist/channelRepository/observers/liveCollection/ChannelPaginationController.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ChannelPaginationController.d.ts","sourceRoot":"","sources":["../../../../src/channelRepository/observers/liveCollection/ChannelPaginationController.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAGlF;;;GAGG;AACH,qBAAa,2BAA4B,SAAQ,oBAAoB,CACnE,SAAS,EACT,KAAK,CAAC,qBAAqB,CAC5B;IACO,UAAU,CAAC,WAAW,EAAE,KAAK,CAAC,qBAAqB,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS;;;;;;CAsBrF"}

package/dist/channelRepository/observers/liveCollection/ChannelPagnationNoPageController.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ChannelPagnationNoPageController.d.ts","sourceRoot":"","sources":["../../../../src/channelRepository/observers/liveCollection/ChannelPagnationNoPageController.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,0BAA0B,EAAE,MAAM,kDAAkD,CAAC;AAG9F,qBAAa,iCAAkC,SAAQ,0BAA0B,CAC/E,SAAS,EACT,IAAI,CAAC,KAAK,CAAC,qBAAqB,EAAE,YAAY,CAAC,CAChD;IACO,UAAU,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,qBAAqB,EAAE,YAAY,CAAC;CAS9E"}

package/dist/channelRepository/observers/liveCollection/ChannelQueryStreamController.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ChannelQueryStreamController.d.ts","sourceRoot":"","sources":["../../../../src/channelRepository/observers/liveCollection/ChannelQueryStreamController.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AAMpF,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAAE,iCAAiC,EAAE,MAAM,oCAAoC,CAAC;AAEvF,qBAAa,4BAA6B,SAAQ,qBAAqB,CACrE,KAAK,CAAC,cAAc,EACpB,KAAK,CAAC,qBAAqB,CAC5B;IACC,OAAO,CAAC,YAAY,CAAqD;IAEzE,OAAO,CAAC,cAAc,CAEsB;IAE5C,OAAO,CAAC,oBAAoB,CAAkE;gBAG5F,KAAK,EAAE,KAAK,CAAC,qBAAqB,EAClC,QAAQ,EAAE,MAAM,EAAE,EAClB,YAAY,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,0BAA0B,KAAK,IAAI,EAChE,cAAc,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC,cAAc,KAAK,OAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC,EAC1F,oBAAoB,EAAE,2BAA2B,GAAG,iCAAiC;IAQjF,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,cAAc;IAWjD,mBAAmB,CACjB,QAAQ,EAAE,KAAK,CAAC,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,EAC1D,SAAS,EAAE,KAAK,CAAC,2BAA2B,EAC5C,OAAO,UAAQ;IAiBjB,OAAO,CAAC,MAAM,EAAE,MAAM,aACH,MAAM,OAAO;IAahC,YAAY,CACV,gBAAgB,EAAE;QAChB,EAAE,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,KAAK,CAAC,YAAY,CAAC;QACnE,MAAM,EAAE,MAAM,CAAC;KAChB,EAAE;CAIN"}

package/dist/messageRepository/observers/getMessages.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getMessages.d.ts","sourceRoot":"","sources":["../../../src/messageRepository/observers/getMessages.ts"],"names":[],"mappings":"AAkCA,eAAO,MAAM,WAAW,oDAEd,MAAM,sBAAsB,QA2CrC,CAAC;AAKF;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,WAAW,WACd,MAAM,sBAAsB,YAC1B,MAAM,sBAAsB,CAAC,MAAM,OAAO,CAAC,WAC5C,MAAM,oBAAoB,KAClC,MAAM,YAuBR,CAAC"}

package/dist/messageRepository/observers/liveCollection/MessageLiveCollectionController.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"MessageLiveCollectionController.d.ts","sourceRoot":"","sources":["../../../../src/messageRepository/observers/liveCollection/MessageLiveCollectionController.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAa5E,OAAO,EAAE,wBAAwB,EAAE,MAAM,gDAAgD,CAAC;AAK1F,qBAAa,+BAAgC,SAAQ,wBAAwB,CAC3E,SAAS,EACT,KAAK,CAAC,sBAAsB,EAC5B,KAAK,CAAC,OAAO,EACb,2BAA2B,CAC5B;IACC,OAAO,CAAC,qBAAqB,CAA+B;IAE5D,OAAO,CAAC,KAAK,CAA+B;gBAG1C,KAAK,EAAE,KAAK,CAAC,sBAAsB,EACnC,QAAQ,EAAE,KAAK,CAAC,sBAAsB,CAAC,KAAK,CAAC,OAAO,CAAC;IAqBvD,SAAS,CAAC,KAAK;cAUC,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,cAAc,GAAG,KAAK,CAAC,UAAU;IAI9E,SAAS,CAAC,kBAAkB,CAAC,EAC3B,QAAQ,EACR,SAAS,EACT,OAAO,GACR,EAAE,KAAK,CAAC,sCAAsC,CAAC,SAAS,CAAC;IAI1D,iBAAiB;IAkBjB,YAAY,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC,0BAA0B;IAwBzE,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,EAAE;CA2ClC"}

package/dist/messageRepository/observers/liveCollection/MessagePaginationController.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"MessagePaginationController.d.ts","sourceRoot":"","sources":["../../../../src/messageRepository/observers/liveCollection/MessagePaginationController.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAGlF;;;GAGG;AACH,qBAAa,2BAA4B,SAAQ,oBAAoB,CACnE,SAAS,EACT,KAAK,CAAC,sBAAsB,CAC7B;IACO,UAAU,CAAC,WAAW,EAAE,KAAK,CAAC,sBAAsB,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS;;;;CAmBtF"}

package/dist/messageRepository/observers/liveCollection/MessageQueryStreamController.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"MessageQueryStreamController.d.ts","sourceRoot":"","sources":["../../../../src/messageRepository/observers/liveCollection/MessageQueryStreamController.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AAKpF,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAE5E,qBAAa,4BAA6B,SAAQ,qBAAqB,CACrE,KAAK,CAAC,cAAc,EACpB,KAAK,CAAC,sBAAsB,CAC7B;IACC,OAAO,CAAC,YAAY,CAAqD;IAEzE,OAAO,CAAC,cAAc,CAEsB;IAE5C,OAAO,CAAC,oBAAoB,CAA8B;gBAGxD,KAAK,EAAE,KAAK,CAAC,sBAAsB,EACnC,QAAQ,EAAE,MAAM,EAAE,EAClB,YAAY,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,0BAA0B,KAAK,IAAI,EAChE,cAAc,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC,cAAc,KAAK,OAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC,EAC1F,oBAAoB,EAAE,2BAA2B;IAS7C,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,cAAc;IAWjD,mBAAmB,CACjB,QAAQ,EAAE,KAAK,CAAC,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,EAC1D,SAAS,EAAE,KAAK,CAAC,2BAA2B,EAC5C,OAAO,UAAQ;IAsBjB,OAAO,CAAC,MAAM,EAAE,MAAM,aACH,MAAM,OAAO;IA4DhC,YAAY,CACV,gBAAgB,EAAE;QAChB,EAAE,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,KAAK,CAAC,YAAY,CAAC;QACnE,MAAM,EAAE,MAAM,CAAC;KAChB,EAAE;CAIN"}

package/dist/subChannelRepository/observers/getSubChannels.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getSubChannels.d.ts","sourceRoot":"","sources":["../../../src/subChannelRepository/observers/getSubChannels.ts"],"names":[],"mappings":"AASA;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,cAAc,WACjB,MAAM,wBAAwB,YAC5B,MAAM,sBAAsB,CAAC,MAAM,UAAU,CAAC,WAC/C,MAAM,oBAAoB,eAuBpC,CAAC"}