@amityco/ts-sdk 7.1.1-c8d4edca.0 → 7.1.1-e887d15f.0

package/dist/marker/events/onChannelUnreadInfoUpdatedLocal.d.ts

@@ -1,12 +1,12 @@
 /**
  * Internal used only
  *
- * Fired when an {@link Amity.userMessageFeedMarkers} has been resolved by Object Rsesolver
+ * Fired when an {@link Amity.channelUnreadInfo} has been updated.
  *
  * @param callback The function to call when the event was fired
  * @returns an {@link Amity.Unsubscriber} function to stop listening
  *
- * @category MessageMarker Events
+ * @category ChannelMarker Events
  */
 export declare const onChannelUnreadInfoUpdatedLocal: (callback: Amity.Listener<Amity.Events['local.channelUnreadInfo.updated']>) => Amity.Unsubscriber;
 //# sourceMappingURL=onChannelUnreadInfoUpdatedLocal.d.ts.map

package/dist/messageRepository/events/onMessageCreated.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"onMessageCreated.d.ts","sourceRoot":"","sources":["../../../src/messageRepository/events/onMessageCreated.ts"],"names":[],"mappings":"AASA;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,oBAAoB,aACrB,MAAM,QAAQ,CAAC,MAAM,eAAe,CAAC,KAC9C,MAAM,YA+BR,CAAC;AAEF,eAAO,MAAM,qBAAqB,aACtB,MAAM,QAAQ,CAAC,MAAM,eAAe,CAAC,KAC9C,MAAM,YAoBR,CAAC"}
+{"version":3,"file":"onMessageCreated.d.ts","sourceRoot":"","sources":["../../../src/messageRepository/events/onMessageCreated.ts"],"names":[],"mappings":"AAUA;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,oBAAoB,aACrB,MAAM,QAAQ,CAAC,MAAM,eAAe,CAAC,KAC9C,MAAM,YAgER,CAAC;AAEF,eAAO,MAAM,qBAAqB,aACtB,MAAM,QAAQ,CAAC,MAAM,eAAe,CAAC,KAC9C,MAAM,YAoBR,CAAC"}

package/package.json

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

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

