@amityco/ts-sdk 6.18.1-c018952.0 → 6.19.0

package/src/subChannelRepository/events/onSubChannelCreated.ts

@@ -27,7 +27,14 @@ export const onSubChannelCreated = (callback: Amity.Listener<Amity.SubChannel>)
 
     // optimistically create subChannelUnreadInfo
     if (client.isUnreadCountEnabled && client.getMarkerSyncConsistentMode()) {
-      persistOptimisticUnreadInfo(rawPayload);
+      rawPayload.messageFeeds.forEach(subChannel => {
+        persistOptimisticUnreadInfo({
+          channelId: subChannel.channelId,
+          subChannelId: subChannel.messageFeedId,
+          createdAt: subChannel.createdAt,
+          updatedAt: subChannel.updatedAt,
+        });
+      });
     }
 
     ingestInCache(payload);

package/src/subChannelRepository/utils/persistOptimisticUnreadInfo.ts

@@ -1,23 +1,28 @@
 import { pushToCache } from '~/cache/api';
 
-export const persistOptimisticUnreadInfo = (rawPayload: Amity.SubChannelPayload) => {
-  rawPayload.messageFeeds.forEach(messageFeed => {
-    const subChannelUnreadInfo: Amity.SubChannelUnreadInfo = {
-      channelId: messageFeed.channelId,
-      subChannelId: messageFeed.messageFeedId,
-      unreadCount: 0,
-      readToSegment: 0,
-      lastMentionSegment: 0,
-      lastSegment: 0,
-      isMentioned: false,
-      isDeleted: false,
-      createdAt: messageFeed.createdAt,
-      updatedAt: messageFeed.updatedAt,
-    };
+export const persistOptimisticUnreadInfo = (
+  subChannelOptimisticInfo: Pick<
+    Amity.SubChannel,
+    'channelId' | 'subChannelId' | 'createdAt' | 'updatedAt'
+  >,
+) => {
+  const { channelId, subChannelId, createdAt, updatedAt } = subChannelOptimisticInfo;
 
-    pushToCache(
-      ['subChannelUnreadInfo', 'get', subChannelUnreadInfo.subChannelId],
-      subChannelUnreadInfo,
-    );
-  });
+  const subChannelUnreadInfo: Amity.SubChannelUnreadInfo = {
+    channelId,
+    subChannelId,
+    unreadCount: 0,
+    readToSegment: 0,
+    lastMentionSegment: 0,
+    lastSegment: 0,
+    isMentioned: false,
+    isDeleted: false,
+    createdAt,
+    updatedAt,
+  };
+
+  pushToCache(
+    ['subChannelUnreadInfo', 'get', subChannelUnreadInfo.subChannelId],
+    subChannelUnreadInfo,
+  );
 };

package/src/utils/liveObject.ts

@@ -64,6 +64,7 @@ export const liveObject = <
   };
 
   const onFetch = () => {
+    // TODO: Ihis `@ts-ignore` is bring back to fix the build and it needs to be removed later
     // @ts-ignore
     const query = createQuery(fetcher, id, true);
 

package/src/utils/tests/client.ts

@@ -22,7 +22,7 @@ jest
 
 export const client = createClient('key', 'sg');
 client.userId = 'test';
-client.accessTokenExpiryWatcher = (_, __, ___) => () => {
+client.accessTokenExpiryWatcher = _ => () => {
   //
 };
 

package/src/utils/tests/dummy/channel.ts

@@ -113,8 +113,8 @@ export const channelModel1: Amity.InternalChannel = {
   isUnreadCountSupport: true,
   unreadCount: 0,
   hasMentioned: false,
-  messagePreviewId: undefined,
   isMentioned: false,
+  messagePreviewId: undefined,
   subChannelsUnreadCount: 0,
 };
 
@@ -124,8 +124,8 @@ export const channelModel2: Amity.InternalChannel = {
   isUnreadCountSupport: true,
   unreadCount: 0,
   hasMentioned: false,
-  messagePreviewId: undefined,
   isMentioned: false,
+  messagePreviewId: undefined,
   subChannelsUnreadCount: 0,
 };
 
@@ -135,9 +135,9 @@ export const channel1: Amity.Channel = {
   isUnreadCountSupport: true,
   unreadCount: 0,
   hasMentioned: false,
+  isMentioned: false,
   messagePreviewId: undefined,
   messagePreview: null,
-  isMentioned: false,
   subChannelsUnreadCount: 0,
 };
 
@@ -147,9 +147,9 @@ export const channel2: Amity.Channel = {
   isUnreadCountSupport: true,
   unreadCount: 0,
   hasMentioned: false,
+  isMentioned: false,
   messagePreviewId: undefined,
   messagePreview: null,
-  isMentioned: false,
   subChannelsUnreadCount: 0,
 };
 

package/src/utils/tests/dummy/message.ts

@@ -40,8 +40,9 @@ export const convertRawMessage = ({
   segment,
   messageId,
   myReactions,
+  creatorId,
   ...rest
-}: Amity.RawMessage): Amity.Message => ({
+}: Amity.RawMessage): Amity.InternalMessage => ({
   ...rest,
   messageId,
   channelId: channelPublicId,
@@ -58,8 +59,16 @@ export const convertRawMessage = ({
   subChannelId: messageFeedId,
   uniqueId: messageId,
   myReactions: [],
+  creatorPrivateId: creatorId,
+});
+
+export const withLinkedObject = (message: Amity.InternalMessage): Amity.Message => ({
+  ...message,
   readCount: 0,
   deliveredCount: 0,
+  markRead: () => {
+    console.log('markRead');
+  },
 });
 
 export const convertRawMessagePayload = (
@@ -69,7 +78,7 @@ export const convertRawMessagePayload = (
   messages: rawPayload.messages.map(convertRawMessage),
 });
 
-export const message11: Amity.Message = convertRawMessage(
+export const message11: Amity.InternalMessage = convertRawMessage(
   generateRawMessage({
     channelPublicId: channel1.channelId,
     creatorPublicId: user11.userId,