@amityco/ts-sdk 6.11.2-e853528.0 → 6.12.1-06d644c.0

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

@@ -13,5 +13,5 @@
  *
  * @category SubChannelMarker Events
  */
-export declare const onSubChannelMarkerUpdated: (callback: Amity.Listener<Amity.SubChannelMarker>) => Amity.Unsubscriber;
+export declare const onSubChannelMarkerUpdated: (callback: Amity.Listener<Amity.SubChannelMarker[]>) => Amity.Unsubscriber;
 //# sourceMappingURL=onSubChannelMarkerUpdated.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"onSubChannelMarkerUpdated.d.ts","sourceRoot":"","sources":["../../../src/marker/events/onSubChannelMarkerUpdated.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,yBAAyB,aAC1B,MAAM,QAAQ,CAAC,MAAM,gBAAgB,CAAC,KAC/C,MAAM,YAaR,CAAC"}
+{"version":3,"file":"onSubChannelMarkerUpdated.d.ts","sourceRoot":"","sources":["../../../src/marker/events/onSubChannelMarkerUpdated.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,yBAAyB,aAC1B,MAAM,QAAQ,CAAC,MAAM,gBAAgB,EAAE,CAAC,KACjD,MAAM,YAaR,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"getSubChannel.d.ts","sourceRoot":"","sources":["../../../src/subChannelRepository/observers/getSubChannel.ts"],"names":[],"mappings":"AAoBA;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,aAAa,iBACV,MAAM,UAAU,CAAC,cAAc,CAAC,YACpC,MAAM,kBAAkB,CAAC,MAAM,UAAU,CAAC,KACnD,MAAM,YAkIR,CAAC"}
+{"version":3,"file":"getSubChannel.d.ts","sourceRoot":"","sources":["../../../src/subChannelRepository/observers/getSubChannel.ts"],"names":[],"mappings":"AAqBA;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,aAAa,iBACV,MAAM,UAAU,CAAC,cAAc,CAAC,YACpC,MAAM,kBAAkB,CAAC,MAAM,UAAU,CAAC,KACnD,MAAM,YAmJR,CAAC"}

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

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

package/dist/userRepository/api/isUserFlaggedByMe.d.ts

@@ -1,7 +1,7 @@
 /**
  * ```js
  * import { UserRepository } from '@amityco/ts-sdk'
- * const isFlagged = await UserRepository.isUserFlaggedByMe('post', postId)
+ * const isFlagged = await UserRepository.isUserFlaggedByMe(postId)
  * ```
  *
  * @param userId The ID of the thing to check a report to.

package/dist/userRepository/api/isUserFlaggedByMe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isUserFlaggedByMe.d.ts","sourceRoot":"","sources":["../../../src/userRepository/api/isUserFlaggedByMe.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;KAWK;AACL,eAAO,MAAM,iBAAiB,WAAkB,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAG,QAAQ,OAAO,CAarF,CAAC"}
+{"version":3,"file":"isUserFlaggedByMe.d.ts","sourceRoot":"","sources":["../../../src/userRepository/api/isUserFlaggedByMe.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;KAWK;AACL,eAAO,MAAM,iBAAiB,WAAkB,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAG,QAAQ,OAAO,CASrF,CAAC"}

package/package.json

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

package/src/channelRepsitory/api/markAsRead.ts

@@ -37,15 +37,15 @@ export const markAsRead = async (channelId: Amity.Channel['channelId']): Promise
   } = data;
 
   const cachedAt = client.cache && Date.now();
-
   const channelMarkers = convertChannelMarkerResponse(userEntityMarkersPayload);
+  const subChannelMarkers = convertSubChannelMarkerResponse(userFeedMarkersPayload);
 
   if (client.cache)
     ingestInCache(
       {
         userMarkers: convertUserMarkerResponse(userMarkersPayload),
         userEntityMarkers: channelMarkers,
-        userFeedMarkers: convertSubChannelMarkerResponse(userFeedMarkersPayload),
+        userFeedMarkers: subChannelMarkers,
         ...rest,
       },
       { cachedAt },
@@ -55,5 +55,9 @@ export const markAsRead = async (channelId: Amity.Channel['channelId']): Promise
     userEntityMarkers: channelMarkers,
   });
 
+  fireEvent('local.subChannelMarker.updated', {
+    userFeedMarkers: subChannelMarkers,
+  });
+
   return true;
 };

package/src/marker/events/onSubChannelMarkerUpdated.ts

@@ -17,12 +17,12 @@ import { createEventSubscriber } from '~/core/events';
  * @category SubChannelMarker Events
  */
 export const onSubChannelMarkerUpdated = (
-  callback: Amity.Listener<Amity.SubChannelMarker>,
+  callback: Amity.Listener<Amity.SubChannelMarker[]>,
 ): Amity.Unsubscriber => {
   const client = getActiveClient();
 
   const filter = (payload: Amity.Events['local.subChannelMarker.updated']) => {
-    callback(payload.userFeedMarkers[0]);
+    callback(payload.userFeedMarkers);
   };
 
   return createEventSubscriber(

package/src/subChannelRepository/observers/getSubChannel.ts

@@ -1,4 +1,4 @@
-import { onSubChannelMarkerFetched } from '~/marker/events';
+import { onSubChannelMarkerFetched, onSubChannelMarkerUpdated } from '~/marker/events';
 import { convertEventPayload } from '~/utils/event';
 import { liveObject } from '~/utils/liveObject';
 import { getSubChannel as _getSubChannel } from '../api/getSubChannel';
@@ -14,6 +14,7 @@ import {
 import { getActiveClient } from '~/client';
 import { getSubChannelMessagePreviewWithUser } from '~/messagePreview/utils';
 import { isEqual } from '~/utils/isEqual';
+import { updateSubChannelCache } from '../utils/updateSubChannelCache';
 
 /* begin_public_function
   id: subchannel.get
@@ -89,6 +90,25 @@ export const getSubChannel = (
       },
       onSubChannelDeleted,
       convertEventPayload(onSubChannelMarkerFetched, 'feedId', 'subChannel'),
+      callback => {
+        return onSubChannelMarkerUpdated(subChannelMarkers => {
+          const isTargetSubChannel = subChannelMarkers.find(
+            ({ feedId }) => feedId === subChannelId,
+          );
+
+          if (!isTargetSubChannel) return;
+
+          const subChannel = pullFromCache<Amity.SubChannel>([
+            'subChannel',
+            'get',
+            subChannelId,
+          ])?.data;
+
+          if (!subChannel) return;
+
+          callback(subChannel);
+        });
+      },
       convertEventPayload(
         (callback: Amity.Listener<Amity.Message>) => {
           const updateMessagePreview = async (message: Amity.Message) => {
@@ -106,9 +126,7 @@ export const getSubChannel = (
             ])?.data;
             if (!subChannel) return;
 
-            // TODO: avoid subChannel update cache without getter defined
-            pushToCache(['subChannel', 'get', subChannelId], {
-              ...subChannel,
+            updateSubChannelCache(subChannel, {
               messagePreviewId: message.messageId,
             });
 

package/src/subChannelRepository/observers/getSubChannels.ts

@@ -7,7 +7,7 @@ import {
   runQuery,
   sortByLastActivity,
 } from '~/core/query';
-import { onSubChannelMarkerFetched } from '~/marker/events';
+import { onSubChannelMarkerFetched, onSubChannelMarkerUpdated } from '~/marker/events';
 import {
   COLLECTION_DEFAULT_CACHING_POLICY,
   COLLECTION_DEFAULT_PAGINATION_LIMIT,
@@ -99,27 +99,37 @@ export const getSubChannels = (
     });
   };
 
-  const realtimeRouter = (action: Amity.ChannelActionType) => (subChannel: Amity.SubChannel) => {
-    if (
-      params.channelId !== subChannel.channelId ||
-      !snapshot ||
-      !shouldDispatchCollection(snapshot.data, subChannel, action)
-    ) {
-      return;
-    }
-
-    if (action === 'onCreate') {
-      snapshot.data = [subChannel, ...snapshot.data];
-    } else {
-      snapshot.data = snapshot.data.map(x =>
-        x.subChannelId === subChannel.subChannelId ? subChannel : x,
-      );
-    }
+  const realtimeRouter =
+    (action: Amity.ChannelActionType) => (subChannel: Amity.SubChannel | Amity.SubChannel[]) => {
+      if (!Array.isArray(subChannel)) {
+        if (
+          params.channelId !== subChannel.channelId ||
+          !snapshot ||
+          !shouldDispatchCollection(snapshot.data, subChannel, action)
+        ) {
+          return;
+        }
 
-    snapshot.data = snapshot.data.map(convertGetterPropsToStatic);
+        if (action === 'onCreate') {
+          snapshot.data = [subChannel, ...snapshot.data];
+        } else {
+          snapshot.data = snapshot.data.map(x =>
+            x.subChannelId === subChannel.subChannelId ? subChannel : x,
+          );
+        }
 
-    responder(snapshot);
-  };
+        snapshot.data = snapshot.data.map(convertGetterPropsToStatic);
+      } else {
+        /**
+         * In case of `onUpdate` event with array of subChannel
+         */
+        snapshot.data = snapshot.data.map(x => {
+          const targetSubChannel = subChannel.find(item => item.subChannelId === x.subChannelId);
+          return targetSubChannel ?? x;
+        });
+      }
+      responder(snapshot);
+    };
 
   const onFetch = () => {
     const subChannels = snapshot ? snapshot.data : [];
@@ -213,11 +223,16 @@ export const getSubChannels = (
       'feedId',
       'subChannel',
     )(realtimeRouter('onUpdate')),
-    convertEventPayload(
-      onSubChannelMarkerFetched,
-      'feedId',
-      'subChannel',
-    )(realtimeRouter('onUpdate')),
+    onSubChannelMarkerUpdated((subChannelMarkers: Amity.SubChannelMarker[]) => {
+      const subChannelWithMarkerUpdated =
+        subChannelMarkers
+          .map(({ feedId }) => pullFromCache<Amity.SubChannel>(['subChannel', 'get', feedId])!)
+          .filter(Boolean)
+          .map(({ data }) => data) ?? [];
+
+      if (subChannelWithMarkerUpdated.length === 0) return;
+      realtimeRouter('onUpdate')(subChannelWithMarkerUpdated);
+    }),
     convertEventPayload(
       (callback: Amity.Listener<Amity.Message>) => {
         const updateMessagePreview = async (message: Amity.Message) => {

package/src/subChannelRepository/utils/updateSubChannelCache.ts

@@ -6,7 +6,7 @@ export function updateSubChannelCache(
   params: Partial<Amity.SubChannel>,
 ) {
   pushToCache(
-    ['channel', 'get', subChannel.subChannelId],
+    ['subChannel', 'get', subChannel.subChannelId],
     // eslint-disable-next-line prefer-object-spread
     Object.assign(shallowClone(subChannel), params),
   );

package/src/userRepository/api/isUserFlaggedByMe.ts

@@ -7,7 +7,7 @@ import { synchronousWSCall } from '~/core/transports';
 /**
  * ```js
  * import { UserRepository } from '@amityco/ts-sdk'
- * const isFlagged = await UserRepository.isUserFlaggedByMe('post', postId)
+ * const isFlagged = await UserRepository.isUserFlaggedByMe(postId)
  * ```
  *
  * @param userId The ID of the thing to check a report to.
@@ -20,14 +20,10 @@ export const isUserFlaggedByMe = async (userId: Amity.User['userId']): Promise<b
   const client = getActiveClient();
   client.log('user/isUserFlaggedByMe', userId);
 
-  const { result, isFlagByMe } =
-    (await synchronousWSCall<{
-      result?: boolean;
-      isFlagByMe?: boolean;
-    }>(client, 'user.isFlagByMe', {
-      userId,
-    })) ?? {};
+  const {
+    data: { isFlagByMe },
+  } = await client.http.get(`/api/v3/users/${userId}/isFlagByMe`);
 
-  return result ?? isFlagByMe ?? false;
+  return isFlagByMe;
 };
 /* end_public_function */