@amityco/ts-sdk-react-native 6.14.2-5d7d534.0 → 6.15.1-fee6c8f.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/@types/core/events.d.ts +6 -1
- package/dist/@types/core/events.d.ts.map +1 -1
- package/dist/@types/core/live.d.ts +5 -3
- package/dist/@types/core/live.d.ts.map +1 -1
- package/dist/@types/core/model.d.ts +4 -0
- package/dist/@types/core/model.d.ts.map +1 -1
- package/dist/@types/core/payload.d.ts +14 -0
- package/dist/@types/core/payload.d.ts.map +1 -1
- package/dist/@types/core/permissions.d.ts +2 -1
- package/dist/@types/core/permissions.d.ts.map +1 -1
- package/dist/@types/domains/analytics.d.ts +4 -1
- package/dist/@types/domains/analytics.d.ts.map +1 -1
- package/dist/@types/domains/category.d.ts +2 -1
- package/dist/@types/domains/category.d.ts.map +1 -1
- package/dist/@types/domains/channel.d.ts +3 -1
- package/dist/@types/domains/channel.d.ts.map +1 -1
- package/dist/@types/domains/comment.d.ts +1 -1
- package/dist/@types/domains/comment.d.ts.map +1 -1
- package/dist/@types/domains/community.d.ts +8 -3
- package/dist/@types/domains/community.d.ts.map +1 -1
- package/dist/@types/domains/feed.d.ts +15 -0
- package/dist/@types/domains/feed.d.ts.map +1 -1
- package/dist/@types/domains/messagePreview.d.ts +1 -1
- package/dist/@types/domains/messagePreview.d.ts.map +1 -1
- package/dist/@types/domains/partials.d.ts +9 -0
- package/dist/@types/domains/partials.d.ts.map +1 -1
- package/dist/@types/domains/post.d.ts +3 -2
- package/dist/@types/domains/post.d.ts.map +1 -1
- package/dist/@types/domains/story.d.ts +126 -0
- package/dist/@types/domains/story.d.ts.map +1 -0
- package/dist/@types/domains/stream.d.ts +2 -1
- package/dist/@types/domains/stream.d.ts.map +1 -1
- package/dist/@types/domains/subChannel.d.ts +1 -1
- package/dist/@types/domains/subChannel.d.ts.map +1 -1
- package/dist/@types/index.d.ts +1 -0
- package/dist/@types/index.d.ts.map +1 -1
- package/dist/analytic/constant.d.ts +1 -0
- package/dist/analytic/constant.d.ts.map +1 -1
- package/dist/analytic/service/analytic/AnalyticsEngine.d.ts +1 -0
- package/dist/analytic/service/analytic/AnalyticsEngine.d.ts.map +1 -1
- package/dist/analytic/service/analytic/AnalyticsEventCapturer.d.ts +5 -0
- package/dist/analytic/service/analytic/AnalyticsEventCapturer.d.ts.map +1 -1
- package/dist/analytic/service/analytic/AnalyticsEventSyncer.d.ts +2 -0
- package/dist/analytic/service/analytic/AnalyticsEventSyncer.d.ts.map +1 -1
- package/dist/categoryRepository/internalApi/queryCategories.d.ts +2 -2
- package/dist/categoryRepository/internalApi/queryCategories.d.ts.map +1 -1
- package/dist/categoryRepository/observers/getCategories.d.ts.map +1 -1
- package/dist/channelRepository/api/createChannel.d.ts +1 -1
- package/dist/channelRepository/api/createChannel.d.ts.map +1 -1
- package/dist/channelRepository/channelMembership/observers/getMembers.d.ts.map +1 -1
- package/dist/channelRepository/channelMembership/observers/liveCollection/ChannelMemberLiveCollectionController.d.ts +14 -0
- package/dist/channelRepository/channelMembership/observers/liveCollection/ChannelMemberLiveCollectionController.d.ts.map +1 -0
- package/dist/channelRepository/channelMembership/observers/liveCollection/ChannelMemberPaginationController.d.ts +13 -0
- package/dist/channelRepository/channelMembership/observers/liveCollection/ChannelMemberPaginationController.d.ts.map +1 -0
- package/dist/channelRepository/channelMembership/observers/liveCollection/ChannelMemberQueryStreamController.d.ts +14 -0
- package/dist/channelRepository/channelMembership/observers/liveCollection/ChannelMemberQueryStreamController.d.ts.map +1 -0
- package/dist/channelRepository/observers/getChannels.d.ts.map +1 -1
- package/dist/channelRepository/observers/liveCollection/ChannelLiveCollectionController.d.ts +19 -0
- package/dist/channelRepository/observers/liveCollection/ChannelLiveCollectionController.d.ts.map +1 -0
- package/dist/channelRepository/observers/liveCollection/ChannelPaginationController.d.ts +14 -0
- package/dist/channelRepository/observers/liveCollection/ChannelPaginationController.d.ts.map +1 -0
- package/dist/channelRepository/observers/liveCollection/ChannelPagnationNoPageController.d.ts +5 -0
- package/dist/channelRepository/observers/liveCollection/ChannelPagnationNoPageController.d.ts.map +1 -0
- package/dist/channelRepository/observers/liveCollection/ChannelQueryStreamController.d.ts +17 -0
- package/dist/channelRepository/observers/liveCollection/ChannelQueryStreamController.d.ts.map +1 -0
- package/dist/channelRepository/utils/prepareChannelPayload.d.ts +1 -0
- package/dist/channelRepository/utils/prepareChannelPayload.d.ts.map +1 -1
- package/dist/communityRepository/api/createCommunity.d.ts +1 -1
- package/dist/communityRepository/api/createCommunity.d.ts.map +1 -1
- package/dist/communityRepository/api/queryCommunities.d.ts +1 -1
- package/dist/communityRepository/api/queryCommunities.d.ts.map +1 -1
- package/dist/communityRepository/api/updateCommunity.d.ts +1 -1
- package/dist/communityRepository/api/updateCommunity.d.ts.map +1 -1
- package/dist/communityRepository/communityMembership/api/queryCommunityMembers.d.ts +2 -7
- package/dist/communityRepository/communityMembership/api/queryCommunityMembers.d.ts.map +1 -1
- package/dist/communityRepository/communityMembership/observers/getMembers.d.ts.map +1 -1
- package/dist/communityRepository/observers/getCommunities.d.ts.map +1 -1
- package/dist/communityRepository/utils/payload.d.ts +2 -1
- package/dist/communityRepository/utils/payload.d.ts.map +1 -1
- package/dist/core/events.d.ts +3 -3
- package/dist/core/events.d.ts.map +1 -1
- package/dist/core/liveCollection/LiveCollectionController.d.ts +3 -2
- package/dist/core/liveCollection/LiveCollectionController.d.ts.map +1 -1
- package/dist/core/liveCollection/PaginationNoPageController.d.ts +9 -0
- package/dist/core/liveCollection/PaginationNoPageController.d.ts.map +1 -0
- package/dist/core/model/idResolvers.d.ts.map +1 -1
- package/dist/core/model/index.d.ts.map +1 -1
- package/dist/core/query/sorting.d.ts +14 -0
- package/dist/core/query/sorting.d.ts.map +1 -1
- package/dist/feedRepository/api/getCustomRankingGlobalFeed.d.ts +36 -2
- package/dist/feedRepository/api/getCustomRankingGlobalFeed.d.ts.map +1 -1
- package/dist/feedRepository/api/queryGlobalFeed.d.ts +24 -6
- package/dist/feedRepository/api/queryGlobalFeed.d.ts.map +1 -1
- package/dist/index.cjs.js +7936 -7216
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.esm.js +5842 -5121
- package/dist/index.umd.js +4 -4
- package/dist/marker/api/getChannelMarkers.d.ts +2 -5
- package/dist/marker/api/getChannelMarkers.d.ts.map +1 -1
- package/dist/marker/api/getMessageMarkers.d.ts +3 -4
- package/dist/marker/api/getMessageMarkers.d.ts.map +1 -1
- package/dist/marker/events/onMessageMarked.d.ts.map +1 -1
- package/dist/messagePreview/utils/getChannelMessagePreviewWithUser.d.ts +1 -47
- package/dist/messagePreview/utils/getChannelMessagePreviewWithUser.d.ts.map +1 -1
- package/dist/messageRepository/observers/liveCollection/MessageLiveCollectionController.d.ts.map +1 -1
- package/dist/messageRepository/observers/liveCollection/MessageQueryStreamController.d.ts +1 -1
- package/dist/messageRepository/observers/liveCollection/MessageQueryStreamController.d.ts.map +1 -1
- package/dist/postRepository/api/queryPosts.d.ts +1 -1
- package/dist/postRepository/api/queryPosts.d.ts.map +1 -1
- package/dist/postRepository/observers/getPosts.d.ts.map +1 -1
- package/dist/role/api/queryRoles.d.ts +9 -1
- package/dist/role/api/queryRoles.d.ts.map +1 -1
- package/dist/storyRepository/api/createImageStory.d.ts +17 -0
- package/dist/storyRepository/api/createImageStory.d.ts.map +1 -0
- package/dist/storyRepository/api/createVideoStory.d.ts +15 -0
- package/dist/storyRepository/api/createVideoStory.d.ts.map +1 -0
- package/dist/storyRepository/api/hardDeleteStory.d.ts +2 -0
- package/dist/storyRepository/api/hardDeleteStory.d.ts.map +1 -0
- package/dist/storyRepository/api/index.d.ts +5 -0
- package/dist/storyRepository/api/index.d.ts.map +1 -0
- package/dist/storyRepository/api/softDeleteStory.d.ts +2 -0
- package/dist/storyRepository/api/softDeleteStory.d.ts.map +1 -0
- package/dist/storyRepository/events/onStoryCreated.d.ts +2 -0
- package/dist/storyRepository/events/onStoryCreated.d.ts.map +1 -0
- package/dist/storyRepository/events/onStoryDeleted.d.ts +2 -0
- package/dist/storyRepository/events/onStoryDeleted.d.ts.map +1 -0
- package/dist/storyRepository/events/onStoryError.d.ts +2 -0
- package/dist/storyRepository/events/onStoryError.d.ts.map +1 -0
- package/dist/storyRepository/index.d.ts +3 -0
- package/dist/storyRepository/index.d.ts.map +1 -0
- package/dist/storyRepository/internalApi/createStory.d.ts +2 -0
- package/dist/storyRepository/internalApi/createStory.d.ts.map +1 -0
- package/dist/storyRepository/internalApi/deleteStory.d.ts +2 -0
- package/dist/storyRepository/internalApi/deleteStory.d.ts.map +1 -0
- package/dist/storyRepository/internalApi/getActiveStoriesByTarget.d.ts +2 -0
- package/dist/storyRepository/internalApi/getActiveStoriesByTarget.d.ts.map +1 -0
- package/dist/storyRepository/observers/getActiveStoriesByTarget.d.ts +2 -0
- package/dist/storyRepository/observers/getActiveStoriesByTarget.d.ts.map +1 -0
- package/dist/storyRepository/observers/index.d.ts +2 -0
- package/dist/storyRepository/observers/index.d.ts.map +1 -0
- package/dist/storyRepository/utils/convertRawToStory.d.ts +3 -0
- package/dist/storyRepository/utils/convertRawToStory.d.ts.map +1 -0
- package/dist/storyRepository/utils/convertStoryPayloadToRaw.d.ts +2 -0
- package/dist/storyRepository/utils/convertStoryPayloadToRaw.d.ts.map +1 -0
- package/dist/storyRepository/utils/createOptimisticEvent.d.ts +6 -0
- package/dist/storyRepository/utils/createOptimisticEvent.d.ts.map +1 -0
- package/dist/storyRepository/utils/getStoryCache.d.ts +5 -0
- package/dist/storyRepository/utils/getStoryCache.d.ts.map +1 -0
- package/dist/streamRepository/api/index.d.ts.map +1 -1
- package/dist/streamRepository/api/queryStreams.d.ts +2 -0
- package/dist/streamRepository/api/queryStreams.d.ts.map +1 -1
- package/dist/streamRepository/internalApi/queryStreams.d.ts +16 -0
- package/dist/streamRepository/internalApi/queryStreams.d.ts.map +1 -0
- package/dist/streamRepository/observers/getStreams.d.ts +1 -1
- package/dist/streamRepository/observers/getStreams.d.ts.map +1 -1
- package/dist/subChannelRepository/observers/getSubChannels.d.ts.map +1 -1
- package/dist/subChannelRepository/observers/liveCollection/SubChannelLiveCollectionController.d.ts +14 -0
- package/dist/subChannelRepository/observers/liveCollection/SubChannelLiveCollectionController.d.ts.map +1 -0
- package/dist/subChannelRepository/observers/liveCollection/SubChannelPaginationController.d.ts +9 -0
- package/dist/subChannelRepository/observers/liveCollection/SubChannelPaginationController.d.ts.map +1 -0
- package/dist/subChannelRepository/observers/liveCollection/SubChannelQueryStreamController.d.ts +14 -0
- package/dist/subChannelRepository/observers/liveCollection/SubChannelQueryStreamController.d.ts.map +1 -0
- package/dist/subChannelRepository/utils/prepareSubChannelPayload.d.ts +1 -0
- package/dist/subChannelRepository/utils/prepareSubChannelPayload.d.ts.map +1 -1
- package/dist/utils/constants.d.ts +5 -0
- package/dist/utils/constants.d.ts.map +1 -1
- package/dist/utils/linkedObject/commentLinkedObject.d.ts.map +1 -1
- package/dist/utils/linkedObject/index.d.ts +1 -0
- package/dist/utils/linkedObject/index.d.ts.map +1 -1
- package/dist/utils/linkedObject/postLinkedObject.d.ts.map +1 -1
- package/dist/utils/linkedObject/storyLinkedObject.d.ts +2 -0
- package/dist/utils/linkedObject/storyLinkedObject.d.ts.map +1 -0
- package/dist/utils/tests/dummy/channel.d.ts +9 -0
- package/dist/utils/tests/dummy/channel.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/@types/core/events.ts +8 -1
- package/src/@types/core/live.ts +7 -4
- package/src/@types/core/model.ts +6 -0
- package/src/@types/core/payload.ts +19 -0
- package/src/@types/core/permissions.ts +1 -0
- package/src/@types/domains/analytics.ts +4 -1
- package/src/@types/domains/category.ts +2 -1
- package/src/@types/domains/channel.ts +4 -1
- package/src/@types/domains/comment.ts +1 -1
- package/src/@types/domains/community.ts +11 -5
- package/src/@types/domains/feed.ts +16 -0
- package/src/@types/domains/messagePreview.ts +1 -1
- package/src/@types/domains/partials.ts +12 -0
- package/src/@types/domains/post.ts +3 -2
- package/src/@types/domains/story.ts +150 -0
- package/src/@types/domains/stream.ts +2 -1
- package/src/@types/domains/subChannel.ts +1 -1
- package/src/@types/index.ts +1 -3
- package/src/analytic/constant.ts +2 -1
- package/src/analytic/service/analytic/AnalyticsEngine.ts +9 -0
- package/src/analytic/service/analytic/AnalyticsEventCapturer.ts +63 -10
- package/src/analytic/service/analytic/AnalyticsEventSyncer.ts +34 -4
- package/src/categoryRepository/internalApi/queryCategories.ts +25 -18
- package/src/categoryRepository/observers/getCategories.ts +4 -3
- package/src/channelRepository/api/createChannel.ts +7 -3
- package/src/channelRepository/channelMembership/observers/getMembers.ts +9 -123
- package/src/channelRepository/channelMembership/observers/liveCollection/ChannelMemberLiveCollectionController.ts +154 -0
- package/src/channelRepository/channelMembership/observers/liveCollection/ChannelMemberPaginationController.ts +28 -0
- package/src/channelRepository/channelMembership/observers/liveCollection/ChannelMemberQueryStreamController.ts +109 -0
- package/src/channelRepository/channelMembership/observers/tests/getMembers.test.ts +3 -1
- package/src/channelRepository/observers/getChannels.ts +10 -316
- package/src/channelRepository/observers/liveCollection/ChannelLiveCollectionController.ts +413 -0
- package/src/channelRepository/observers/liveCollection/ChannelPaginationController.ts +36 -0
- package/src/channelRepository/observers/liveCollection/ChannelPagnationNoPageController.ts +20 -0
- package/src/channelRepository/observers/liveCollection/ChannelQueryStreamController.ts +89 -0
- package/src/channelRepository/observers/tests/getChannel.test.ts +4 -1
- package/src/channelRepository/observers/tests/getChannels.test.ts +153 -40
- package/src/channelRepository/utils/prepareChannelPayload.ts +1 -1
- package/src/client/utils/markerSyncEngine.ts +1 -1
- package/src/communityRepository/api/createCommunity.ts +7 -6
- package/src/communityRepository/api/queryCommunities.ts +12 -14
- package/src/communityRepository/api/test/queryCommunity.test.ts +18 -12
- package/src/communityRepository/api/updateCommunity.ts +4 -3
- package/src/communityRepository/communityMembership/api/queryCommunityMembers.ts +26 -25
- package/src/communityRepository/communityMembership/observers/getMembers.ts +4 -3
- package/src/communityRepository/observers/getCommunities.ts +8 -5
- package/src/communityRepository/utils/payload.ts +7 -2
- package/src/core/liveCollection/LiveCollectionController.ts +19 -5
- package/src/core/liveCollection/PaginationNoPageController.ts +26 -0
- package/src/core/model/idResolvers.ts +2 -0
- package/src/core/model/index.ts +2 -0
- package/src/core/query/sorting.ts +18 -0
- package/src/feedRepository/api/getCustomRankingGlobalFeed.ts +50 -8
- package/src/feedRepository/api/queryGlobalFeed.ts +56 -12
- package/src/index.ts +2 -1
- package/src/marker/api/getChannelMarkers.ts +6 -16
- package/src/marker/api/getMessageMarkers.ts +12 -20
- package/src/marker/api/tests/getChannelMarkers.test.ts +1 -11
- package/src/marker/api/tests/getMessageMarkers.test.ts +1 -11
- package/src/marker/events/onMessageMarked.ts +4 -5
- package/src/messagePreview/utils/getChannelMessagePreviewWithUser.ts +9 -2
- package/src/messageRepository/observers/liveCollection/MessageLiveCollectionController.ts +1 -0
- package/src/messageRepository/observers/liveCollection/MessageQueryStreamController.ts +2 -1
- package/src/postRepository/api/queryPosts.ts +12 -10
- package/src/postRepository/observers/getPosts.ts +7 -4
- package/src/role/api/queryRoles.ts +25 -6
- package/src/storyRepository/api/createImageStory.ts +94 -0
- package/src/storyRepository/api/createVideoStory.ts +92 -0
- package/src/storyRepository/api/hardDeleteStory.ts +6 -0
- package/src/storyRepository/api/index.ts +4 -0
- package/src/storyRepository/api/softDeleteStory.ts +6 -0
- package/src/storyRepository/events/onStoryCreated.ts +14 -0
- package/src/storyRepository/events/onStoryDeleted.ts +14 -0
- package/src/storyRepository/events/onStoryError.ts +14 -0
- package/src/storyRepository/index.ts +2 -0
- package/src/storyRepository/internalApi/createStory.ts +26 -0
- package/src/storyRepository/internalApi/deleteStory.ts +35 -0
- package/src/storyRepository/internalApi/getActiveStoriesByTarget.ts +36 -0
- package/src/storyRepository/observers/getActiveStoriesByTarget.ts +163 -0
- package/src/storyRepository/observers/index.ts +1 -0
- package/src/storyRepository/utils/convertRawToStory.ts +16 -0
- package/src/storyRepository/utils/convertStoryPayloadToRaw.ts +43 -0
- package/src/storyRepository/utils/createOptimisticEvent.ts +63 -0
- package/src/storyRepository/utils/getStoryCache.ts +6 -0
- package/src/streamRepository/api/index.ts +1 -1
- package/src/streamRepository/api/queryStreams.ts +2 -0
- package/src/streamRepository/internalApi/queryStreams.ts +57 -0
- package/src/streamRepository/observers/getStreams.ts +6 -5
- package/src/subChannelRepository/observers/getSubChannels.ts +8 -228
- package/src/subChannelRepository/observers/liveCollection/SubChannelLiveCollectionController.ts +274 -0
- package/src/subChannelRepository/observers/liveCollection/SubChannelPaginationController.ts +35 -0
- package/src/subChannelRepository/observers/liveCollection/SubChannelQueryStreamController.ts +94 -0
- package/src/subChannelRepository/observers/tests/getSubChannels.test.ts +73 -45
- package/src/subChannelRepository/observers/tests/getSubChannelsWithMessagePreview.test.ts +58 -21
- package/src/subChannelRepository/utils/prepareSubChannelPayload.ts +1 -1
- package/src/utils/constants.ts +5 -0
- package/src/utils/linkedObject/commentLinkedObject.ts +3 -1
- package/src/utils/linkedObject/index.ts +2 -0
- package/src/utils/linkedObject/postLinkedObject.ts +4 -2
- package/src/utils/linkedObject/storyLinkedObject.ts +83 -0
- package/src/utils/tests/dummy/channel.ts +14 -4
- package/dist/categoryRepository/api/queryCategories.d.ts +0 -32
- package/dist/categoryRepository/api/queryCategories.d.ts.map +0 -1
- package/src/categoryRepository/api/queryCategories.ts +0 -116
|
@@ -1,18 +1,24 @@
|
|
|
1
1
|
import { pullFromCache } from '~/cache/api/pullFromCache';
|
|
2
2
|
import { dropFromCache } from '~/cache/api/dropFromCache';
|
|
3
|
-
import { MINUTE } from '~/utils/constants';
|
|
4
|
-
import { ANALYTIC_CACHE_KEY } from '../../constant';
|
|
3
|
+
import { MINUTE, SECOND } from '~/utils/constants';
|
|
4
|
+
import { ANALYTIC_CACHE_KEY, HIGH_PRIORITY_ANALYTIC_CACHE_KEY } from '../../constant';
|
|
5
5
|
import { syncEvent } from '../../api/syncEvent';
|
|
6
6
|
|
|
7
7
|
export class AnalyticsEventSyncer {
|
|
8
8
|
_timer: NodeJS.Timeout | undefined = undefined;
|
|
9
9
|
|
|
10
|
+
_high_priority_timer: NodeJS.Timeout | undefined = undefined;
|
|
11
|
+
|
|
10
12
|
start() {
|
|
11
13
|
this.syncCapturedEvent();
|
|
12
14
|
|
|
13
15
|
this._timer = setInterval(() => {
|
|
14
16
|
this.syncCapturedEvent();
|
|
15
17
|
}, 1 * MINUTE);
|
|
18
|
+
|
|
19
|
+
this._high_priority_timer = setInterval(() => {
|
|
20
|
+
this.syncHighPriorityCapturedEvent();
|
|
21
|
+
}, 10 * SECOND);
|
|
16
22
|
}
|
|
17
23
|
|
|
18
24
|
stop() {
|
|
@@ -23,10 +29,10 @@ export class AnalyticsEventSyncer {
|
|
|
23
29
|
|
|
24
30
|
async syncCapturedEvent() {
|
|
25
31
|
try {
|
|
26
|
-
// Must query only objects that
|
|
32
|
+
// Must query only objects that have same userId with current logged-in user.
|
|
27
33
|
// Query captured event with maximum of 1000
|
|
28
34
|
// Order by latest first
|
|
29
|
-
// e.g
|
|
35
|
+
// e.g., If there are 2000 events we will query 1000-2000 first
|
|
30
36
|
const cache = pullFromCache<{ event: Amity.AnalyticEventModel[] }>(ANALYTIC_CACHE_KEY);
|
|
31
37
|
if (!cache?.data) return;
|
|
32
38
|
if (cache.data.event.length === 0) return;
|
|
@@ -42,4 +48,28 @@ export class AnalyticsEventSyncer {
|
|
|
42
48
|
dropFromCache(ANALYTIC_CACHE_KEY);
|
|
43
49
|
}
|
|
44
50
|
}
|
|
51
|
+
|
|
52
|
+
async syncHighPriorityCapturedEvent() {
|
|
53
|
+
try {
|
|
54
|
+
// Must query only objects that have same userId with current logged-in user.
|
|
55
|
+
// Query captured event with maximum of 1000
|
|
56
|
+
// Order by latest first
|
|
57
|
+
// e.g., If there are 2000 events we will query 1000-2000 first
|
|
58
|
+
const cache = pullFromCache<{ event: Amity.AnalyticEventModel[] }>(
|
|
59
|
+
HIGH_PRIORITY_ANALYTIC_CACHE_KEY,
|
|
60
|
+
);
|
|
61
|
+
if (!cache?.data) return;
|
|
62
|
+
if (cache.data.event.length === 0) return;
|
|
63
|
+
|
|
64
|
+
const capturedEvents = cache.data.event;
|
|
65
|
+
|
|
66
|
+
await syncEvent(capturedEvents);
|
|
67
|
+
|
|
68
|
+
dropFromCache(HIGH_PRIORITY_ANALYTIC_CACHE_KEY);
|
|
69
|
+
} catch (error) {
|
|
70
|
+
// stop and destroy all events
|
|
71
|
+
this.stop();
|
|
72
|
+
dropFromCache(HIGH_PRIORITY_ANALYTIC_CACHE_KEY);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
45
75
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { getActiveClient } from '~/client/api/activeClient';
|
|
2
2
|
|
|
3
|
-
import {
|
|
3
|
+
import { toPage } from '~/core/query';
|
|
4
4
|
|
|
5
5
|
import { pullFromCache, pushToCache } from '~/cache/api';
|
|
6
6
|
import { ingestInCache } from '~/cache/api/ingestInCache';
|
|
@@ -10,11 +10,18 @@ import { inferIsDeleted } from '~/utils/inferIsDeleted';
|
|
|
10
10
|
|
|
11
11
|
export const queryCategories = async (
|
|
12
12
|
query?: Amity.QueryCategories,
|
|
13
|
-
): Promise<Amity.Cached<Amity.
|
|
13
|
+
): Promise<Amity.Cached<Amity.PageToken<Amity.InternalCategory>>> => {
|
|
14
14
|
const client = getActiveClient();
|
|
15
15
|
client.log('category/queryCategories', query);
|
|
16
16
|
|
|
17
|
-
const { page
|
|
17
|
+
const { page, limit, includeDeleted, ...params } = query ?? {};
|
|
18
|
+
|
|
19
|
+
const options = (() => {
|
|
20
|
+
if (page) return { token: page };
|
|
21
|
+
if (limit) return { limit };
|
|
22
|
+
|
|
23
|
+
return undefined;
|
|
24
|
+
})();
|
|
18
25
|
|
|
19
26
|
const { data } = await client.http.get<Amity.CategoryPayload & Amity.Pagination>(
|
|
20
27
|
`/api/v3/community-categories`,
|
|
@@ -22,9 +29,7 @@ export const queryCategories = async (
|
|
|
22
29
|
params: {
|
|
23
30
|
...params,
|
|
24
31
|
isDeleted: inferIsDeleted(includeDeleted),
|
|
25
|
-
options
|
|
26
|
-
token: toToken(page, 'skiplimit'),
|
|
27
|
-
},
|
|
32
|
+
options,
|
|
28
33
|
},
|
|
29
34
|
},
|
|
30
35
|
);
|
|
@@ -40,33 +45,36 @@ export const queryCategories = async (
|
|
|
40
45
|
const cacheKey = [
|
|
41
46
|
'category',
|
|
42
47
|
'query',
|
|
43
|
-
{ ...params, includeDeleted, options
|
|
48
|
+
{ ...params, includeDeleted, options } as Amity.Serializable,
|
|
44
49
|
];
|
|
45
50
|
pushToCache(cacheKey, { categories: categories.map(getResolver('category')), paging });
|
|
46
51
|
}
|
|
47
52
|
|
|
48
|
-
const nextPage = toPage(paging.next);
|
|
49
|
-
const prevPage = toPage(paging.previous);
|
|
50
|
-
|
|
51
53
|
return {
|
|
52
54
|
data: categories,
|
|
53
55
|
cachedAt,
|
|
54
|
-
|
|
55
|
-
nextPage,
|
|
56
|
+
paging,
|
|
56
57
|
};
|
|
57
58
|
};
|
|
58
59
|
|
|
59
60
|
queryCategories.locally = (
|
|
60
61
|
query: Parameters<typeof queryCategories>[0],
|
|
61
|
-
): Amity.Cached<Amity.
|
|
62
|
+
): Amity.Cached<Amity.PageToken<Amity.InternalCategory>> | undefined => {
|
|
62
63
|
const client = getActiveClient();
|
|
63
64
|
client.log('category/queryCategories.locally', query);
|
|
64
65
|
|
|
65
66
|
if (!client.cache) return;
|
|
66
67
|
|
|
67
|
-
const { page =
|
|
68
|
+
const { page, limit = 10, ...params } = query ?? {};
|
|
69
|
+
|
|
70
|
+
const options = (() => {
|
|
71
|
+
if (page) return { token: page };
|
|
72
|
+
if (limit) return { limit };
|
|
73
|
+
|
|
74
|
+
return undefined;
|
|
75
|
+
})();
|
|
68
76
|
|
|
69
|
-
const queryKey = ['category', 'query', { ...params, options
|
|
77
|
+
const queryKey = ['category', 'query', { ...params, options } as Amity.Serializable];
|
|
70
78
|
const { data, cachedAt } =
|
|
71
79
|
pullFromCache<{ categories: Pick<Amity.InternalCategory, 'categoryId'>[] } & Amity.Pagination>(
|
|
72
80
|
queryKey,
|
|
@@ -79,10 +87,9 @@ queryCategories.locally = (
|
|
|
79
87
|
.filter(Boolean)
|
|
80
88
|
.map(({ data }) => data);
|
|
81
89
|
|
|
82
|
-
const
|
|
83
|
-
const nextPage = toPage(data?.paging.next);
|
|
90
|
+
const { paging } = data;
|
|
84
91
|
|
|
85
92
|
return categories.length === data?.categories?.length
|
|
86
|
-
? { data: categories, cachedAt,
|
|
93
|
+
? { data: categories, cachedAt, paging }
|
|
87
94
|
: undefined;
|
|
88
95
|
};
|
|
@@ -109,16 +109,17 @@ export const getCategories = (
|
|
|
109
109
|
|
|
110
110
|
const query = createQuery(queryCategories, {
|
|
111
111
|
...queryParams,
|
|
112
|
-
|
|
112
|
+
limit: initial ? limit : undefined,
|
|
113
|
+
page: !initial ? collection?.params.page : undefined,
|
|
113
114
|
});
|
|
114
115
|
|
|
115
116
|
runQuery(
|
|
116
117
|
query,
|
|
117
|
-
({ data: result, error, loading,
|
|
118
|
+
({ data: result, error, loading, paging }) => {
|
|
118
119
|
const data = {
|
|
119
120
|
loading,
|
|
120
121
|
error,
|
|
121
|
-
params: { page },
|
|
122
|
+
params: { page: paging?.next },
|
|
122
123
|
data: categories,
|
|
123
124
|
};
|
|
124
125
|
|
|
@@ -24,7 +24,7 @@ import { prepareChannelPayload } from '../utils';
|
|
|
24
24
|
export const createChannel = async <T extends Amity.ChannelType>(
|
|
25
25
|
bundle: { type: T; userIds?: Amity.InternalUser['userId'][] } & Pick<
|
|
26
26
|
Amity.Channel<T>,
|
|
27
|
-
'displayName' | 'avatarFileId' | 'tags' | 'metadata'
|
|
27
|
+
'displayName' | 'avatarFileId' | 'tags' | 'metadata' | 'isPublic'
|
|
28
28
|
>,
|
|
29
29
|
): Promise<Amity.Cached<Amity.InternalChannel>> => {
|
|
30
30
|
const client = getActiveClient();
|
|
@@ -38,9 +38,13 @@ export const createChannel = async <T extends Amity.ChannelType>(
|
|
|
38
38
|
isDistinct: true,
|
|
39
39
|
});
|
|
40
40
|
} else {
|
|
41
|
-
|
|
42
|
-
}
|
|
41
|
+
const { isPublic, ...restParams } = bundle;
|
|
43
42
|
|
|
43
|
+
payload = await client.http.post<Amity.ChannelPayload>('/api/v3/channels', {
|
|
44
|
+
...restParams,
|
|
45
|
+
isPublic: bundle?.type === 'community' ? isPublic : undefined,
|
|
46
|
+
});
|
|
47
|
+
}
|
|
44
48
|
const data = await prepareChannelPayload(payload.data);
|
|
45
49
|
|
|
46
50
|
const cachedAt = client.cache && Date.now();
|
|
@@ -1,32 +1,14 @@
|
|
|
1
1
|
/* eslint-disable no-use-before-define */
|
|
2
|
-
import { getResolver } from '~/core/model';
|
|
3
|
-
import { pullFromCache, pushToCache } from '~/cache/api';
|
|
4
2
|
import { getActiveClient } from '~/client/api';
|
|
5
3
|
import {
|
|
6
|
-
createQuery,
|
|
7
4
|
filterByPropIntersection,
|
|
8
5
|
filterBySearchTerm,
|
|
9
|
-
queryOptions,
|
|
10
|
-
runQuery,
|
|
11
6
|
sortByFirstCreated,
|
|
12
7
|
sortByLastCreated,
|
|
13
8
|
} from '~/core/query';
|
|
14
|
-
import {
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
ENABLE_CACHE_MESSAGE,
|
|
18
|
-
} from '~/utils/constants';
|
|
19
|
-
import {
|
|
20
|
-
onChannelJoined,
|
|
21
|
-
onChannelLeft,
|
|
22
|
-
onChannelMemberAdded,
|
|
23
|
-
onChannelMemberBanned,
|
|
24
|
-
onChannelMemberRemoved,
|
|
25
|
-
onChannelMemberRoleAdded,
|
|
26
|
-
onChannelMemberRoleRemoved,
|
|
27
|
-
onChannelMemberUnbanned,
|
|
28
|
-
} from '../../events';
|
|
29
|
-
import { queryChannelMembers } from '../api/queryChannelMembers';
|
|
9
|
+
import { ENABLE_CACHE_MESSAGE } from '~/utils/constants';
|
|
10
|
+
import { ChannelMemberLiveCollectionController } from './liveCollection/ChannelMemberLiveCollectionController';
|
|
11
|
+
import { dropFromCache } from '~/cache/api';
|
|
30
12
|
|
|
31
13
|
/*
|
|
32
14
|
* Exported for testing
|
|
@@ -109,110 +91,14 @@ export const getMembers = (
|
|
|
109
91
|
const timestamp = Date.now();
|
|
110
92
|
log(`getMembers(tmpid: ${timestamp}) > listen`);
|
|
111
93
|
|
|
112
|
-
const
|
|
113
|
-
|
|
114
|
-
const limit = queryLimit ?? COLLECTION_DEFAULT_PAGINATION_LIMIT;
|
|
115
|
-
const { policy = COLLECTION_DEFAULT_CACHING_POLICY } = config ?? {};
|
|
116
|
-
|
|
117
|
-
const disposers: Amity.Unsubscriber[] = [];
|
|
118
|
-
|
|
119
|
-
// Put all overlap field to unknown type before convert again to Amity.Serializable
|
|
120
|
-
const cacheKey = ['channelUsers', 'collection', queryParams as unknown as Amity.Serializable];
|
|
121
|
-
const cacheByChannelKey = ['channelUsers', 'collection', { channelId: queryParams.channelId }];
|
|
122
|
-
|
|
123
|
-
const responder = (data: Amity.ChannelMembersLiveCollectionCache, isEventModel = false) => {
|
|
124
|
-
const channelMembers: Amity.Membership<'channel'>[] =
|
|
125
|
-
data.data
|
|
126
|
-
.map(id => pullFromCache<Amity.Membership<'channel'>>(['channelUsers', 'get', id])!)
|
|
127
|
-
.filter(Boolean)
|
|
128
|
-
.map(({ data }) => data) ?? [];
|
|
129
|
-
|
|
130
|
-
callback({
|
|
131
|
-
onNextPage: onFetch,
|
|
132
|
-
/*
|
|
133
|
-
* Only apply filter to RTE Model
|
|
134
|
-
*/
|
|
135
|
-
data: isEventModel ? applyFilter(channelMembers, params) : channelMembers,
|
|
136
|
-
hasNextPage: !!data.params?.page,
|
|
137
|
-
loading: data.loading,
|
|
138
|
-
error: data.error,
|
|
139
|
-
});
|
|
140
|
-
};
|
|
141
|
-
|
|
142
|
-
const realtimeRouter =
|
|
143
|
-
(action: Amity.ChannelMemberActionType) =>
|
|
144
|
-
(channel: Amity.InternalChannel, channelMember: Amity.Membership<'channel'>) => {
|
|
145
|
-
if (params.channelId !== channelMember.channelId) {
|
|
146
|
-
return;
|
|
147
|
-
}
|
|
148
|
-
|
|
149
|
-
const collection = pullFromCache<Amity.ChannelMembersLiveCollectionCache>(cacheKey)?.data;
|
|
150
|
-
if (!collection) return;
|
|
151
|
-
|
|
152
|
-
const channelMemberCacheId = getResolver('channelUsers')({
|
|
153
|
-
channelId: params.channelId,
|
|
154
|
-
userId: channelMember.userId,
|
|
155
|
-
});
|
|
156
|
-
|
|
157
|
-
if (channelMember.membership === 'none') {
|
|
158
|
-
collection.data = collection.data.filter(m => m !== channelMemberCacheId);
|
|
159
|
-
} else if (!collection.data.includes(channelMemberCacheId)) {
|
|
160
|
-
collection.data = [channelMemberCacheId, ...collection.data];
|
|
161
|
-
}
|
|
94
|
+
const channelMemberLiveCollection = new ChannelMemberLiveCollectionController(params, callback);
|
|
95
|
+
const disposers = channelMemberLiveCollection.startSubscription();
|
|
162
96
|
|
|
163
|
-
|
|
164
|
-
pushToCache(cacheByChannelKey, collection);
|
|
165
|
-
|
|
166
|
-
responder(collection, true);
|
|
167
|
-
};
|
|
168
|
-
|
|
169
|
-
const onFetch = (initial = false) => {
|
|
170
|
-
const collection = pullFromCache<Amity.ChannelMembersLiveCollectionCache>(cacheKey)?.data;
|
|
171
|
-
|
|
172
|
-
const channelMembers = collection?.data ?? [];
|
|
173
|
-
|
|
174
|
-
if (!initial && channelMembers.length > 0 && !collection?.params.page) return;
|
|
175
|
-
|
|
176
|
-
const query = createQuery(queryChannelMembers, {
|
|
177
|
-
...queryParams,
|
|
178
|
-
page: (!initial ? collection?.params.page : undefined) ?? { limit },
|
|
179
|
-
});
|
|
180
|
-
|
|
181
|
-
runQuery(
|
|
182
|
-
query,
|
|
183
|
-
({ data: result, error, loading, nextPage: page }) => {
|
|
184
|
-
const data = {
|
|
185
|
-
loading,
|
|
186
|
-
error,
|
|
187
|
-
params: { page },
|
|
188
|
-
data: channelMembers,
|
|
189
|
-
};
|
|
190
|
-
|
|
191
|
-
if (result) {
|
|
192
|
-
data.data = [...new Set([...channelMembers, ...result.map(getResolver('channelUsers'))])];
|
|
193
|
-
}
|
|
194
|
-
|
|
195
|
-
pushToCache(cacheKey, data);
|
|
196
|
-
pushToCache(cacheByChannelKey, data);
|
|
197
|
-
|
|
198
|
-
responder(data);
|
|
199
|
-
},
|
|
200
|
-
queryOptions(policy),
|
|
201
|
-
);
|
|
202
|
-
};
|
|
203
|
-
|
|
204
|
-
disposers.push(
|
|
205
|
-
onChannelJoined(realtimeRouter('onJoin')),
|
|
206
|
-
onChannelLeft(realtimeRouter('onLeft')),
|
|
207
|
-
onChannelMemberAdded(realtimeRouter('onMemberAdded')),
|
|
208
|
-
onChannelMemberRemoved(realtimeRouter('onMemberRemoved')),
|
|
209
|
-
onChannelMemberBanned(realtimeRouter('onChannelMemberBanned')),
|
|
210
|
-
onChannelMemberUnbanned(realtimeRouter('onChannelMemberUnbanned')),
|
|
211
|
-
onChannelMemberRoleAdded(realtimeRouter('onChannelMemberRoleAdded')),
|
|
212
|
-
onChannelMemberRoleRemoved(realtimeRouter('onChannelMemberRoleRemoved')),
|
|
213
|
-
);
|
|
97
|
+
const cacheKey = channelMemberLiveCollection.getCacheKey();
|
|
214
98
|
|
|
215
|
-
|
|
99
|
+
disposers.push(() => {
|
|
100
|
+
dropFromCache(cacheKey);
|
|
101
|
+
});
|
|
216
102
|
|
|
217
103
|
return () => {
|
|
218
104
|
log(`getMembers(tmpid: ${timestamp}) > dispose`);
|
|
@@ -0,0 +1,154 @@
|
|
|
1
|
+
/* eslint-disable no-use-before-define */
|
|
2
|
+
import hash from 'object-hash';
|
|
3
|
+
import { pullFromCache, pushToCache } from '~/cache/api';
|
|
4
|
+
import { ChannelMemberPaginationController } from './ChannelMemberPaginationController';
|
|
5
|
+
import { ChannelMemberQueryStreamController } from './ChannelMemberQueryStreamController';
|
|
6
|
+
import { LiveCollectionController } from '~/core/liveCollection/LiveCollectionController';
|
|
7
|
+
import {
|
|
8
|
+
onChannelJoined,
|
|
9
|
+
onChannelLeft,
|
|
10
|
+
onChannelMemberAdded,
|
|
11
|
+
onChannelMemberRemoved,
|
|
12
|
+
onChannelMemberBanned,
|
|
13
|
+
onChannelMemberUnbanned,
|
|
14
|
+
onChannelMemberRoleAdded,
|
|
15
|
+
onChannelMemberRoleRemoved,
|
|
16
|
+
} from '~/channelRepository/events';
|
|
17
|
+
import {
|
|
18
|
+
filterByPropEquality,
|
|
19
|
+
filterByPropIntersection,
|
|
20
|
+
filterBySearchTerm,
|
|
21
|
+
sortByFirstCreated,
|
|
22
|
+
sortByLastCreated,
|
|
23
|
+
} from '~/core/query';
|
|
24
|
+
import { prepareChannelPayload } from '~/channelRepository/utils';
|
|
25
|
+
|
|
26
|
+
export class ChannelMemberLiveCollectionController extends LiveCollectionController<
|
|
27
|
+
'channelUser',
|
|
28
|
+
Amity.ChannelMembersLiveCollection,
|
|
29
|
+
Amity.Membership<'channel'>,
|
|
30
|
+
ChannelMemberPaginationController
|
|
31
|
+
> {
|
|
32
|
+
private queryStreamController: ChannelMemberQueryStreamController;
|
|
33
|
+
|
|
34
|
+
private query: Amity.ChannelMembersLiveCollection;
|
|
35
|
+
|
|
36
|
+
constructor(
|
|
37
|
+
query: Amity.ChannelMembersLiveCollection,
|
|
38
|
+
callback: Amity.LiveCollectionCallback<Amity.Membership<'channel'>>,
|
|
39
|
+
) {
|
|
40
|
+
const queryStreamId = hash(query);
|
|
41
|
+
const cacheKey = ['channelUsers', 'collection', queryStreamId];
|
|
42
|
+
const paginationController = new ChannelMemberPaginationController(query);
|
|
43
|
+
|
|
44
|
+
super(paginationController, queryStreamId, cacheKey, callback);
|
|
45
|
+
|
|
46
|
+
this.query = query;
|
|
47
|
+
this.queryStreamController = new ChannelMemberQueryStreamController(
|
|
48
|
+
this.query,
|
|
49
|
+
this.cacheKey,
|
|
50
|
+
this.notifyChange.bind(this),
|
|
51
|
+
prepareChannelPayload,
|
|
52
|
+
);
|
|
53
|
+
|
|
54
|
+
this.callback = callback.bind(this);
|
|
55
|
+
this.loadPage(true);
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
protected setup() {
|
|
59
|
+
const collection = pullFromCache<Amity.ChannelMembersLiveCollectionCache>(this.cacheKey)?.data;
|
|
60
|
+
if (!collection) {
|
|
61
|
+
pushToCache(this.cacheKey, {
|
|
62
|
+
data: [],
|
|
63
|
+
params: {},
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
protected async persistModel(queryPayload: Amity.ChannelMembershipPayload & Amity.Pagination) {
|
|
69
|
+
await this.queryStreamController.saveToMainDB(queryPayload);
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
protected persistQueryStream({
|
|
73
|
+
response,
|
|
74
|
+
direction,
|
|
75
|
+
refresh,
|
|
76
|
+
}: Amity.LiveCollectionPersistQueryStreamParams<'channelUser'>) {
|
|
77
|
+
this.queryStreamController.appendToQueryStream(response, direction, refresh);
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
startSubscription() {
|
|
81
|
+
return this.queryStreamController.subscribeRTE([
|
|
82
|
+
{ fn: onChannelJoined, action: 'onJoin' },
|
|
83
|
+
{ fn: onChannelLeft, action: 'onLeft' },
|
|
84
|
+
{ fn: onChannelMemberAdded, action: 'onMemberAdded' },
|
|
85
|
+
{ fn: onChannelMemberRemoved, action: 'onMemberRemoved' },
|
|
86
|
+
{ fn: onChannelMemberBanned, action: 'onChannelMemberBanned' },
|
|
87
|
+
{ fn: onChannelMemberUnbanned, action: 'onChannelMemberUnbanned' },
|
|
88
|
+
{ fn: onChannelMemberRoleAdded, action: 'onChannelMemberRoleAdded' },
|
|
89
|
+
{ fn: onChannelMemberRoleRemoved, action: 'onChannelMemberRoleRemoved' },
|
|
90
|
+
]);
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
notifyChange({ origin, loading, error }: Amity.LiveCollectionNotifyParams) {
|
|
94
|
+
const collection = pullFromCache<Amity.ChannelMembersLiveCollectionCache>(this.cacheKey)?.data;
|
|
95
|
+
if (!collection) return;
|
|
96
|
+
|
|
97
|
+
const data = this.applyFilter(
|
|
98
|
+
collection.data
|
|
99
|
+
.map(id => pullFromCache<Amity.Membership<'channel'>>(['channelUsers', 'get', id])!)
|
|
100
|
+
.filter(Boolean)
|
|
101
|
+
.map(({ data }) => data) ?? [],
|
|
102
|
+
);
|
|
103
|
+
|
|
104
|
+
if (!this.shouldNotify(data) && origin === 'event') return;
|
|
105
|
+
|
|
106
|
+
this.callback({
|
|
107
|
+
onNextPage: () => this.loadPage(false, Amity.LiveCollectionPageDirection.NEXT),
|
|
108
|
+
data,
|
|
109
|
+
hasNextPage: !!this.paginationController.getNextToken(),
|
|
110
|
+
loading,
|
|
111
|
+
error,
|
|
112
|
+
});
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
applyFilter(data: Amity.Membership<'channel'>[]) {
|
|
116
|
+
let channelMembers = filterByPropIntersection(data, 'roles', this.query.roles);
|
|
117
|
+
|
|
118
|
+
if (this.query.memberships) {
|
|
119
|
+
/*
|
|
120
|
+
* even though membership includes muted as a possible value
|
|
121
|
+
* when querying the server.
|
|
122
|
+
* Muted is specified under seperarte property namely isMuted
|
|
123
|
+
* Hence why I've seperately checked for it's equality
|
|
124
|
+
*/
|
|
125
|
+
channelMembers = channelMembers.filter(member => {
|
|
126
|
+
if (this.query.memberships?.includes('muted') && member.isMuted) {
|
|
127
|
+
return true;
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
if (member.membership !== 'none') {
|
|
131
|
+
return this.query.memberships?.includes(member.membership);
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
return false;
|
|
135
|
+
});
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
if (this.query.search) {
|
|
139
|
+
// eslint-disable-next-line no-console
|
|
140
|
+
console.warn(
|
|
141
|
+
'`search` param will be deprecated in the next major release. If you want to search channel members by displayName, Please use `searchMembers()` instead.',
|
|
142
|
+
);
|
|
143
|
+
channelMembers = filterBySearchTerm(channelMembers, this.query.search);
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
// sort, 'lastCreated' is the default sort order
|
|
147
|
+
const sortBy = this.query.sortBy ? this.query.sortBy : 'lastCreated';
|
|
148
|
+
channelMembers = channelMembers.sort(
|
|
149
|
+
sortBy === 'lastCreated' ? sortByLastCreated : sortByFirstCreated,
|
|
150
|
+
);
|
|
151
|
+
|
|
152
|
+
return channelMembers;
|
|
153
|
+
}
|
|
154
|
+
}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
/* eslint-disable no-use-before-define */
|
|
2
|
+
|
|
3
|
+
import { PaginationController } from '~/core/liveCollection/PaginationController';
|
|
4
|
+
import { COLLECTION_DEFAULT_PAGINATION_LIMIT } from '~/utils/constants';
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* TODO: handle cache receive cache option, and cache policy
|
|
8
|
+
* TODO: check if querybyIds is supported
|
|
9
|
+
*/
|
|
10
|
+
export class ChannelMemberPaginationController extends PaginationController<
|
|
11
|
+
'channelUser',
|
|
12
|
+
Amity.ChannelMembersLiveCollection
|
|
13
|
+
> {
|
|
14
|
+
async getRequest(queryParams: Amity.ChannelMembersLiveCollection, token: string | undefined) {
|
|
15
|
+
const { limit = COLLECTION_DEFAULT_PAGINATION_LIMIT, ...params } = queryParams;
|
|
16
|
+
const options = token ? { token } : { limit };
|
|
17
|
+
|
|
18
|
+
const { data: queryResponse } = await this.http.get<
|
|
19
|
+
Amity.ChannelMembershipPayload & Amity.Pagination
|
|
20
|
+
>(`/api/v4/channels/${encodeURIComponent(params.channelId)}/users`, {
|
|
21
|
+
params: {
|
|
22
|
+
...params,
|
|
23
|
+
options,
|
|
24
|
+
},
|
|
25
|
+
});
|
|
26
|
+
return queryResponse;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
/* eslint-disable no-use-before-define */
|
|
2
|
+
import { QueryStreamController } from '~/core/liveCollection/QueryStreamController';
|
|
3
|
+
import { pullFromCache, pushToCache } from '~/cache/api';
|
|
4
|
+
import { ingestInCache } from '~/cache/api/ingestInCache';
|
|
5
|
+
import { getResolver } from '~/core/model';
|
|
6
|
+
import { getActiveClient } from '~/client';
|
|
7
|
+
|
|
8
|
+
export class ChannelMemberQueryStreamController extends QueryStreamController<
|
|
9
|
+
Amity.ChannelMembershipPayload,
|
|
10
|
+
Amity.ChannelMembersLiveCollection
|
|
11
|
+
> {
|
|
12
|
+
private notifyChange: (params: Amity.LiveCollectionNotifyParams) => void;
|
|
13
|
+
|
|
14
|
+
private preparePayload: (
|
|
15
|
+
response: Amity.ChannelMembershipPayload,
|
|
16
|
+
) => Promise<Amity.ProcessedChannelPayload>;
|
|
17
|
+
|
|
18
|
+
constructor(
|
|
19
|
+
query: Amity.ChannelMembersLiveCollection,
|
|
20
|
+
cacheKey: string[],
|
|
21
|
+
notifyChange: (params: Amity.LiveCollectionNotifyParams) => void,
|
|
22
|
+
preparePayload: (
|
|
23
|
+
response: Amity.ChannelMembershipPayload,
|
|
24
|
+
) => Promise<Amity.ProcessedChannelPayload>,
|
|
25
|
+
) {
|
|
26
|
+
super(query, cacheKey);
|
|
27
|
+
this.notifyChange = notifyChange;
|
|
28
|
+
this.preparePayload = preparePayload;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
async saveToMainDB(response: Amity.ChannelMembershipPayload) {
|
|
32
|
+
const processedPayload = await this.preparePayload(response);
|
|
33
|
+
|
|
34
|
+
const client = getActiveClient();
|
|
35
|
+
const cachedAt = client.cache && Date.now();
|
|
36
|
+
|
|
37
|
+
if (client.cache) {
|
|
38
|
+
ingestInCache(processedPayload, { cachedAt });
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
appendToQueryStream(
|
|
43
|
+
response: Amity.ChannelPayload & Partial<Amity.Pagination>,
|
|
44
|
+
direction: Amity.LiveCollectionPageDirection,
|
|
45
|
+
refresh = false,
|
|
46
|
+
) {
|
|
47
|
+
if (refresh) {
|
|
48
|
+
pushToCache(this.cacheKey, {
|
|
49
|
+
data: response.channelUsers.map(({ channelId, userId }) =>
|
|
50
|
+
getResolver('channelUsers')({ channelId, userId }),
|
|
51
|
+
),
|
|
52
|
+
});
|
|
53
|
+
} else {
|
|
54
|
+
const collection = pullFromCache<Amity.ChannelMembersLiveCollectionCache>(
|
|
55
|
+
this.cacheKey,
|
|
56
|
+
)?.data;
|
|
57
|
+
|
|
58
|
+
const channelUsers = collection?.data ?? [];
|
|
59
|
+
|
|
60
|
+
pushToCache(this.cacheKey, {
|
|
61
|
+
...collection,
|
|
62
|
+
data: [
|
|
63
|
+
...new Set([
|
|
64
|
+
...channelUsers,
|
|
65
|
+
...response.channelUsers.map(({ channelId, userId }) =>
|
|
66
|
+
getResolver('channelUsers')({ channelId, userId }),
|
|
67
|
+
),
|
|
68
|
+
]),
|
|
69
|
+
],
|
|
70
|
+
});
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
reactor(action: string) {
|
|
75
|
+
return (channel: Amity.Channel, channelMember: Amity.Membership<'channel'>) => {
|
|
76
|
+
if (this.query.channelId !== channelMember.channelId) return;
|
|
77
|
+
|
|
78
|
+
const collection = pullFromCache<Amity.ChannelMembersLiveCollectionCache>(
|
|
79
|
+
this.cacheKey,
|
|
80
|
+
)?.data;
|
|
81
|
+
if (!collection) return;
|
|
82
|
+
|
|
83
|
+
const channelMemberCacheId = getResolver('channelUsers')({
|
|
84
|
+
channelId: this.query.channelId,
|
|
85
|
+
userId: channelMember.userId,
|
|
86
|
+
});
|
|
87
|
+
|
|
88
|
+
if (channelMember.membership === 'none') {
|
|
89
|
+
collection.data = collection.data.filter(m => m !== channelMemberCacheId);
|
|
90
|
+
} else if (!collection.data.includes(channelMemberCacheId)) {
|
|
91
|
+
collection.data = [channelMemberCacheId, ...collection.data];
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
pushToCache(this.cacheKey, collection);
|
|
95
|
+
this.notifyChange({ origin: Amity.LiveDataOrigin.EVENT, loading: false });
|
|
96
|
+
};
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
subscribeRTE(
|
|
100
|
+
createSubscriber: {
|
|
101
|
+
fn: (
|
|
102
|
+
reactor: (channel: Amity.Channel, channelMember: Amity.Membership<'channel'>) => void,
|
|
103
|
+
) => Amity.Unsubscriber;
|
|
104
|
+
action: string;
|
|
105
|
+
}[],
|
|
106
|
+
) {
|
|
107
|
+
return createSubscriber.map(subscriber => subscriber.fn(this.reactor(subscriber.action)));
|
|
108
|
+
}
|
|
109
|
+
}
|
|
@@ -149,7 +149,9 @@ describe('getMembers', () => {
|
|
|
149
149
|
);
|
|
150
150
|
});
|
|
151
151
|
|
|
152
|
-
|
|
152
|
+
// skip because new live collection do apply filter before notify
|
|
153
|
+
// TODO: check if it should do filtering only on RTE event or not
|
|
154
|
+
test.skip('it should apply filter on RTE only', async () => {
|
|
153
155
|
const callback = jest.fn();
|
|
154
156
|
const applyFilterSpy = jest.spyOn(getMembersModule, 'applyFilter');
|
|
155
157
|
|