@amityco/ts-sdk 0.0.1-beta.42.2 → 0.0.1-beta.43
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 +11 -1
- package/dist/@types/core/events.d.ts.map +1 -1
- package/dist/@types/core/marker.d.ts +37 -0
- package/dist/@types/core/marker.d.ts.map +1 -0
- package/dist/@types/core/model.d.ts +10 -0
- package/dist/@types/core/model.d.ts.map +1 -1
- package/dist/@types/core/payload.d.ts +44 -0
- package/dist/@types/core/payload.d.ts.map +1 -1
- package/dist/@types/domains/channel.d.ts +5 -8
- package/dist/@types/domains/channel.d.ts.map +1 -1
- package/dist/@types/domains/client.d.ts +1 -0
- package/dist/@types/domains/client.d.ts.map +1 -1
- package/dist/@types/domains/marker.d.ts +15 -0
- package/dist/@types/domains/marker.d.ts.map +1 -0
- package/dist/@types/domains/message.d.ts +3 -0
- package/dist/@types/domains/message.d.ts.map +1 -1
- package/dist/@types/domains/partials.d.ts +3 -0
- package/dist/@types/domains/partials.d.ts.map +1 -1
- package/dist/@types/domains/subChannel.d.ts +2 -0
- package/dist/@types/domains/subChannel.d.ts.map +1 -1
- package/dist/channel/api/getChannels.d.ts.map +1 -1
- package/dist/channel/api/index.d.ts +0 -2
- package/dist/channel/api/index.d.ts.map +1 -1
- package/dist/channel/events/onChannelUpdated.d.ts.map +1 -1
- package/dist/channel/utils/index.d.ts +1 -2
- package/dist/channel/utils/index.d.ts.map +1 -1
- package/dist/channel/utils/prepareChannelPayload.d.ts +6 -0
- package/dist/channel/utils/prepareChannelPayload.d.ts.map +1 -0
- package/dist/channel/utils/tests/prepareChannelPayload.test.d.ts +5 -1
- package/dist/channel/utils/tests/prepareChannelPayload.test.d.ts.map +1 -1
- package/dist/client/api/activeUser.d.ts +2 -2
- package/dist/client/api/activeUser.d.ts.map +1 -1
- package/dist/client/api/connectClient.d.ts.map +1 -1
- package/dist/client/api/index.d.ts +2 -0
- package/dist/client/api/index.d.ts.map +1 -1
- package/dist/client/api/markerSync.d.ts +21 -0
- package/dist/client/api/markerSync.d.ts.map +1 -0
- package/dist/client/observers/getTotalUnreadCount.d.ts +18 -0
- package/dist/client/observers/getTotalUnreadCount.d.ts.map +1 -0
- package/dist/client/observers/index.d.ts +2 -0
- package/dist/client/observers/index.d.ts.map +1 -0
- package/dist/client/observers/tests/getTotalUnreadCount.test.d.ts +2 -0
- package/dist/client/observers/tests/getTotalUnreadCount.test.d.ts.map +1 -0
- package/dist/client/utils/index.d.ts +2 -0
- package/dist/client/utils/index.d.ts.map +1 -0
- package/dist/client/utils/markerSyncEngine.d.ts +46 -0
- package/dist/client/utils/markerSyncEngine.d.ts.map +1 -0
- package/dist/comment/api/getComments.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/model/idResolvers.d.ts.map +1 -1
- package/dist/core/model/index.d.ts.map +1 -1
- package/dist/index.cjs.js +1931 -1159
- package/dist/index.d.ts +5 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.esm.js +1901 -1160
- package/dist/index.umd.js +4 -4
- package/dist/marker/api/getChannelMarkers.d.ts +18 -0
- package/dist/marker/api/getChannelMarkers.d.ts.map +1 -0
- package/dist/marker/api/getMessageMarkers.d.ts +18 -0
- package/dist/marker/api/getMessageMarkers.d.ts.map +1 -0
- package/dist/marker/api/getSubChannelMarkers.d.ts +18 -0
- package/dist/marker/api/getSubChannelMarkers.d.ts.map +1 -0
- package/dist/marker/api/getUserMarker.d.ts +8 -0
- package/dist/marker/api/getUserMarker.d.ts.map +1 -0
- package/dist/marker/api/index.d.ts +5 -0
- package/dist/marker/api/index.d.ts.map +1 -0
- package/dist/marker/api/tests/getChannelMarkers.test.d.ts +2 -0
- package/dist/marker/api/tests/getChannelMarkers.test.d.ts.map +1 -0
- package/dist/marker/api/tests/getMessageMarkers.test.d.ts +2 -0
- package/dist/marker/api/tests/getMessageMarkers.test.d.ts.map +1 -0
- package/dist/marker/api/tests/getSubChannelMarkers.test.d.ts +2 -0
- package/dist/marker/api/tests/getSubChannelMarkers.test.d.ts.map +1 -0
- package/dist/marker/events/index.d.ts +7 -0
- package/dist/marker/events/index.d.ts.map +1 -0
- package/dist/marker/events/onChannelMarkerFetched.d.ts +17 -0
- package/dist/marker/events/onChannelMarkerFetched.d.ts.map +1 -0
- package/dist/marker/events/onFeedlMarkerFetched.d.ts +17 -0
- package/dist/marker/events/onFeedlMarkerFetched.d.ts.map +1 -0
- package/dist/marker/events/onMessageMarkerFetched.d.ts +17 -0
- package/dist/marker/events/onMessageMarkerFetched.d.ts.map +1 -0
- package/dist/marker/events/onSubChannelMarkerFetched.d.ts +17 -0
- package/dist/marker/events/onSubChannelMarkerFetched.d.ts.map +1 -0
- package/dist/marker/events/onSubChannelMarkerUpdated.d.ts +17 -0
- package/dist/marker/events/onSubChannelMarkerUpdated.d.ts.map +1 -0
- package/dist/marker/events/onUserMarkerFetched.d.ts +17 -0
- package/dist/marker/events/onUserMarkerFetched.d.ts.map +1 -0
- package/dist/message/api/getMessage.d.ts.map +1 -1
- package/dist/message/api/getMessages.d.ts.map +1 -1
- package/dist/message/api/index.d.ts +1 -0
- package/dist/message/api/index.d.ts.map +1 -1
- package/dist/message/api/markAsDelivered.d.ts +17 -0
- package/dist/message/api/markAsDelivered.d.ts.map +1 -0
- package/dist/message/api/queryMessages.d.ts.map +1 -1
- package/dist/message/api/tests/markAsDelivered.test.d.ts +2 -0
- package/dist/message/api/tests/markAsDelivered.test.d.ts.map +1 -0
- package/dist/message/api/updateMessage.d.ts.map +1 -1
- package/dist/message/events/index.d.ts +1 -0
- package/dist/message/events/index.d.ts.map +1 -1
- package/dist/message/events/onMessageCreated.d.ts +2 -1
- package/dist/message/events/onMessageCreated.d.ts.map +1 -1
- package/dist/message/events/onMessageUpdated.d.ts.map +1 -1
- package/dist/message/utils/index.d.ts +1 -18
- package/dist/message/utils/index.d.ts.map +1 -1
- package/dist/message/utils/prepareMessagePayload.d.ts +16 -0
- package/dist/message/utils/prepareMessagePayload.d.ts.map +1 -0
- package/dist/post/api/getPosts.d.ts.map +1 -1
- package/dist/post/api/tests/getPosts.test.d.ts +2 -0
- package/dist/post/api/tests/getPosts.test.d.ts.map +1 -0
- package/dist/report/api/createReport.d.ts.map +1 -1
- package/dist/report/api/deleteReport.d.ts.map +1 -1
- package/dist/subChannel/api/getSubChannels.d.ts.map +1 -1
- package/dist/subChannel/api/index.d.ts +2 -0
- package/dist/subChannel/api/index.d.ts.map +1 -1
- package/dist/subChannel/api/startReadingAPI.d.ts +17 -0
- package/dist/subChannel/api/startReadingAPI.d.ts.map +1 -0
- package/dist/subChannel/api/stopReadingAPI.d.ts +17 -0
- package/dist/subChannel/api/stopReadingAPI.d.ts.map +1 -0
- package/dist/subChannel/events/onSubChannelUpdated.d.ts +1 -1
- package/dist/subChannel/events/onSubChannelUpdated.d.ts.map +1 -1
- package/dist/subChannel/observers/liveSubChannel.d.ts.map +1 -1
- package/dist/subChannel/utils/index.d.ts +2 -7
- package/dist/subChannel/utils/index.d.ts.map +1 -1
- package/dist/subChannel/utils/markReadEngine.d.ts +33 -0
- package/dist/subChannel/utils/markReadEngine.d.ts.map +1 -0
- package/dist/subChannel/utils/prepareSubChannelPayload.d.ts +15 -0
- package/dist/subChannel/utils/prepareSubChannelPayload.d.ts.map +1 -0
- package/dist/utils/liveObject.d.ts +1 -1
- package/dist/utils/liveObject.d.ts.map +1 -1
- package/dist/utils/tests/client.d.ts +1 -0
- package/dist/utils/tests/client.d.ts.map +1 -1
- package/dist/utils/tests/dummy/channel.d.ts +4 -0
- package/dist/utils/tests/dummy/channel.d.ts.map +1 -1
- package/dist/utils/tests/dummy/comment.d.ts.map +1 -1
- package/dist/utils/tests/dummy/index.d.ts +1 -0
- package/dist/utils/tests/dummy/index.d.ts.map +1 -1
- package/dist/utils/tests/dummy/marker.d.ts +6 -0
- package/dist/utils/tests/dummy/marker.d.ts.map +1 -0
- package/dist/utils/tests/dummy/message.d.ts +2 -0
- package/dist/utils/tests/dummy/message.d.ts.map +1 -1
- package/dist/utils/tests/dummy/subChannel.d.ts +1 -0
- package/dist/utils/tests/dummy/subChannel.d.ts.map +1 -1
- package/dist/utils/tests/utils.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/@types/core/events.ts +13 -1
- package/src/@types/core/marker.ts +42 -0
- package/src/@types/core/model.ts +12 -0
- package/src/@types/core/payload.ts +52 -0
- package/src/@types/domains/channel.ts +5 -16
- package/src/@types/domains/client.ts +2 -0
- package/src/@types/domains/marker.ts +15 -0
- package/src/@types/domains/message.ts +3 -0
- package/src/@types/domains/partials.ts +4 -0
- package/src/@types/domains/subChannel.ts +2 -0
- package/src/channel/api/addChannelMembers.ts +1 -1
- package/src/channel/api/addChannelMembersRole.ts +1 -1
- package/src/channel/api/banChannelMembers.ts +1 -1
- package/src/channel/api/createChannel.ts +1 -1
- package/src/channel/api/getChannel.ts +1 -1
- package/src/channel/api/getChannels.ts +21 -5
- package/src/channel/api/index.ts +0 -3
- package/src/channel/api/joinChannel.ts +1 -1
- package/src/channel/api/leaveChannel.ts +1 -1
- package/src/channel/api/queryChannelMembers.ts +1 -1
- package/src/channel/api/queryChannels.ts +3 -3
- package/src/channel/api/removeChannelMembers.ts +1 -1
- package/src/channel/api/removeChannelMembersRole.ts +1 -1
- package/src/channel/api/tests/addChannelMembers.test.ts +16 -0
- package/src/channel/api/tests/createChannel.test.ts +29 -8
- package/src/channel/api/tests/getChannel.test.ts +11 -4
- package/src/channel/api/tests/getChannels.test.ts +22 -14
- package/src/channel/api/tests/queryChannelMembers.test.ts +13 -4
- package/src/channel/api/tests/queryChannels.test.ts +19 -9
- package/src/channel/api/unbanChannelMembers.ts +1 -1
- package/src/channel/api/updateChannel.ts +1 -1
- package/src/channel/events/onChannelCreated.ts +2 -2
- package/src/channel/events/onChannelDeleted.ts +4 -4
- package/src/channel/events/onChannelJoined.ts +2 -2
- package/src/channel/events/onChannelLeft.ts +2 -2
- package/src/channel/events/onChannelMemberAdded.ts +2 -2
- package/src/channel/events/onChannelMemberBanned.ts +3 -3
- package/src/channel/events/onChannelMemberRemoved.ts +2 -2
- package/src/channel/events/onChannelMemberUnbanned.ts +2 -2
- package/src/channel/events/onChannelMuted.ts +2 -2
- package/src/channel/events/onChannelUpdated.ts +25 -4
- package/src/channel/events/tests/onChannelCreated.test.ts +4 -1
- package/src/channel/events/tests/onChannelJoined.test.ts +5 -1
- package/src/channel/events/tests/onChannelMemberAdded.test.ts +5 -1
- package/src/channel/events/tests/onChannelMemberBanned.test.ts +4 -1
- package/src/channel/events/tests/onChannelMemberRemoved.test.ts +5 -1
- package/src/channel/events/tests/onChannelMemberUnbanned.test.ts +10 -10
- package/src/channel/events/tests/onChannelUpdated.test.ts +5 -1
- package/src/channel/observers/tests/liveChannelMembers.test.ts +5 -11
- package/src/channel/observers/tests/liveChannels.test.ts +21 -24
- package/src/channel/utils/index.ts +1 -57
- package/src/channel/utils/prepareChannelPayload.ts +91 -0
- package/src/channel/utils/tests/prepareChannelPayload.test.ts +102 -104
- package/src/client/api/activeUser.ts +2 -2
- package/src/client/api/connectClient.ts +2 -1
- package/src/client/api/index.ts +3 -0
- package/src/client/api/markerSync.ts +42 -0
- package/src/client/observers/getTotalUnreadCount.ts +52 -0
- package/src/client/observers/index.ts +1 -0
- package/src/client/observers/tests/getTotalUnreadCount.test.ts +126 -0
- package/src/client/utils/index.ts +1 -0
- package/src/client/utils/markerSyncEngine.ts +179 -0
- package/src/comment/api/getComments.ts +20 -4
- package/src/comment/api/tests/getComments.test.ts +12 -1
- package/src/comment/api/tests/queryComments.test.ts +2 -2
- package/src/core/model/idResolvers.ts +7 -0
- package/src/core/model/identifyModel.ts +1 -1
- package/src/core/model/index.ts +6 -0
- package/src/core/tests/query/query/runQuery.test.ts +3 -1
- package/src/group/utils/withUser.ts +2 -2
- package/src/index.ts +6 -0
- package/src/marker/api/getChannelMarkers.ts +53 -0
- package/src/marker/api/getMessageMarkers.ts +54 -0
- package/src/marker/api/getSubChannelMarkers.ts +54 -0
- package/src/marker/api/getUserMarker.ts +47 -0
- package/src/marker/api/index.ts +4 -0
- package/src/marker/api/tests/getChannelMarkers.test.ts +109 -0
- package/src/marker/api/tests/getMessageMarkers.test.ts +114 -0
- package/src/marker/api/tests/getSubChannelMarkers.test.ts +116 -0
- package/src/marker/events/index.ts +10 -0
- package/src/marker/events/onChannelMarkerFetched.ts +34 -0
- package/src/marker/events/onFeedlMarkerFetched.ts +34 -0
- package/src/marker/events/onMessageMarkerFetched.ts +34 -0
- package/src/marker/events/onSubChannelMarkerFetched.ts +34 -0
- package/src/marker/events/onSubChannelMarkerUpdated.ts +34 -0
- package/src/marker/events/onUserMarkerFetched.ts +34 -0
- package/src/message/api/createMessage.ts +1 -1
- package/src/message/api/getMessage.ts +6 -5
- package/src/message/api/getMessages.ts +7 -6
- package/src/message/api/index.ts +1 -0
- package/src/message/api/markAsDelivered.ts +36 -0
- package/src/message/api/queryMessages.ts +8 -6
- package/src/message/api/tests/createMessage.test.ts +13 -4
- package/src/message/api/tests/getMessage.test.ts +12 -3
- package/src/message/api/tests/getMessages.test.ts +14 -5
- package/src/message/api/tests/markAsDelivered.test.ts +83 -0
- package/src/message/api/tests/queryMessages.test.ts +14 -3
- package/src/message/api/updateMessage.ts +8 -7
- package/src/message/events/index.ts +2 -0
- package/src/message/events/onMessageCreated.ts +14 -41
- package/src/message/events/onMessageDeleted.ts +2 -2
- package/src/message/events/onMessageFlagCleared.ts +2 -2
- package/src/message/events/onMessageFlagged.ts +2 -2
- package/src/message/events/onMessageReactionAdded.ts +2 -2
- package/src/message/events/onMessageReactionRemoved.ts +2 -2
- package/src/message/events/onMessageUnflagged.ts +2 -2
- package/src/message/events/onMessageUpdated.ts +27 -5
- package/src/message/tests/events.test.ts +4 -2
- package/src/message/tests/observers/liveMessage.test.ts +22 -10
- package/src/message/tests/observers/liveMessages.test.ts +25 -18
- package/src/message/utils/index.ts +1 -140
- package/src/message/utils/prepareMessagePayload.ts +182 -0
- package/src/post/api/getPosts.ts +20 -4
- package/src/post/api/tests/getPosts.test.ts +18 -0
- package/src/reaction/events/onReactionAdded.ts +2 -2
- package/src/reaction/events/onReactionRemoved.ts +2 -2
- package/src/reaction/events/onReactorAdded.ts +2 -2
- package/src/reaction/events/onReactorRemoved.ts +2 -2
- package/src/report/api/createReport.ts +2 -1
- package/src/report/api/deleteReport.ts +2 -1
- package/src/subChannel/api/createSubChannel.ts +1 -1
- package/src/subChannel/api/getSubChannel.ts +1 -1
- package/src/subChannel/api/getSubChannels.ts +2 -1
- package/src/subChannel/api/index.ts +3 -0
- package/src/subChannel/api/querySubChannels.ts +1 -1
- package/src/subChannel/api/startReadingAPI.ts +33 -0
- package/src/subChannel/api/stopReadingAPI.ts +33 -0
- package/src/subChannel/api/tests/createSubChannel.test.ts +6 -3
- package/src/subChannel/api/tests/deleteSubChannel.test.ts +7 -5
- package/src/subChannel/api/tests/getSubChannel.test.ts +6 -4
- package/src/subChannel/api/tests/getSubChannels.test.ts +6 -3
- package/src/subChannel/api/tests/updateSubChannel.test.ts +6 -3
- package/src/subChannel/api/updateSubChannel.ts +1 -1
- package/src/subChannel/events/onSubChannelCreated.ts +2 -2
- package/src/subChannel/events/onSubChannelDeleted.ts +2 -2
- package/src/subChannel/events/onSubChannelUpdated.ts +43 -4
- package/src/subChannel/observers/liveSubChannel.ts +2 -0
- package/src/subChannel/observers/tests/liveSubChannel.test.ts +15 -10
- package/src/subChannel/observers/tests/liveSubChannels.test.ts +21 -14
- package/src/subChannel/utils/index.ts +2 -50
- package/src/subChannel/utils/markReadEngine.ts +117 -0
- package/src/subChannel/utils/prepareSubChannelPayload.ts +132 -0
- package/src/utils/liveObject.ts +15 -4
- package/src/utils/tests/client.ts +3 -1
- package/src/utils/tests/dummy/channel.ts +38 -21
- package/src/utils/tests/dummy/comment.ts +2 -2
- package/src/utils/tests/dummy/index.ts +1 -0
- package/src/utils/tests/dummy/marker.ts +68 -0
- package/src/utils/tests/dummy/message.ts +42 -2
- package/src/utils/tests/dummy/post.ts +1 -1
- package/src/utils/tests/dummy/subChannel.ts +16 -5
- package/src/utils/tests/utils.ts +4 -1
- package/dist/channel/api/startReading.d.ts +0 -17
- package/dist/channel/api/startReading.d.ts.map +0 -1
- package/dist/channel/api/stopReading.d.ts +0 -16
- package/dist/channel/api/stopReading.d.ts.map +0 -1
- package/dist/channel/api/tests/startReading.test.d.ts +0 -2
- package/dist/channel/api/tests/startReading.test.d.ts.map +0 -1
- package/dist/channel/api/tests/stopReading.test.d.ts +0 -2
- package/dist/channel/api/tests/stopReading.test.d.ts.map +0 -1
- package/src/channel/api/startReading.ts +0 -57
- package/src/channel/api/stopReading.ts +0 -53
- package/src/channel/api/tests/startReading.test.ts +0 -25
- package/src/channel/api/tests/stopReading.test.ts +0 -25
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { getActiveClient } from '~/client/api';
|
|
2
|
+
import { createEventSubscriber } from '~/core/events';
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* ```js
|
|
6
|
+
* import { onUserMarkerFetched } from '@amityco/ts-sdk'
|
|
7
|
+
* const dispose = onUserMarkerFetched(userMarker => {
|
|
8
|
+
* // ...
|
|
9
|
+
* })
|
|
10
|
+
* ```
|
|
11
|
+
*
|
|
12
|
+
* Fired when an {@link Amity.UserMarker} has been fetched
|
|
13
|
+
*
|
|
14
|
+
* @param callback The function to call when the event was fired
|
|
15
|
+
* @returns an {@link Amity.Unsubscriber} function to stop listening
|
|
16
|
+
*
|
|
17
|
+
* @category UserMarker Events
|
|
18
|
+
*/
|
|
19
|
+
export const onUserMarkerFetched = (
|
|
20
|
+
callback: Amity.Listener<Amity.UserMarker>,
|
|
21
|
+
): Amity.Unsubscriber => {
|
|
22
|
+
const client = getActiveClient();
|
|
23
|
+
|
|
24
|
+
const filter = (payload: Amity.Events['local.userMarker.fetched']) => {
|
|
25
|
+
callback(payload.userMarkers[0]);
|
|
26
|
+
};
|
|
27
|
+
|
|
28
|
+
return createEventSubscriber(
|
|
29
|
+
client,
|
|
30
|
+
'userMarker/onUserMarkerFetched',
|
|
31
|
+
'local.userMarker.fetched',
|
|
32
|
+
filter,
|
|
33
|
+
);
|
|
34
|
+
};
|
|
@@ -68,7 +68,7 @@ export const createMessage = async <T extends Amity.MessageContentType>(
|
|
|
68
68
|
referenceId,
|
|
69
69
|
});
|
|
70
70
|
|
|
71
|
-
const data = prepareMessagePayload(payload);
|
|
71
|
+
const data = await prepareMessagePayload(payload);
|
|
72
72
|
const { messages } = data;
|
|
73
73
|
|
|
74
74
|
const cachedAt = client.cache && Date.now();
|
|
@@ -7,7 +7,8 @@ import { ingestInCache } from '~/cache/api/ingestInCache';
|
|
|
7
7
|
import { isInTombstone } from '~/cache/api/isInTombstone';
|
|
8
8
|
import { checkIfShouldGoesToTombstone } from '~/cache/utils';
|
|
9
9
|
import { pushToTombstone } from '~/cache/api/pushToTombstone';
|
|
10
|
-
|
|
10
|
+
|
|
11
|
+
import { prepareMessagePayload } from '../utils';
|
|
11
12
|
|
|
12
13
|
/* begin_public_function
|
|
13
14
|
id: message.get
|
|
@@ -45,11 +46,11 @@ export const getMessage = async (
|
|
|
45
46
|
|
|
46
47
|
try {
|
|
47
48
|
// API-FIX: endpoint should not be /list, parameters should be querystring.
|
|
48
|
-
const
|
|
49
|
-
|
|
50
|
-
|
|
49
|
+
const { data: payload } = await client.http.get<Amity.MessagePayload>(
|
|
50
|
+
`/api/v5/messages/${encodeURIComponent(messageId)}`,
|
|
51
|
+
);
|
|
51
52
|
|
|
52
|
-
data =
|
|
53
|
+
data = await prepareMessagePayload(payload);
|
|
53
54
|
} catch (error) {
|
|
54
55
|
if (checkIfShouldGoesToTombstone((error as Amity.ErrorResponse)?.code)) {
|
|
55
56
|
pushToTombstone('message', messageId);
|
|
@@ -3,7 +3,8 @@ import { getActiveClient } from '~/client/api';
|
|
|
3
3
|
import { fireEvent } from '~/core/events';
|
|
4
4
|
import { pullFromCache } from '~/cache/api';
|
|
5
5
|
import { ingestInCache } from '~/cache/api/ingestInCache';
|
|
6
|
-
|
|
6
|
+
|
|
7
|
+
import { prepareMessagePayload } from '../utils';
|
|
7
8
|
|
|
8
9
|
/**
|
|
9
10
|
* ```js
|
|
@@ -25,11 +26,11 @@ export const getMessages = async (
|
|
|
25
26
|
const client = getActiveClient();
|
|
26
27
|
client.log('message/getMessages', messageIds);
|
|
27
28
|
|
|
28
|
-
const { data } = await client.http
|
|
29
|
-
.
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
29
|
+
const { data: payload } = await client.http.get<Amity.MessagePayload>(`/api/v5/messages/list`, {
|
|
30
|
+
params: { messageIds: messageIds.map(encodeURIComponent) },
|
|
31
|
+
});
|
|
32
|
+
|
|
33
|
+
const data = await prepareMessagePayload(payload);
|
|
33
34
|
|
|
34
35
|
const cachedAt = client.cache && Date.now();
|
|
35
36
|
if (client.cache) ingestInCache(data, { cachedAt });
|
package/src/message/api/index.ts
CHANGED
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import { getActiveClient } from '~/client/api';
|
|
2
|
+
import { ingestInCache } from '~/cache/api/ingestInCache';
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* ```js
|
|
6
|
+
* import { markAsDelivered } from '@amityco/ts-sdk'
|
|
7
|
+
* const success = await markAsDelivered('subChannelId', 'messageId')
|
|
8
|
+
* ```
|
|
9
|
+
*
|
|
10
|
+
* Update `deliveredToSegment` in {@link Amity.SubChannelMarker}
|
|
11
|
+
*
|
|
12
|
+
* @param subChannelId the ID of the {@link Amity.SubChannel} of message
|
|
13
|
+
* @param messageId the ID of the {@link Amity.Message} to mark delivered
|
|
14
|
+
* @returns A success boolean if the {@link Amity.SubChannel} was updated
|
|
15
|
+
*
|
|
16
|
+
* @category Message API
|
|
17
|
+
* @async
|
|
18
|
+
*/
|
|
19
|
+
export const markAsDelivered = async (
|
|
20
|
+
subChannelId: Amity.Message['subChannelId'],
|
|
21
|
+
messageId: Amity.Message['messageId'],
|
|
22
|
+
): Promise<boolean> => {
|
|
23
|
+
const client = getActiveClient();
|
|
24
|
+
client.log('message/markAsDelivered', subChannelId, messageId);
|
|
25
|
+
|
|
26
|
+
const { data } = await client.http.put<Amity.MarkDeliveredPayload>(
|
|
27
|
+
`/api/v1/markers/message-feeds/${subChannelId}/mark-delivering`,
|
|
28
|
+
{ messageId },
|
|
29
|
+
);
|
|
30
|
+
|
|
31
|
+
const cachedAt = client.cache && Date.now();
|
|
32
|
+
|
|
33
|
+
if (client.cache) ingestInCache(data, { cachedAt });
|
|
34
|
+
|
|
35
|
+
return true;
|
|
36
|
+
};
|
|
@@ -5,7 +5,7 @@ import { toPageRaw } from '~/core/query';
|
|
|
5
5
|
import { pullFromCache, pushToCache } from '~/cache/api';
|
|
6
6
|
import { ingestInCache } from '~/cache/api/ingestInCache';
|
|
7
7
|
import { getResolver } from '~/core/model';
|
|
8
|
-
import { convertQueryParams,
|
|
8
|
+
import { convertQueryParams, prepareMessagePayload } from '../utils';
|
|
9
9
|
|
|
10
10
|
/* begin_public_function
|
|
11
11
|
id: message.query
|
|
@@ -36,19 +36,21 @@ export const queryMessages = async (
|
|
|
36
36
|
// API-FIX: backend should answer Amity.Response (2)
|
|
37
37
|
// API-FIX: pagination should not be indexed on channelSegment (3)
|
|
38
38
|
// const { data } = await client.http.get<Amity.Response<Amity.Paged<Amity.MessagePayload>>>(
|
|
39
|
-
const
|
|
40
|
-
|
|
41
|
-
|
|
39
|
+
const { data: queryPayload } = await client.http.get<Amity.MessagePayload & Amity.Pagination>(
|
|
40
|
+
`/api/v5/messages`,
|
|
41
|
+
{ params },
|
|
42
|
+
);
|
|
42
43
|
|
|
43
44
|
// API-FIX: backend should answer Amity.Response (2)
|
|
44
45
|
// const { paging, messages } = unwrapPayload(data)
|
|
45
|
-
const { paging, ...
|
|
46
|
+
const { paging, ...payload } = queryPayload;
|
|
47
|
+
const data = await prepareMessagePayload(payload);
|
|
46
48
|
const { messages } = data;
|
|
47
49
|
|
|
48
50
|
const cachedAt = client.cache && Date.now();
|
|
49
51
|
|
|
50
52
|
if (client.cache) {
|
|
51
|
-
ingestInCache(data
|
|
53
|
+
ingestInCache(data, { cachedAt });
|
|
52
54
|
|
|
53
55
|
const cacheKey = ['message', 'query', params as Amity.Serializable];
|
|
54
56
|
pushToCache(cacheKey, { messages: messages.map(getResolver('message')), paging });
|
|
@@ -2,18 +2,28 @@ import { ASCApiError } from '~/core/errors';
|
|
|
2
2
|
import { UNSYNCED_OBJECT_CACHED_AT_VALUE } from '~/utils/constants';
|
|
3
3
|
import { disableCache, enableCache, pullFromCache, pushToCache } from '~/cache/api';
|
|
4
4
|
|
|
5
|
-
import { client, generateRawMessage, pause } from '~/utils/tests';
|
|
6
|
-
|
|
5
|
+
import { client, convertRawMessage, generateRawMessage, pause } from '~/utils/tests';
|
|
7
6
|
import { createQuery, runQuery } from '~/core/query';
|
|
7
|
+
|
|
8
8
|
import { convertFromRaw } from '../../utils';
|
|
9
9
|
import { onMessageCreated } from '../../events';
|
|
10
10
|
import { createMessage } from '../createMessage';
|
|
11
|
+
import * as getMessageMarkers from '../../../marker/api/getMessageMarkers';
|
|
11
12
|
|
|
12
13
|
const rawMessageToCreate = generateRawMessage();
|
|
13
|
-
const messageToCreate =
|
|
14
|
+
const messageToCreate = convertRawMessage(rawMessageToCreate);
|
|
14
15
|
const { messageId, uniqueId, ...messageWithoutId } = messageToCreate;
|
|
15
16
|
|
|
16
17
|
describe('createMessage', () => {
|
|
18
|
+
beforeAll(() => {
|
|
19
|
+
jest.spyOn(getMessageMarkers, 'getMessageMarkers').mockImplementation(() =>
|
|
20
|
+
Promise.resolve({
|
|
21
|
+
data: [],
|
|
22
|
+
cachedAt: undefined,
|
|
23
|
+
}),
|
|
24
|
+
);
|
|
25
|
+
});
|
|
26
|
+
|
|
17
27
|
const bundle = {
|
|
18
28
|
data: messageToCreate.data,
|
|
19
29
|
dataType: messageToCreate.dataType,
|
|
@@ -26,7 +36,6 @@ describe('createMessage', () => {
|
|
|
26
36
|
};
|
|
27
37
|
|
|
28
38
|
beforeEach(enableCache);
|
|
29
|
-
|
|
30
39
|
afterEach(disableCache);
|
|
31
40
|
|
|
32
41
|
// integration_test_id: 9691969d-6ba8-4af6-93d6-dfe9134e9796
|
|
@@ -2,14 +2,14 @@ import { disableCache, enableCache, pullFromCache, pushToCache } from '~/cache/a
|
|
|
2
2
|
import { isInTombstone } from '~/cache/api/isInTombstone';
|
|
3
3
|
import { pushToTombstone } from '~/cache/api/pushToTombstone';
|
|
4
4
|
import { ASCApiError } from '~/core/errors';
|
|
5
|
-
import { client, generateRawMessage } from '~/utils/tests';
|
|
5
|
+
import { client, convertRawMessage, generateRawMessage } from '~/utils/tests';
|
|
6
6
|
|
|
7
7
|
import { getMessage } from '../getMessage';
|
|
8
8
|
import { onMessageFetched } from '../../events/onMessageFetched';
|
|
9
|
-
import
|
|
9
|
+
import * as getMessageMarkers from '../../../marker/api/getMessageMarkers';
|
|
10
10
|
|
|
11
11
|
const rawMessageToGet = generateRawMessage();
|
|
12
|
-
const messageToGet =
|
|
12
|
+
const messageToGet = convertRawMessage(rawMessageToGet);
|
|
13
13
|
const { messageId } = messageToGet;
|
|
14
14
|
|
|
15
15
|
const getResolvedMessageValue = () => ({
|
|
@@ -21,6 +21,15 @@ const getResolvedMessageValue = () => ({
|
|
|
21
21
|
});
|
|
22
22
|
|
|
23
23
|
describe('getMessage', () => {
|
|
24
|
+
beforeAll(() => {
|
|
25
|
+
jest.spyOn(getMessageMarkers, 'getMessageMarkers').mockImplementation(() =>
|
|
26
|
+
Promise.resolve({
|
|
27
|
+
data: [],
|
|
28
|
+
cachedAt: undefined,
|
|
29
|
+
}),
|
|
30
|
+
);
|
|
31
|
+
});
|
|
32
|
+
|
|
24
33
|
// integration_test_id: bc048747-17ea-43fe-9f97-7b2bf008c476
|
|
25
34
|
test('should return fetched message', async () => {
|
|
26
35
|
client.http.get = jest.fn().mockResolvedValueOnce(getResolvedMessageValue());
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { disableCache, enableCache, pullFromCache, pushToCache } from '~/cache/api';
|
|
2
2
|
import { ASCApiError } from '~/core/errors';
|
|
3
|
-
import { client, generateRawMessage } from '~/utils/tests';
|
|
3
|
+
import { client, convertRawMessage, generateRawMessage } from '~/utils/tests';
|
|
4
4
|
|
|
5
5
|
import { getMessages } from '../getMessages';
|
|
6
6
|
import { onMessageFetched } from '../../events/onMessageFetched';
|
|
7
|
-
import
|
|
7
|
+
import * as getMessageMarkers from '../../../marker/api/getMessageMarkers';
|
|
8
8
|
|
|
9
9
|
const rawMessagesToGet = [generateRawMessage(), generateRawMessage({ messageId: 'message-id-2' })];
|
|
10
|
-
const messagesToGet = rawMessagesToGet.map(
|
|
10
|
+
const messagesToGet = rawMessagesToGet.map(convertRawMessage);
|
|
11
11
|
const messageIds = messagesToGet.map(x => x.messageId);
|
|
12
12
|
|
|
13
13
|
const getResolvedMessageValue = () => ({
|
|
@@ -19,6 +19,15 @@ const getResolvedMessageValue = () => ({
|
|
|
19
19
|
});
|
|
20
20
|
|
|
21
21
|
describe('getMessages', () => {
|
|
22
|
+
beforeAll(() => {
|
|
23
|
+
jest.spyOn(getMessageMarkers, 'getMessageMarkers').mockImplementation(() =>
|
|
24
|
+
Promise.resolve({
|
|
25
|
+
data: [],
|
|
26
|
+
cachedAt: undefined,
|
|
27
|
+
}),
|
|
28
|
+
);
|
|
29
|
+
});
|
|
30
|
+
|
|
22
31
|
test('should return fetched messages', async () => {
|
|
23
32
|
client.http.get = jest.fn().mockResolvedValueOnce(getResolvedMessageValue());
|
|
24
33
|
|
|
@@ -67,8 +76,8 @@ describe('getMessages tombostone', () => {
|
|
|
67
76
|
});
|
|
68
77
|
|
|
69
78
|
describe('getMessages.locally', () => {
|
|
70
|
-
beforeEach(
|
|
71
|
-
afterEach(
|
|
79
|
+
beforeEach(enableCache);
|
|
80
|
+
afterEach(enableCache);
|
|
72
81
|
|
|
73
82
|
test('should return cached messages', () => {
|
|
74
83
|
messagesToGet.forEach(message => pushToCache(['message', 'get', message.messageId], message));
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
import { pullFromCache, enableCache, disableCache } from '~/cache/api';
|
|
2
|
+
import { getResolver } from '~/core/model';
|
|
3
|
+
|
|
4
|
+
import {
|
|
5
|
+
client,
|
|
6
|
+
connectClient,
|
|
7
|
+
disconnectClient,
|
|
8
|
+
generateFeedMarker,
|
|
9
|
+
generateUserMarker,
|
|
10
|
+
generateChannelMarker,
|
|
11
|
+
generateSubChannelMarker,
|
|
12
|
+
activeUser,
|
|
13
|
+
} from '~/utils/tests';
|
|
14
|
+
|
|
15
|
+
import { markAsDelivered } from '../markAsDelivered';
|
|
16
|
+
|
|
17
|
+
const { userId } = activeUser;
|
|
18
|
+
const entityId = 'feed1';
|
|
19
|
+
const feedId = 'sub-ch1';
|
|
20
|
+
const messageId = 'message1';
|
|
21
|
+
|
|
22
|
+
const expectedUserMarker = generateUserMarker({ userId });
|
|
23
|
+
const expectedChannelMarker = generateChannelMarker({ userId, entityId });
|
|
24
|
+
const expectedSubChannelMarker = generateSubChannelMarker({ userId, feedId, entityId });
|
|
25
|
+
const expectedFeedMarker = generateFeedMarker({ feedId, entityId });
|
|
26
|
+
|
|
27
|
+
const resolvedPutValue = {
|
|
28
|
+
data: {
|
|
29
|
+
userMarkers: [expectedUserMarker],
|
|
30
|
+
userEntityMarkers: [expectedChannelMarker],
|
|
31
|
+
userFeedMarkers: [expectedSubChannelMarker],
|
|
32
|
+
feedMarkers: [expectedFeedMarker],
|
|
33
|
+
} as Amity.MarkDeliveredPayload,
|
|
34
|
+
};
|
|
35
|
+
|
|
36
|
+
describe('markAsDelivered', () => {
|
|
37
|
+
beforeAll(connectClient);
|
|
38
|
+
afterAll(disconnectClient);
|
|
39
|
+
|
|
40
|
+
test('it should return `true`', async () => {
|
|
41
|
+
client.http.put = jest.fn().mockResolvedValueOnce(resolvedPutValue);
|
|
42
|
+
|
|
43
|
+
const recieved = await markAsDelivered(feedId, messageId);
|
|
44
|
+
|
|
45
|
+
expect(recieved).toBe(true);
|
|
46
|
+
});
|
|
47
|
+
|
|
48
|
+
test('it should update cache', async () => {
|
|
49
|
+
expect.assertions(4);
|
|
50
|
+
enableCache();
|
|
51
|
+
|
|
52
|
+
client.http.put = jest.fn().mockResolvedValueOnce(resolvedPutValue);
|
|
53
|
+
|
|
54
|
+
await markAsDelivered(feedId, messageId);
|
|
55
|
+
|
|
56
|
+
const recievedUserMarkerCache = pullFromCache(['userMarker', 'get', userId]);
|
|
57
|
+
|
|
58
|
+
const recievedChannelMarkerCache = pullFromCache([
|
|
59
|
+
'channelMarker',
|
|
60
|
+
'get',
|
|
61
|
+
getResolver('channelMarker')({ entityId, userId }),
|
|
62
|
+
]);
|
|
63
|
+
|
|
64
|
+
const recievedSubChannelMarkerCache = pullFromCache([
|
|
65
|
+
'subChannelMarker',
|
|
66
|
+
'get',
|
|
67
|
+
getResolver('subChannelMarker')({ entityId, feedId, userId }),
|
|
68
|
+
]);
|
|
69
|
+
|
|
70
|
+
const recievedFeedMarkerCache = pullFromCache([
|
|
71
|
+
'feedMarker',
|
|
72
|
+
'get',
|
|
73
|
+
getResolver('feedMarker')({ entityId, feedId }),
|
|
74
|
+
]);
|
|
75
|
+
|
|
76
|
+
expect(recievedUserMarkerCache?.data).toStrictEqual(expectedUserMarker);
|
|
77
|
+
expect(recievedChannelMarkerCache?.data).toStrictEqual(expectedChannelMarker);
|
|
78
|
+
expect(recievedSubChannelMarkerCache?.data).toStrictEqual(expectedSubChannelMarker);
|
|
79
|
+
expect(recievedFeedMarkerCache?.data).toStrictEqual(expectedFeedMarker);
|
|
80
|
+
|
|
81
|
+
disableCache();
|
|
82
|
+
});
|
|
83
|
+
});
|
|
@@ -1,15 +1,17 @@
|
|
|
1
1
|
import { disableCache, enableCache, pullFromCache, pushToCache } from '~/cache/api';
|
|
2
|
-
import { client, generateRawMessage } from '~/utils/tests';
|
|
2
|
+
import { client, convertRawMessage, generateRawMessage } from '~/utils/tests';
|
|
3
3
|
|
|
4
|
-
import {
|
|
4
|
+
import { convertQueryParams } from '../../utils';
|
|
5
5
|
import { queryMessages } from '../queryMessages';
|
|
6
6
|
import { onMessageFetched } from '../../events/onMessageFetched';
|
|
7
|
+
import * as getMessageMarkers from '../../../marker/api/getMessageMarkers';
|
|
7
8
|
|
|
8
9
|
const rawMessagesToQuery = [
|
|
9
10
|
generateRawMessage(),
|
|
10
11
|
generateRawMessage({ messageId: 'message-id-2' }),
|
|
11
12
|
];
|
|
12
|
-
|
|
13
|
+
|
|
14
|
+
const messagesToQuery = rawMessagesToQuery.map(convertRawMessage);
|
|
13
15
|
const messageIds = messagesToQuery.map(x => x.messageId);
|
|
14
16
|
const queryCriteriaWithoutPage = { subChannelId: messagesToQuery[0].subChannelId };
|
|
15
17
|
const queryCriteria = { ...queryCriteriaWithoutPage, page: { limit: 10 } };
|
|
@@ -28,6 +30,15 @@ const getResolvedMessageValue = () => ({
|
|
|
28
30
|
});
|
|
29
31
|
|
|
30
32
|
describe('queryMessages', () => {
|
|
33
|
+
beforeAll(() => {
|
|
34
|
+
jest.spyOn(getMessageMarkers, 'getMessageMarkers').mockImplementation(() =>
|
|
35
|
+
Promise.resolve({
|
|
36
|
+
data: [],
|
|
37
|
+
cachedAt: undefined,
|
|
38
|
+
}),
|
|
39
|
+
);
|
|
40
|
+
});
|
|
41
|
+
|
|
31
42
|
test('should return fetched messages with correct paging', async () => {
|
|
32
43
|
client.http.get = jest.fn().mockResolvedValueOnce(getResolvedMessageValue());
|
|
33
44
|
|
|
@@ -3,7 +3,8 @@ import { getActiveClient } from '~/client/api';
|
|
|
3
3
|
import { ingestInCache } from '~/cache/api/ingestInCache';
|
|
4
4
|
import { pullFromCache, upsertInCache } from '~/cache/api';
|
|
5
5
|
import { fireEvent } from '~/core/events';
|
|
6
|
-
|
|
6
|
+
|
|
7
|
+
import { convertParams, prepareMessagePayload } from '../utils';
|
|
7
8
|
|
|
8
9
|
/* begin_public_function
|
|
9
10
|
id: message.edit
|
|
@@ -32,12 +33,12 @@ export const updateMessage = async (
|
|
|
32
33
|
const client = getActiveClient();
|
|
33
34
|
client.log('message/updateMessage', patch);
|
|
34
35
|
|
|
35
|
-
const { data } = await client.http
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
36
|
+
const { data: payload } = await client.http.put<Amity.MessagePayload>(
|
|
37
|
+
`/api/v5/messages/${encodeURIComponent(messageId)}`,
|
|
38
|
+
convertParams(patch),
|
|
39
|
+
);
|
|
40
|
+
|
|
41
|
+
const data = await prepareMessagePayload(payload);
|
|
41
42
|
|
|
42
43
|
const cachedAt = client.cache && Date.now();
|
|
43
44
|
if (client.cache) ingestInCache(data, { cachedAt });
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
import { getActiveClient } from '~/client/api';
|
|
2
2
|
import { createEventSubscriber } from '~/core/events';
|
|
3
|
-
|
|
4
3
|
import { ingestInCache } from '~/cache/api/ingestInCache';
|
|
5
|
-
|
|
6
|
-
import { hasMention } from '~/utils';
|
|
4
|
+
|
|
7
5
|
import { prepareMessagePayload } from '../utils';
|
|
8
6
|
|
|
9
7
|
/**
|
|
@@ -17,48 +15,20 @@ import { prepareMessagePayload } from '../utils';
|
|
|
17
15
|
* Fired when an {@link Amity.Message} has been created
|
|
18
16
|
*
|
|
19
17
|
* @param callback The function to call when the event was fired
|
|
18
|
+
* @param local Trigger when an event occurs from a local event or not
|
|
20
19
|
* @returns an {@link Amity.Unsubscriber} function to stop listening
|
|
21
20
|
*
|
|
22
21
|
* @category Message Events
|
|
23
22
|
*/
|
|
24
|
-
export const onMessageCreated = (
|
|
23
|
+
export const onMessageCreated = (
|
|
24
|
+
callback: Amity.Listener<Amity.Message>,
|
|
25
|
+
local = true,
|
|
26
|
+
): Amity.Unsubscriber => {
|
|
25
27
|
const client = getActiveClient();
|
|
26
28
|
|
|
27
|
-
const filter = (rawPayload: Amity.MessagePayload) => {
|
|
28
|
-
const payload = prepareMessagePayload(rawPayload);
|
|
29
|
+
const filter = async (rawPayload: Amity.MessagePayload) => {
|
|
30
|
+
const payload = await prepareMessagePayload(rawPayload);
|
|
29
31
|
const message = payload.messages[0];
|
|
30
|
-
const cached = pullFromCache<Amity.Channel>(['channel', 'get', message.channelId]);
|
|
31
|
-
|
|
32
|
-
if (cached && cached.data.defaultSubChannelId === message.subChannelId) {
|
|
33
|
-
let update: Amity.Channel;
|
|
34
|
-
|
|
35
|
-
// @ts-ignore
|
|
36
|
-
if (cached.data.localReading) {
|
|
37
|
-
update = {
|
|
38
|
-
...cached.data,
|
|
39
|
-
localReadToSegment: message.channelSegment,
|
|
40
|
-
localLastMentionSegment: hasMention(message, client.userId!)
|
|
41
|
-
? message.channelSegment
|
|
42
|
-
: cached.data.localLastMentionSegment,
|
|
43
|
-
messageCount: message.channelSegment,
|
|
44
|
-
lastActivity: message.createdAt,
|
|
45
|
-
updatedAt: message.createdAt,
|
|
46
|
-
};
|
|
47
|
-
} else {
|
|
48
|
-
update = {
|
|
49
|
-
...cached.data,
|
|
50
|
-
defaultSubChannelHasUnreadMention:
|
|
51
|
-
hasMention(message, client.userId!) || cached.data.defaultSubChannelHasUnreadMention,
|
|
52
|
-
defaultSubChannelUnreadCount: message.channelSegment - cached.data.localReadToSegment,
|
|
53
|
-
lastActivity: message.createdAt,
|
|
54
|
-
messageCount: message.channelSegment,
|
|
55
|
-
updatedAt: message.createdAt,
|
|
56
|
-
};
|
|
57
|
-
}
|
|
58
|
-
|
|
59
|
-
pushToCache(['channel', 'get', message.channelId], update);
|
|
60
|
-
client.emitter.emit('local.channel.updated', { channels: [update] });
|
|
61
|
-
}
|
|
62
32
|
|
|
63
33
|
ingestInCache(payload);
|
|
64
34
|
callback(message);
|
|
@@ -66,11 +36,14 @@ export const onMessageCreated = (callback: Amity.Listener<Amity.Message>): Amity
|
|
|
66
36
|
|
|
67
37
|
const disposers = [
|
|
68
38
|
createEventSubscriber(client, 'message/onMessageCreated', 'message.created', filter),
|
|
69
|
-
createEventSubscriber(client, 'local.message.created', 'local.message.created', payload =>
|
|
70
|
-
callback(payload.messages[0]),
|
|
71
|
-
),
|
|
72
39
|
];
|
|
73
40
|
|
|
41
|
+
if (local) {
|
|
42
|
+
createEventSubscriber(client, 'message/onMessageCreated', 'local.message.created', payload =>
|
|
43
|
+
callback(payload.messages[0]),
|
|
44
|
+
);
|
|
45
|
+
}
|
|
46
|
+
|
|
74
47
|
return () => {
|
|
75
48
|
disposers.forEach(fn => fn());
|
|
76
49
|
};
|
|
@@ -22,8 +22,8 @@ import { prepareMessagePayload } from '../utils';
|
|
|
22
22
|
export const onMessageDeleted = (callback: Amity.Listener<Amity.Message>): Amity.Unsubscriber => {
|
|
23
23
|
const client = getActiveClient();
|
|
24
24
|
|
|
25
|
-
const filter = (rawPayload: Amity.MessagePayload) => {
|
|
26
|
-
const payload = prepareMessagePayload(rawPayload);
|
|
25
|
+
const filter = async (rawPayload: Amity.MessagePayload) => {
|
|
26
|
+
const payload = await prepareMessagePayload(rawPayload);
|
|
27
27
|
|
|
28
28
|
ingestInCache(payload);
|
|
29
29
|
callback(payload.messages[0]);
|
|
@@ -23,8 +23,8 @@ export const onMessageFlagCleared = (
|
|
|
23
23
|
): Amity.Unsubscriber => {
|
|
24
24
|
const client = getActiveClient();
|
|
25
25
|
|
|
26
|
-
const filter = (rawPayload: Amity.MessagePayload) => {
|
|
27
|
-
const payload = prepareMessagePayload(rawPayload);
|
|
26
|
+
const filter = async (rawPayload: Amity.MessagePayload) => {
|
|
27
|
+
const payload = await prepareMessagePayload(rawPayload);
|
|
28
28
|
|
|
29
29
|
ingestInCache(payload);
|
|
30
30
|
callback(payload.messages[0]);
|
|
@@ -22,8 +22,8 @@ import { prepareMessagePayload } from '../utils';
|
|
|
22
22
|
export const onMessageFlagged = (callback: Amity.Listener<Amity.Message>): Amity.Unsubscriber => {
|
|
23
23
|
const client = getActiveClient();
|
|
24
24
|
|
|
25
|
-
const filter = (rawPayload: Amity.MessagePayload) => {
|
|
26
|
-
const payload = prepareMessagePayload(rawPayload);
|
|
25
|
+
const filter = async (rawPayload: Amity.MessagePayload) => {
|
|
26
|
+
const payload = await prepareMessagePayload(rawPayload);
|
|
27
27
|
|
|
28
28
|
ingestInCache(payload);
|
|
29
29
|
callback(payload.messages[0]);
|
|
@@ -24,8 +24,8 @@ export const onMessageReactionAdded = (
|
|
|
24
24
|
): Amity.Unsubscriber => {
|
|
25
25
|
const client = getActiveClient();
|
|
26
26
|
|
|
27
|
-
const filter = (rawPayload: Amity.MessagePayload) => {
|
|
28
|
-
const payload = prepareMessagePayload(rawPayload);
|
|
27
|
+
const filter = async (rawPayload: Amity.MessagePayload) => {
|
|
28
|
+
const payload = await prepareMessagePayload(rawPayload);
|
|
29
29
|
|
|
30
30
|
ingestInCache(payload);
|
|
31
31
|
callback(payload.messages[0]);
|
|
@@ -24,8 +24,8 @@ export const onMessageReactionRemoved = (
|
|
|
24
24
|
): Amity.Unsubscriber => {
|
|
25
25
|
const client = getActiveClient();
|
|
26
26
|
|
|
27
|
-
const filter = (rawPayload: Amity.MessagePayload) => {
|
|
28
|
-
const payload = prepareMessagePayload(rawPayload);
|
|
27
|
+
const filter = async (rawPayload: Amity.MessagePayload) => {
|
|
28
|
+
const payload = await prepareMessagePayload(rawPayload);
|
|
29
29
|
|
|
30
30
|
ingestInCache(payload);
|
|
31
31
|
callback(payload.messages[0]);
|
|
@@ -21,8 +21,8 @@ import { prepareMessagePayload } from '../utils';
|
|
|
21
21
|
export const onMessageUnflagged = (callback: Amity.Listener<Amity.Message>): Amity.Unsubscriber => {
|
|
22
22
|
const client = getActiveClient();
|
|
23
23
|
|
|
24
|
-
const filter = (rawPayload: Amity.MessagePayload) => {
|
|
25
|
-
const payload = prepareMessagePayload(rawPayload);
|
|
24
|
+
const filter = async (rawPayload: Amity.MessagePayload) => {
|
|
25
|
+
const payload = await prepareMessagePayload(rawPayload);
|
|
26
26
|
|
|
27
27
|
ingestInCache(payload);
|
|
28
28
|
callback(payload.messages[0]);
|