@amityco/ts-sdk-react-native 6.22.1-cbca8f1.0 → 6.23.1-98c3335.0

package/src/channelRepository/observers/observeChannel.ts

@@ -15,6 +15,7 @@ import {
   onChannelMemberAdded,
   onChannelMemberRemoved,
 } from '../events';
+import { LinkedObject } from '~/utils/linkedObject';
 
 /**
  * ```js
@@ -46,11 +47,22 @@ export const observeChannel = <Events extends [Exclude<Amity.ChannelActionType,
     // filter function
     if (result.data?.channelId !== channelId) return;
 
-    if (callback instanceof Function) return callback(result);
+    if (callback instanceof Function)
+      return callback({
+        ...result,
+        data: LinkedObject.channel(result.data),
+      });
 
-    if (action !== 'onFetch') callback.onEvent?.(action, result);
+    if (action !== 'onFetch')
+      callback.onEvent?.(action, {
+        ...result,
+        data: LinkedObject.channel(result.data),
+      });
 
-    callback[action]?.(result);
+    callback[action]?.({
+      ...result,
+      data: LinkedObject.channel(result.data),
+    });
   };
 
   const disposers: Amity.Unsubscriber[] = [];

package/src/channelRepository/observers/observeChannels.ts

@@ -12,6 +12,7 @@ import {
   onChannelMemberAdded,
   onChannelMemberRemoved,
 } from '../events';
+import { LinkedObject } from '~/utils/linkedObject';
 
 /**
  * ```js
@@ -38,11 +39,14 @@ export const observeChannels = (
 
   const disposers: Amity.Unsubscriber[] = [];
 
-  const router = (channel: Amity.Channel, action: Exclude<Amity.ChannelActionType, 'onFetch'>) => {
-    if (callback instanceof Function) return callback(channel);
+  const router = (
+    channel: Amity.InternalChannel,
+    action: Exclude<Amity.ChannelActionType, 'onFetch'>,
+  ) => {
+    if (callback instanceof Function) return callback(LinkedObject.channel(channel));
 
-    callback.onEvent?.(action, channel);
-    callback[action]?.(channel);
+    callback.onEvent?.(action, LinkedObject.channel(channel));
+    callback[action]?.(LinkedObject.channel(channel));
   };
 
   disposers.push(

package/src/client/api/logout.ts

@@ -6,7 +6,7 @@ import { setSessionState } from './setSessionState';
 */
 /**
  * ```js
- * import { disconnectClient } from '@amityco/ts-sdk-react-native'
+ * import { Client } from '@amityco/ts-sdk-react-native';
  * const success = await Client.logout()
  * ```
  *

package/src/communityRepository/communityMembership/events/utils.ts

@@ -11,7 +11,7 @@ import { isNonNullable } from '~/utils';
 function hasPermission(
   member: Amity.Membership<'community'>,
   payload: {
-    users: Amity.InternalUser[];
+    communityUsers: Amity.Membership<'community'>[];
   },
   permission: string,
 ) {
@@ -20,7 +20,7 @@ function hasPermission(
   }
 
   return payload
-    .users!.find(user => user.userId === member.userId)!
+    .communityUsers!.find(user => user.userId === member.userId)!
     .permissions.some(x => x === permission);
 }
 

package/src/core/liveCollection/LiveCollectionController.ts

@@ -1,4 +1,4 @@
-import { convertGetterPropsToStatic } from '~/utils/object';
+import { convertGetterPropsToStatic, removeFunctionProperties } from '~/utils/object';
 import { isEqual } from '~/utils/isEqual';
 import { PaginationController } from './PaginationController';
 import { PaginationNoPageController } from './PaginationNoPageController';
@@ -129,9 +129,10 @@ export abstract class LiveCollectionController<
   abstract notifyChange(params: Amity.LiveCollectionNotifyParams): void;
 
   protected shouldNotify(data: TPublicPayload[]) {
-    if (isEqual(this.snapshot, data)) return false;
+    const newData = data.map(convertGetterPropsToStatic).map(removeFunctionProperties);
+    if (isEqual(this.snapshot, newData)) return false;
 
-    this.snapshot = data.map(payload => convertGetterPropsToStatic(payload)) as TPublicPayload[];
+    this.snapshot = newData as TPublicPayload[];
     return true;
   }
 

package/src/fileRepository/api/uploadFile.ts

@@ -1,7 +1,6 @@
 import { getActiveClient } from '~/client/api';
 
 import { ingestInCache } from '~/cache/api/ingestInCache';
-import { rebuildFormDataWithMimeType } from '~/fileRepository/utils/rebuildFormDataWithMimeType';
 
 /* begin_public_function
   id: file.upload.file
@@ -36,16 +35,12 @@ export const uploadFile = async <T extends Amity.FileType = any>(
       ? (formData as any).getHeaders()
       : { 'content-type': 'multipart/form-data' };
 
-  const { data } = await client.http.post<Amity.CreateFilePayload<T>>(
-    '/api/v4/files',
-    rebuildFormDataWithMimeType(formData),
-    {
-      headers,
-      onUploadProgress({ loaded, total = 100 }) {
-        onProgress && onProgress(Math.round((loaded * 100) / total));
-      },
+  const { data } = await client.http.post<Amity.CreateFilePayload<T>>('/api/v4/files', formData, {
+    headers,
+    onUploadProgress({ loaded, total = 100 }) {
+      onProgress && onProgress(Math.round((loaded * 100) / total));
     },
-  );
+  });
 
   // API-FIX: payload should be serialized properly
   // const { files } = data

package/src/fileRepository/api/uploadImage.ts

@@ -1,7 +1,6 @@
 import { getActiveClient } from '~/client/api';
 
 import { ingestInCache } from '~/cache/api/ingestInCache';
-import { rebuildFormDataWithMimeType } from '../utils/rebuildFormDataWithMimeType';
 
 /* begin_public_function
   id: file.upload.image
@@ -38,7 +37,7 @@ export const uploadImage = async (
 
   const { data } = await client.http.post<Amity.CreateFilePayload<'image'>>(
     '/api/v4/images',
-    rebuildFormDataWithMimeType(formData),
+    formData,
     {
       headers,
       onUploadProgress({ loaded, total = 100 }) {

package/src/fileRepository/api/uploadVideo.ts

@@ -1,7 +1,6 @@
 import { getActiveClient } from '~/client/api';
 
 import { ingestInCache } from '~/cache/api/ingestInCache';
-import { rebuildFormDataWithMimeType } from '../utils/rebuildFormDataWithMimeType';
 
 /* begin_public_function
   id: file.upload.video, file.upload.audio
@@ -44,7 +43,7 @@ export const uploadVideo = async (
 
   const { data } = await client.http.post<Amity.CreateFilePayload<'video'>>(
     '/api/v4/videos',
-    rebuildFormDataWithMimeType(formData),
+    formData,
     {
       headers,
       onUploadProgress({ loaded, total = 100 }) {

package/src/messagePreview/utils/getChannelMessagePreviewWithUser.ts

@@ -2,7 +2,11 @@ import { pullFromCache } from '~/cache/api';
 import { getChannelMessagePreview } from './getChannelMessagePreview';
 import { LinkedObject } from '~/utils/linkedObject';
 
-export const getChannelMessagePreviewWithUser = (channel: Amity.InternalChannel): Amity.Channel => {
+export const getChannelMessagePreviewWithUser = (
+  channel: Amity.InternalChannel,
+): Amity.InternalChannel & {
+  messagePreview: Amity.MessagePreview | null;
+} => {
   const messagePreview = channel.messagePreviewId
     ? getChannelMessagePreview(channel.channelId)
     : null;

package/src/messageRepository/events/onMessageCreated.ts

@@ -4,6 +4,8 @@ import { ingestInCache } from '~/cache/api/ingestInCache';
 import { prepareMessagePayload } from '../utils';
 import { updateSubChannelUnreadFromMessage } from '~/marker/utils/updateSubChannelUnreadFromMessage';
 import { reCalculateChannelUnreadInfo } from '~/marker/utils/reCalculateChannelUnreadInfo';
+import { markReadMessage } from '../utils/markReadMessage';
+import { getActiveUser } from '~/client/api/activeUser';
 
 /**
  * ```js
@@ -25,6 +27,7 @@ export const onMessageCreatedMqtt = (
   callback: Amity.Listener<Amity.InternalMessage>,
 ): Amity.Unsubscriber => {
   const client = getActiveClient();
+  const user = getActiveUser();
 
   const filter = async (rawPayload: Amity.MessagePayload) => {
     const payload = await prepareMessagePayload(rawPayload);
@@ -41,6 +44,7 @@ export const onMessageCreatedMqtt = (
     ingestInCache(payload);
 
     payload.messages.forEach(message => {
+      if (message.creatorPrivateId === user._id) markReadMessage(message);
       callback(message);
     });
   };

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/storyRepository/utils/createOptimisticEvent.ts

@@ -21,32 +21,37 @@ export const createOptimisticEvent = (
 ) => {
   if (formData) {
     const files = formData.getAll('files');
-    const fileObject = (files[0] as File & { uri: string }) || undefined;
+    const fileObject = files[0] || undefined;
 
     if (!fileObject) return;
 
-    return callback(
-      saveOptimisticToCache(
-        isVideo
-          ? {
-              ...payload,
-              data: {
-                ...payload.data,
-                fileId: undefined,
-                videoFileId: { original: undefined },
-                fileData: fileObject.uri,
-              },
-            }
-          : {
-              ...payload,
-              data: {
-                ...payload.data,
-                fileId: undefined,
-                fileData: fileObject.uri,
+    const fileData = new FileReader();
+
+    fileData.readAsDataURL(fileObject as Blob);
+    fileData.onload = () => {
+      return callback(
+        saveOptimisticToCache(
+          isVideo
+            ? {
+                ...payload,
+                data: {
+                  ...payload.data,
+                  fileId: undefined,
+                  videoFileId: { original: undefined },
+                  fileData: fileData?.result,
+                },
+              }
+            : {
+                ...payload,
+                data: {
+                  ...payload.data,
+                  fileId: undefined,
+                  fileData: fileData?.result,
+                },
               },
-            },
-      ),
-    );
+        ),
+      );
+    };
   }
 
   return callback(

package/src/subChannelRepository/observers/getSubChannel.ts

@@ -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',

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

@@ -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',

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/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);
+};

package/src/fileRepository/utils/rebuildFormDataWithMimeType.ts

@@ -1,16 +0,0 @@
-import mime from 'mime';
-
-export const rebuildFormDataWithMimeType = (formData: FormData): FormData => {
-  const files = formData.getAll('files') || [];
-  if (!files.length) return formData;
-
-  const newFormData = new FormData();
-  const imageFile = files[0] as File & { uri: string };
-
-  // In ReactNative Android, we need to define a file type for all upload items; otherwise backend will reject a request
-  // @ts-ignore - we need to modify `type` because in android this value will not set by default (https://github.com/axios/axios/issues/4823)
-  imageFile.type = mime.getType(imageFile.uri);
-  newFormData.append('files', imageFile);
-
-  return newFormData;
-};