@amityco/ts-sdk-react-native 6.23.0 → 6.23.1-d5c2fe6.0

package/src/core/liveCollection/LiveCollectionController.ts

@@ -57,10 +57,13 @@ export abstract class LiveCollectionController<
     }
   }
 
-  protected loadPage(
+  protected loadPage({
     initial = false,
-    direction: Amity.LiveCollectionPageDirection = Amity.LiveCollectionPageDirection.NEXT,
-  ) {
+    direction = Amity.LiveCollectionPageDirection.NEXT,
+  }: {
+    initial?: boolean;
+    direction?: Amity.LiveCollectionPageDirection;
+  }) {
     this.setup();
 
     this.notifyChange({ origin: Amity.LiveDataOrigin.LOCAL, loading: true });

package/src/marker/events/onChannelUnreadUpdatedLocal.ts

@@ -0,0 +1,29 @@
+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,
+    'channelMarker/onChannelUnreadUpdatedLocal',
+    'local.channelUnread.updated',
+    filter,
+  );
+};

package/src/marker/events/onSubChannelMarkerFetched.ts

@@ -22,7 +22,7 @@ export const onSubChannelMarkerFetched = (
   const client = getActiveClient();
 
   const filter = (payload: Amity.Events['local.subChannelMarker.fetched']) => {
-    callback(payload.userFeedMarkers[0]);
+    payload.userFeedMarkers.forEach(callback);
   };
 
   return createEventSubscriber(

package/src/marker/events/onSubChannelUnreadUpdatedLocal.ts

@@ -0,0 +1,29 @@
+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 onSubChannelUnreadUpdatedLocal = (
+  callback: Amity.Listener<Amity.Events['local.subChannelUnread.updated']>,
+): Amity.Unsubscriber => {
+  const client = getActiveClient();
+
+  const filter = (payload: Amity.Events['local.subChannelUnread.updated']) => {
+    callback(payload);
+  };
+
+  return createEventSubscriber(
+    client,
+    'subChannelMarker/onSubChannelUnreadUpdatedLocal',
+    'local.subChannelUnread.updated',
+    filter,
+  );
+};

package/src/marker/events/onUserFeedMarkerUpdated.ts

@@ -23,10 +23,9 @@ export const onUserFeedMarkerUpdated = (
   const client = getActiveClient();
 
   const filter = (payload: Amity.Events['marker.userFeed-updated']) => {
-    // update sub channel unread info and channel unread info in cache
-    persistUnreadCountInfo(payload);
-
-    callback(payload.feedMarkers[0]);
+    payload.feedMarkers.forEach(feedMarker => {
+      callback(feedMarker);
+    });
   };
 
   return createEventSubscriber(

package/src/marker/utils/reCalculateChannelUnreadInfo.ts

@@ -1,7 +1,7 @@
 import { pushToCache, queryCache } from '~/cache/api';
 import { pullFromCache } from '~/cache/api/pullFromCache';
 
-export const reCalculateChannelUnreadInfo = async (channelId: string) => {
+export const reCalculateChannelUnreadInfo = (channelId: string): Amity.ChannelUnreadInfo => {
   const cacheKeyChannelUnread = ['channelUnreadInfo', 'get', channelId];
   const cacheChannelUnreadInfo =
     pullFromCache<Amity.ChannelUnreadInfo>(cacheKeyChannelUnread)?.data;
@@ -25,7 +25,7 @@ export const reCalculateChannelUnreadInfo = async (channelId: string) => {
     isMentioned = subChannelUnreadsInfo.some(({ data }) => data.isMentioned);
   }
 
-  pushToCache(cacheKeyChannelUnread, {
+  const channelUnreadInfo = {
     ...(cacheChannelUnreadInfo ?? {
       channelId,
       createdAt: new Date().toISOString(),
@@ -33,5 +33,9 @@ export const reCalculateChannelUnreadInfo = async (channelId: string) => {
     updatedAt: new Date().toISOString(),
     unreadCount: channelUnreads,
     isMentioned,
-  });
+  };
+
+  pushToCache(cacheKeyChannelUnread, channelUnreadInfo);
+
+  return channelUnreadInfo;
 };

package/src/messageRepository/observers/getMessages/MessageLiveCollectionController.ts

@@ -49,7 +49,7 @@ export class MessageLiveCollectionController extends LiveCollectionController<
     );
 
     this.callback = callback.bind(this);
-    this.loadPage(true);
+    this.loadPage({ initial: true });
   }
 
   protected setup() {
@@ -107,8 +107,8 @@ export class MessageLiveCollectionController extends LiveCollectionController<
     if (!this.shouldNotify(data) && origin === 'event') return;
 
     this.callback({
-      onNextPage: () => this.loadPage(false, Amity.LiveCollectionPageDirection.NEXT),
-      onPrevPage: () => this.loadPage(false, Amity.LiveCollectionPageDirection.PREV),
+      onNextPage: () => this.loadPage({ direction: Amity.LiveCollectionPageDirection.NEXT }),
+      onPrevPage: () => this.loadPage({ direction: Amity.LiveCollectionPageDirection.PREV }),
       data,
       hasNextPage: !!this.paginationController.getNextToken(),
       hasPrevPage: !!this.paginationController.getPrevToken(),

package/src/postRepository/api/editPost.ts

@@ -47,7 +47,7 @@ export const editPost = async <T extends Amity.PostContentType>(
   const cachedAt = client.cache && Date.now();
   if (client.cache) ingestInCache(data, { cachedAt });
 
-  fireEvent('post.updated', data);
+  fireEvent('local.post.updated', data);
 
   const { posts } = data;
 

package/src/postRepository/api/updatePost.ts

@@ -51,7 +51,7 @@ export const updatePost = async <T extends Amity.PostContentType>(
   const cachedAt = client.cache && Date.now();
   if (client.cache) ingestInCache(data, { cachedAt });
 
-  fireEvent('post.updated', data);
+  fireEvent('local.post.updated', data);
 
   const { posts } = data;
 

package/src/postRepository/observers/getPost.ts

@@ -13,6 +13,8 @@ import {
 } from '../events';
 import { pullFromCache, pushToCache } from '~/cache/api';
 import { LinkedObject } from '~/utils/linkedObject';
+import { onCommentCreated, onCommentDeleted } from '~/commentRepository';
+import { convertEventPayload } from '~/utils/event';
 
 /* begin_public_function
   id: post.get
@@ -80,6 +82,30 @@ export const getPost = (
     },
     onPostUnflagged,
     onPostUpdated,
+    convertEventPayload(
+      (callback: Amity.Listener<Amity.InternalComment>) => {
+        return onCommentCreated(async (comment: Amity.InternalComment) => {
+          if (comment.referenceId === postId) {
+            await _getPost(postId);
+            callback(comment);
+          }
+        });
+      },
+      'referenceId',
+      'post',
+    ),
+    convertEventPayload(
+      (callback: Amity.Listener<Amity.InternalComment>) => {
+        return onCommentDeleted(async (comment: Amity.InternalComment) => {
+          if (comment.referenceId === postId) {
+            await _getPost(postId);
+            callback(comment);
+          }
+        });
+      },
+      'referenceId',
+      'post',
+    ),
   ]);
 };
 /* end_public_function */

package/src/postRepository/observers/getPosts.ts

@@ -2,6 +2,7 @@
 import { getResolver } from '~/core/model';
 import { getActiveClient } from '~/client/api';
 import { dropFromCache, pullFromCache, pushToCache } from '~/cache/api';
+import { getPost as _getPost } from '../api/getPost';
 
 import {
   createQuery,
@@ -34,6 +35,8 @@ import {
   onPostUpdated,
 } from '../events';
 import { queryPosts } from '../api/queryPosts';
+import { convertEventPayload } from '~/utils/event';
+import { onCommentCreated, onCommentDeleted } from '~/commentRepository';
 
 /* begin_public_function
   id: post.query
@@ -204,6 +207,34 @@ export const getPosts = (
     onPostUnflagged(realtimeRouter('onUnflagged')),
     onPostReactionAdded(realtimeRouter('onReactionAdded')),
     onPostReactionRemoved(realtimeRouter('onReactionRemoved')),
+    convertEventPayload(
+      (callback: Amity.Listener<Amity.InternalComment>) => {
+        return onCommentCreated(async (comment: Amity.InternalComment) => {
+          const currentCollection = pullFromCache<Amity.PostLiveCollectionCache>(cacheKey)?.data;
+
+          if (!currentCollection || currentCollection.data.includes(comment.referenceId)) return;
+
+          await _getPost(comment.referenceId);
+          callback(comment);
+        });
+      },
+      'referenceId',
+      'post',
+    )(realtimeRouter('onUpdate')),
+    convertEventPayload(
+      (callback: Amity.Listener<Amity.InternalComment>) => {
+        return onCommentDeleted(async (comment: Amity.InternalComment) => {
+          const currentCollection = pullFromCache<Amity.PostLiveCollectionCache>(cacheKey)?.data;
+
+          if (!currentCollection || currentCollection.data.includes(comment.referenceId)) return;
+
+          await _getPost(comment.referenceId);
+          callback(comment);
+        });
+      },
+      'referenceId',
+      'post',
+    )(realtimeRouter('onUpdate')),
   );
 
   onFetch(true);

package/src/storyRepository/observers/getGlobalStoryTargets/GlobalStoryLiveCollectionController.ts

@@ -48,7 +48,7 @@ export class GlobalStoryLiveCollectionController extends LiveCollectionControlle
 
     this.paginationController = paginationController;
     this.callback = callback.bind(this);
-    this.loadPage(true);
+    this.loadPage({ initial: true });
   }
 
   protected setup() {
@@ -94,7 +94,7 @@ export class GlobalStoryLiveCollectionController extends LiveCollectionControlle
       ) as Amity.StoryTarget[];
 
     this.callback({
-      onNextPage: () => this.loadPage(false, Amity.LiveCollectionPageDirection.NEXT),
+      onNextPage: () => this.loadPage({ direction: Amity.LiveCollectionPageDirection.NEXT }),
       data,
       hasNextPage: !!this.paginationController.getNextToken(),
       loading,

package/src/storyRepository/observers/getStoriesByTargetIds/StoryLiveCollectionController.ts

@@ -42,7 +42,7 @@ export class StoryLiveCollectionController extends LiveCollectionController<
 
     this.paginationController = paginationController;
     this.callback = callback.bind(this);
-    this.loadPage(true);
+    this.loadPage({ initial: true });
   }
 
   protected setup() {

package/src/streamRepository/api/getStreams.ts

@@ -8,7 +8,7 @@ import { ingestInCache } from '~/cache/api/ingestInCache';
 */
 /**
  * ```js
- * import { getStreams } from '@amityco/ts-sdk-react-native'
+ * import { getStreams } from '@amityco/ts-sdk'
  * const streams = await getStreams()
  * ```
  *
@@ -62,7 +62,7 @@ export const getStreams = async (query?: {
 
 /**
  * ```js
- * import { getStreams } from '@amityco/ts-sdk-react-native'
+ * import { getStreams } from '@amityco/ts-sdk'
  * const streams = getStreams.locally()
  * ```
  *

package/src/streamRepository/events/onStreamFlagged.ts

@@ -0,0 +1,37 @@
+import { getActiveClient } from '~/client/api';
+import { createEventSubscriber } from '~/core/events';
+
+import { ingestInCache } from '~/cache/api/ingestInCache';
+
+/**
+ * ```js
+ * import { onStreamFlagged } from '@amityco/ts-sdk-react-native'
+ * const dispose = onStreamFlagged(stream => {
+ *   // ...
+ * })
+ * ```
+ *
+ * Fired when a {@link Amity.InternalStream} has started airing
+ *
+ * @param callback The function to call when the event was fired
+ * @returns an {@link Amity.Unsubscriber} function to stop listening
+ *
+ * @category Stream Events
+ */
+export const onStreamFlagged = (
+  callback: Amity.Listener<Amity.InternalStream>,
+): Amity.Unsubscriber => {
+  const client = getActiveClient();
+
+  const filter = (payload: Amity.StreamPayload) => {
+    ingestInCache(payload);
+    callback(payload.videoStreamings[0]);
+  };
+
+  return createEventSubscriber(
+    client,
+    'stream/onStreamFlagged',
+    'v3.video-streaming.didFlag',
+    filter,
+  );
+};

package/src/streamRepository/events/onStreamTerminated.ts

@@ -0,0 +1,37 @@
+import { getActiveClient } from '~/client/api';
+import { createEventSubscriber } from '~/core/events';
+
+import { ingestInCache } from '~/cache/api/ingestInCache';
+
+/**
+ * ```js
+ * import { onStreamTerminated } from '@amityco/ts-sdk-react-native'
+ * const dispose = onStreamTerminated(stream => {
+ *   // ...
+ * })
+ * ```
+ *
+ * Fired when a {@link Amity.InternalStream} has started airing
+ *
+ * @param callback The function to call when the event was fired
+ * @returns an {@link Amity.Unsubscriber} function to stop listening
+ *
+ * @category Stream Events
+ */
+export const onStreamTerminated = (
+  callback: Amity.Listener<Amity.InternalStream>,
+): Amity.Unsubscriber => {
+  const client = getActiveClient();
+
+  const filter = (payload: Amity.StreamPayload) => {
+    ingestInCache(payload);
+    callback(payload.videoStreamings[0]);
+  };
+
+  return createEventSubscriber(
+    client,
+    'stream/onStreamTerminated',
+    'v3.video-streaming.didTerminate',
+    filter,
+  );
+};

package/src/streamRepository/observers/getStreams.ts

@@ -26,7 +26,7 @@ import { onStreamRecorded, onStreamStarted, onStreamStopped } from '../events';
 */
 /**
  * ```js
- * import { StreamRepository } from '@amityco/ts-sdk-react-native'
+ * import { StreamRepository } from '@amityco/ts-sdk'
  * const streams = await StreamRepository.getStreams()
  * ```
  *

package/src/subChannelRepository/observers/getSubChannel.ts

@@ -20,7 +20,7 @@ import { getActiveClient } from '~/client';
 import { getSubChannelMessagePreviewWithUser } from '~/messagePreview/utils';
 import { isEqual } from '~/utils/isEqual';
 import { updateSubChannelCache } from '../utils/updateSubChannelCache';
-import { onUserFeedMarkerUpdated } from '~/marker/events/onUserFeedMarkerUpdated';
+import { onSubChannelUnreadUpdatedLocal } from '~/marker/events/onSubChannelUnreadUpdatedLocal';
 
 /* begin_public_function
   id: subchannel.get
@@ -221,7 +221,7 @@ export const getSubChannel = (
         'subChannelId',
         'subChannel',
       ),
-      convertEventPayload(onUserFeedMarkerUpdated, 'feedId', 'subChannel'),
+      convertEventPayload(onSubChannelUnreadUpdatedLocal, 'subChannelId', 'subChannel'),
     ],
     {
       forceDispatch: true,

package/src/subChannelRepository/observers/getSubChannels/SubChannelLiveCollectionController.ts

@@ -29,7 +29,7 @@ import { getSubChannel } from '~/subChannelRepository/api/getSubChannel';
 import { updateSubChannelCache } from '~/subChannelRepository/utils/updateSubChannelCache';
 import { prepareSubChannelPayload } from '~/subChannelRepository/utils';
 import { onSubChannelFetched } from '~/subChannelRepository/events/onSubChannelFetched';
-import { onUserFeedMarkerUpdated } from '~/marker/events/onUserFeedMarkerUpdated';
+import { onSubChannelUnreadUpdatedLocal } from '~/marker/events/onSubChannelUnreadUpdatedLocal';
 
 export class SubChannelLiveCollectionController extends LiveCollectionController<
   'subChannel',
@@ -59,7 +59,7 @@ export class SubChannelLiveCollectionController extends LiveCollectionController
       prepareSubChannelPayload,
     );
     this.callback = callback.bind(this);
-    this.loadPage(true);
+    this.loadPage({ initial: true });
   }
 
   protected setup() {
@@ -294,7 +294,7 @@ export class SubChannelLiveCollectionController extends LiveCollectionController
         action: 'onUpdate',
       },
       {
-        fn: convertEventPayload(onUserFeedMarkerUpdated, 'feedId', 'subChannel'),
+        fn: convertEventPayload(onSubChannelUnreadUpdatedLocal, 'subChannelId', 'subChannel'),
         action: 'onUpdate',
       },
     ]);
@@ -315,7 +315,7 @@ export class SubChannelLiveCollectionController extends LiveCollectionController
     if (!this.shouldNotify(data) && origin === 'event') return;
 
     this.callback({
-      onNextPage: () => this.loadPage(false, Amity.LiveCollectionPageDirection.NEXT),
+      onNextPage: () => this.loadPage({ direction: Amity.LiveCollectionPageDirection.NEXT }),
       data,
       hasNextPage: !!this.paginationController.getNextToken(),
       loading,

package/src/utils/liveObject.ts

@@ -10,6 +10,9 @@ import { convertGetterPropsToStatic } from '~/utils/object';
 
 import { isEqual } from './isEqual';
 
+/**
+ * @deprecated This function is deprecated
+ */
 export const liveObject = <
   T extends Amity.Model,
   K extends keyof T,