@amityco/ts-sdk-react-native 6.22.1-600ab29.0 → 6.22.1-bc84d0c.0

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/messageRepository/utils/markReadMessage.ts

@@ -0,0 +1,8 @@
+import ReadReceiptSyncEngine from '~/client/utils/ReadReceiptSync/readReceiptSyncEngine';
+
+export const markReadMessage = (message: Amity.InternalMessage) => {
+  const { subChannelId, channelSegment } = message;
+  const markReadReceiptEngine = ReadReceiptSyncEngine.getInstance();
+
+  markReadReceiptEngine.markRead(subChannelId, channelSegment);
+};

package/src/postRepository/api/createPost.ts

@@ -26,7 +26,7 @@ import { LinkedObject } from '~/utils/linkedObject';
  * @category Post API
  * @async
  */
-export const createPost = async <T extends Amity.PostContentType>(
+export const createPost = async <T extends Amity.PostContentType | string>(
   bundle: Pick<Amity.Post<T>, 'targetType' | 'targetId'> &
     Partial<Pick<Amity.Post<T>, 'metadata' | 'mentionees' | 'tags'>> & {
       dataType?: T;
@@ -37,7 +37,6 @@ export const createPost = async <T extends Amity.PostContentType>(
   const client = getActiveClient();
   client.log('post/createPost', bundle);
 
-  // API-FIX: backend rejects that we pass the dataType manually T_T
   if (!bundle.dataType || ['text', 'image', 'file', 'video'].includes(bundle.dataType)) {
     // eslint-disable-next-line no-param-reassign
     delete bundle.dataType;

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/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
@@ -135,10 +135,12 @@ export const getSubChannel = (
             updateSubChannelCache(message.subChannelId, subChannel, {
               messagePreviewId: message.messageId,
             });
+          };
 
+          return onMessageCreatedMqtt(async (message: Amity.InternalMessage) => {
+            await updateMessagePreview(message);
             callback(message);
-          };
-          return onMessageCreatedMqtt(updateMessagePreview);
+          });
         },
         'subChannelId',
         'subChannel',
@@ -163,10 +165,12 @@ export const getSubChannel = (
             updateSubChannelCache(message.subChannelId, subChannel, {
               messagePreviewId: message.messageId,
             });
+          };
 
+          return onMessageCreatedLocal(async (message: Amity.InternalMessage) => {
+            await updateMessagePreview(message);
             callback(message);
-          };
-          return onMessageCreatedLocal(updateMessagePreview);
+          });
         },
         'subChannelId',
         'subChannel',
@@ -217,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() {
@@ -119,6 +119,14 @@ export class SubChannelLiveCollectionController extends LiveCollectionController
       },
       {
         fn: callback => {
+          const updateMessagePreview = async (message: Amity.InternalMessage) => {
+            const client = getActiveClient();
+            const messagePreviewSetting = await client.getMessagePreviewSetting(false);
+
+            if (messagePreviewSetting === Amity.MessagePreviewSetting.NO_MESSAGE_PREVIEW) return;
+
+            handleMessageCreated(message);
+          };
           return onMessageCreatedMqtt(async message => {
             const cacheData = pullFromCache<Amity.SubChannel>([
               'subChannel',
@@ -134,12 +142,7 @@ export class SubChannelLiveCollectionController extends LiveCollectionController
 
             if (!collection || !collection.data.includes(message.subChannelId)) return;
 
-            const client = getActiveClient();
-            const messagePreviewSetting = await client.getMessagePreviewSetting(false);
-
-            if (messagePreviewSetting === Amity.MessagePreviewSetting.NO_MESSAGE_PREVIEW) return;
-
-            handleMessageCreated(message);
+            await updateMessagePreview(message);
 
             const subChannelCache = pullFromCache<Amity.SubChannel>([
               'subChannel',
@@ -291,7 +294,7 @@ export class SubChannelLiveCollectionController extends LiveCollectionController
         action: 'onUpdate',
       },
       {
-        fn: convertEventPayload(onUserFeedMarkerUpdated, 'feedId', 'subChannel'),
+        fn: convertEventPayload(onSubChannelUnreadUpdatedLocal, 'subChannelId', 'subChannel'),
         action: 'onUpdate',
       },
     ]);
@@ -312,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/linkedObject/channelLinkedObject.ts

@@ -0,0 +1,8 @@
+import { markAsRead } from '~/channelRepository/api/markAsRead';
+
+export const channelLinkedObject = (channel: Amity.InternalChannel): Amity.Channel => {
+  return {
+    ...channel,
+    markAsRead: () => markAsRead(channel.channelInternalId),
+  };
+};

package/src/utils/linkedObject/index.ts

@@ -6,6 +6,7 @@ import { postLinkedObject } from './postLinkedObject';
 import { messageLinkedObject } from './messageLinkedObject';
 import { storyTargetLinkedObject } from './storyTargetLinkedObject';
 import { reactorLinkedObject } from './reactorLinkedObject';
+import { channelLinkedObject } from './channelLinkedObject';
 
 export const LinkedObject = {
   comment: commentLinkedObject,
@@ -16,4 +17,5 @@ export const LinkedObject = {
   storyTarget: storyTargetLinkedObject,
   message: messageLinkedObject,
   reactor: reactorLinkedObject,
+  channel: channelLinkedObject,
 };

package/src/utils/linkedObject/messageLinkedObject.ts

@@ -1,5 +1,5 @@
-import ReadReceiptSyncEngine from '~/client/utils/ReadReceiptSync/readReceiptSyncEngine';
 import { getMessageReadCount } from '~/messageRepository/utils/getMessageReadCount';
+import { markReadMessage } from '~/messageRepository/utils/markReadMessage';
 
 export const messageLinkedObject = (message: Amity.InternalMessage): Amity.Message => {
   const { creatorPrivateId, ...rest } = message;
@@ -11,11 +11,6 @@ export const messageLinkedObject = (message: Amity.InternalMessage): Amity.Messa
     get deliveredCount() {
       return getMessageReadCount(message).deliveredCount;
     },
-    markRead: () => {
-      const { subChannelId, channelSegment } = message;
-      const markReadReceiptEngine = ReadReceiptSyncEngine.getInstance();
-
-      markReadReceiptEngine.markRead(subChannelId, channelSegment);
-    },
+    markRead: () => markReadMessage(message),
   };
 };

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,

package/src/utils/object.ts

@@ -20,3 +20,18 @@ export const convertGetterPropsToStatic = <T extends Record<string, unknown>>(ob
 
   return Object.fromEntries(entries);
 };
+
+export const removeFunctionProperties = <T extends Record<string, unknown>>(obj: T): T => {
+  if (!isObject(obj)) {
+    return obj;
+  }
+
+  const entries = Object.entries(obj).map(([key, value]) => {
+    if (typeof value === 'function') {
+      return [key, undefined];
+    }
+    return [key, value];
+  });
+
+  return Object.fromEntries(entries);
+};