@@ -84,6 +84,8 @@ declare global {
     > & {
       isMentioned: boolean;
       subChannelsUnreadCount: number;
+      // legacy unread count does not use the maker service
+      unreadCount: number;
     };
 
     /* public type */

package/src/channelRepository/events/onChannelDeleted.ts

@@ -6,6 +6,7 @@ import { ingestInCache } from '~/cache/api/ingestInCache';
 import { prepareChannelPayload } from '../utils/prepareChannelPayload';
 import { addFlagIsDeletedSubChannelUnreadByChannelId } from '~/marker/utils/addFlagIsDeletedSubChannelUnreadByChannelId';
 import { deleteChannelUnreadByChannelId } from '../../marker/utils/deleteChannelUnreadByChannelId';
+import { dropFromCache } from '~/cache/api';
 
 type CallbackFn = (channel: Amity.StaticInternalChannel) => void;
 const callbacks: CallbackFn[] = [];
@@ -28,12 +29,17 @@ export const onChannelDeleted = (callback: Amity.Listener<Amity.StaticInternalCh
     const filter = async (payload: Amity.ChannelPayload) => {
       const data = await prepareChannelPayload(payload);
 
-      if (client.isUnreadCountEnabled && client.getMarkerSyncConsistentMode()) {
-        data.channels.forEach(channel => {
+      const isConsistentMode = client.getMarkerSyncConsistentMode() && client.isUnreadCountEnabled;
+      const isLegacyUnreadCount = client.useLegacyUnreadCount;
+
+      data.channels.forEach(channel => {
+        if (isConsistentMode) {
           addFlagIsDeletedSubChannelUnreadByChannelId(channel.channelId);
           deleteChannelUnreadByChannelId(channel.channelId);
-        });
-      }
+        } else if (isLegacyUnreadCount) {
+          dropFromCache(['channelUnread', 'get', channel.channelId]);
+        }
+      });
 
       ingestInCache(data);
       callbacks.forEach(cb => cb(data.channels[0]));

package/src/channelRepository/events/onChannelLeft.ts

@@ -6,6 +6,7 @@ import { ingestInCache } from '~/cache/api/ingestInCache';
 import { prepareChannelPayload } from '../utils';
 import { deleteChannelUnreadByChannelId } from '../../marker/utils/deleteChannelUnreadByChannelId';
 import { addFlagIsDeletedSubChannelUnreadByChannelId } from '~/marker/utils/addFlagIsDeletedSubChannelUnreadByChannelId';
+import { dropFromCache } from '~/cache/api';
 
 type CallbackFn = (
   channel: Amity.StaticInternalChannel,
@@ -40,10 +41,17 @@ export const onChannelLeft = (
         isMessagePreviewUpdated: isLeftByMe,
       });
 
-      if (client.isUnreadCountEnabled && client.getMarkerSyncConsistentMode() && isLeftByMe) {
+      const isConsistentMode = client.getMarkerSyncConsistentMode() && client.isUnreadCountEnabled;
+      const isLegacyUnreadCount = client.useLegacyUnreadCount;
+
+      if (isLeftByMe) {
         preparedPayload.channels.forEach(channel => {
-          addFlagIsDeletedSubChannelUnreadByChannelId(channel.channelId);
-          deleteChannelUnreadByChannelId(channel.channelId);
+          if (isConsistentMode) {
+            addFlagIsDeletedSubChannelUnreadByChannelId(channel.channelId);
+            deleteChannelUnreadByChannelId(channel.channelId);
+          } else if (isLegacyUnreadCount) {
+            dropFromCache(['channelUnread', 'get', channel.channelId]);
+          }
         });
       }
 

package/src/channelRepository/events/onChannelUnreadUpdatedLocal.ts

@@ -4,12 +4,12 @@ import { createEventSubscriber } from '~/core/events';
 /**
  * Internal used only
  *
- * Fired when an {@link Amity.userMessageFeedMarkers} has been resolved by Object Rsesolver
+ * Fired when an {@link Amity.ChannelUnread} has been updated.
  *
  * @param callback The function to call when the event was fired
  * @returns an {@link Amity.Unsubscriber} function to stop listening
  *
- * @category MessageMarker Events
+ * @category Channel Events
  */
 export const onChannelUnreadUpdatedLocal = (
   callback: Amity.Listener<Amity.Events['local.channelUnread.updated']>,

package/src/client/utils/ReadReceiptSync/readReceiptSyncEngine.ts

@@ -38,7 +38,6 @@ export class MessageReadReceiptSyncEngine {
     if (this.jobQueue.length === 0 || this.isActive === false) return;
 
     const readReceipts = this.getReadReceipts();
-    console.log('[New 🌟 readReceipts] Sync read receipts', readReceipts);
     if (readReceipts) {
       this.markReadApi(readReceipts);
     }
@@ -159,8 +158,6 @@ export class MessageReadReceiptSyncEngine {
     const cacheKey = ['channelUnread', 'get', channelId];
     const channelUnread = pullFromCache<Amity.ChannelUnread>(cacheKey)?.data;
 
-    console.log('[New 🌟] Mark read => channel unread', channelUnread);
-
     if (channelUnread && segment > channelUnread.readToSegment) {
       channelUnread.readToSegment = segment;
       channelUnread.unreadCount = Math.max(channelUnread.lastSegment - segment, 0);

package/src/marker/events/onChannelUnreadInfoUpdatedLocal.ts

@@ -4,12 +4,12 @@ import { createEventSubscriber } from '~/core/events';
 /**
  * Internal used only
  *
- * Fired when an {@link Amity.userMessageFeedMarkers} has been resolved by Object Rsesolver
+ * Fired when an {@link Amity.channelUnreadInfo} has been updated.
  *
  * @param callback The function to call when the event was fired
  * @returns an {@link Amity.Unsubscriber} function to stop listening
  *
- * @category MessageMarker Events
+ * @category ChannelMarker Events
  */
 export const onChannelUnreadInfoUpdatedLocal = (
   callback: Amity.Listener<Amity.Events['local.channelUnreadInfo.updated']>,

package/src/messageRepository/events/onMessageCreated.ts

@@ -6,6 +6,7 @@ import { reCalculateChannelUnreadInfo } from '~/marker/utils/reCalculateChannelU
 import { getActiveUser } from '~/client/api/activeUser';
 import { markReadMessage } from '../utils/markReadMessage';
 import { prepareMessagePayload } from '../utils';
+import { pullFromCache, pushToCache } from '~/cache/api';
 
 /**
  * ```js
@@ -40,6 +41,39 @@ export const onMessageCreatedMqtt = (
       });
     }
 
+    if (client.useLegacyUnreadCount) {
+      rawPayload.messages.forEach(message => {
+        const channelUnread = pullFromCache<Amity.ChannelUnread>([
+          'channelUnread',
+          'get',
+          message.channelId,
+        ])?.data;
+        if (!channelUnread || channelUnread.lastSegment >= message.segment) return;
+
+        const lastSegment = message.segment;
+        const isMentionedInMessage = message.mentionedUsers?.some(mention => {
+          return (
+            mention.type === 'channel' ||
+            (mention.type === 'user' &&
+              client.userId &&
+              mention.userPublicIds.includes(client.userId))
+          );
+        });
+
+        const lastMentionSegment = isMentionedInMessage
+          ? message.segment
+          : channelUnread.lastMentionSegment;
+
+        pushToCache(['channelUnread', 'get', message.channelId], {
+          ...channelUnread,
+          lastSegment,
+          unreadCount: lastSegment - channelUnread.readToSegment,
+          lastMentionSegment,
+          isMentioned: !(channelUnread.readToSegment >= lastMentionSegment),
+        });
+      });
+    }
+
     // Update in cache
     ingestInCache(payload);
 

package/dist/marker/events/onChannelUnreadUpdatedLocal.d.ts

@@ -1,12 +0,0 @@
-/**
- * Internal used only
- *
- * Fired when an {@link Amity.userMessageFeedMarkers} has been resolved by Object Rsesolver
- *
- * @param callback The function to call when the event was fired
- * @returns an {@link Amity.Unsubscriber} function to stop listening
- *
- * @category MessageMarker Events
- */
-export declare const onChannelUnreadUpdatedLocal: (callback: Amity.Listener<Amity.Events['local.channelUnread.updated']>) => Amity.Unsubscriber;
-//# sourceMappingURL=onChannelUnreadUpdatedLocal.d.ts.map

package/dist/marker/events/onChannelUnreadUpdatedLocal.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"onChannelUnreadUpdatedLocal.d.ts","sourceRoot":"","sources":["../../../src/marker/events/onChannelUnreadUpdatedLocal.ts"],"names":[],"mappings":"AAGA;;;;;;;;;GASG;AACH,eAAO,MAAM,2BAA2B,aAC5B,MAAM,QAAQ,CAAC,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC,KACpE,MAAM,YAaR,CAAC"}

package/src/marker/events/onChannelUnreadUpdatedLocal.ts

@@ -1,29 +0,0 @@
-import { getActiveClient } from '~/client/api/activeClient';
-import { createEventSubscriber } from '~/core/events';
-
-/**
- * Internal used only
- *
- * Fired when an {@link Amity.userMessageFeedMarkers} has been resolved by Object Rsesolver
- *
- * @param callback The function to call when the event was fired
- * @returns an {@link Amity.Unsubscriber} function to stop listening
- *
- * @category MessageMarker Events
- */
-export const onChannelUnreadUpdatedLocal = (
-  callback: Amity.Listener<Amity.Events['local.channelUnread.updated']>,
-): Amity.Unsubscriber => {
-  const client = getActiveClient();
-
-  const filter = (payload: Amity.Events['local.channelUnread.updated']) => {
-    callback(payload);
-  };
-
-  return createEventSubscriber(
-    client,
-    'channel/onChannelUnreadUpdatedLocal',
-    'local.channelUnread.updated',
-    filter,
-  );
-};