@amityco/ts-sdk-react-native 6.26.3 → 6.27.0

package/src/messageRepository/events/onMessageCreated.ts

@@ -1,11 +1,11 @@
 import { getActiveClient } from '~/client/api/activeClient';
 import { createEventSubscriber } from '~/core/events';
 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';
+import { markReadMessage } from '../utils/markReadMessage';
+import { prepareMessagePayload } from '../utils';
 
 /**
  * ```js
@@ -64,10 +64,16 @@ export const onMessageCreatedLocal = (
   const client = getActiveClient();
 
   const disposers = [
-    createEventSubscriber(client, 'message/onMessageCreated', 'local.message.created', payload =>
-      payload.messages.forEach(message => {
-        callback(message);
-      }),
+    createEventSubscriber(
+      client,
+      'message/onMessageCreated',
+      'local.message.created',
+      async payload => {
+        ingestInCache(payload);
+        return payload.messages.forEach(message => {
+          callback(message);
+        });
+      },
     ),
   ];
 

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

@@ -1,8 +1,7 @@
 import hash from 'object-hash';
 import { pullFromCache, pushToCache } from '~/cache/api';
-import { MessagePaginationController } from './MessagePaginationController';
-import { MessageQueryStreamController } from './MessageQueryStreamController';
 import {
+  onMessageCreatedLocal,
   onMessageCreatedMqtt,
   onMessageDeleted,
   onMessageFlagCleared,
@@ -18,6 +17,8 @@ import { onMessageMarked, onMessageMarkerFetched } from '~/marker/events';
 import { filterByPropEquality } from '~/core/query';
 import { prepareMessagePayload } from '~/messageRepository/utils';
 import { LinkedObject } from '~/utils/linkedObject';
+import { MessageQueryStreamController } from './MessageQueryStreamController';
+import { MessagePaginationController } from './MessagePaginationController';
 
 export class MessageLiveCollectionController extends LiveCollectionController<
   'message',
@@ -52,31 +53,10 @@ export class MessageLiveCollectionController extends LiveCollectionController<
     this.loadPage({ initial: true });
   }
 
-  protected setup() {
-    const collection = pullFromCache<Amity.MessageLiveCollectionCache>(this.cacheKey)?.data;
-    if (!collection) {
-      pushToCache(this.cacheKey, {
-        data: [],
-        query: this.query,
-      });
-    }
-  }
-
-  protected async persistModel(response: Amity.MessagePayload & Amity.Pagination) {
-    await this.queryStreamController.saveToMainDB(response);
-  }
-
-  protected persistQueryStream({
-    response,
-    direction,
-    refresh,
-  }: Amity.LiveCollectionPersistQueryStreamParams<'message'>) {
-    this.queryStreamController.appendToQueryStream(response, direction, refresh);
-  }
-
   startSubscription() {
     return this.queryStreamController.subscribeRTE([
       { fn: onMessageCreatedMqtt, action: 'onCreate' },
+      { fn: onMessageCreatedLocal, action: 'onCreate' },
       { fn: onMessageDeleted, action: 'onDelete' },
       { fn: onMessageUpdated, action: 'onUpdate' },
       { fn: onMessageFlagged, action: 'onFlagged' },
@@ -160,4 +140,26 @@ export class MessageLiveCollectionController extends LiveCollectionController<
 
     return messages;
   }
+
+  protected setup() {
+    const collection = pullFromCache<Amity.MessageLiveCollectionCache>(this.cacheKey)?.data;
+    if (!collection) {
+      pushToCache(this.cacheKey, {
+        data: [],
+        query: this.query,
+      });
+    }
+  }
+
+  protected async persistModel(response: Amity.MessagePayload & Amity.Pagination) {
+    await this.queryStreamController.saveToMainDB(response);
+  }
+
+  protected persistQueryStream({
+    response,
+    direction,
+    refresh,
+  }: Amity.LiveCollectionPersistQueryStreamParams<'message'>) {
+    this.queryStreamController.appendToQueryStream(response, direction, refresh);
+  }
 }

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

@@ -72,6 +72,7 @@ export class MessageQueryStreamController extends QueryStreamController<
     return (payload: Amity.InternalMessage) => {
       if (action === 'onCreate') {
         const collection = pullFromCache<Amity.MessageLiveCollectionCache>(this.cacheKey)?.data;
+        const { referenceId } = payload;
 
         if (!collection) return;
         if (this.query.subChannelId !== payload?.subChannelId || !collection) return;
@@ -115,11 +116,11 @@ export class MessageQueryStreamController extends QueryStreamController<
           (!this.query.sortBy || this.query.sortBy === 'segmentDesc') &&
           !this.paginationController.getPrevToken()
         ) {
-          collection.data = [...new Set([payload.messageId, ...collection.data])];
+          collection.data = [...new Set([referenceId ?? payload.messageId, ...collection.data])];
         }
 
         if (this.query.sortBy === 'segmentAsc' && !this.paginationController.getNextToken()) {
-          collection.data = [...new Set([...collection.data, payload.messageId])];
+          collection.data = [...new Set([...collection.data, referenceId ?? payload.messageId])];
         }
 
         pushToCache(this.cacheKey, collection);

package/src/messageRepository/observers/observeMessages.ts

@@ -2,13 +2,13 @@ import { getActiveClient } from '~/client/api';
 import { onMessageMarked, onMessageMarkerFetched } from '~/marker/events';
 import { convertEventPayload } from '~/utils/event';
 
+import { LinkedObject } from '~/utils/linkedObject';
 import {
+  onMessageCreatedLocal,
   onMessageCreatedMqtt,
-  onMessageUpdated,
   onMessageDeleted,
-  onMessageCreatedLocal,
+  onMessageUpdated,
 } from '../events';
-import { LinkedObject } from '~/utils/linkedObject';
 
 /**
  * ```js

package/src/messageRepository/utils/prepareMessagePayload.ts

@@ -8,7 +8,6 @@ import { MessageContentType } from '~/@types';
 import { convertFromRaw as convertSubChannelFromRaw } from '~/subChannelRepository/utils/convertSubChannelFromRaw';
 import { updateSubChannelCache } from '~/subChannelRepository/utils/updateSubChannelCache';
 import { COLLECTION_DEFAULT_PAGINATION_LIMIT } from '~/utils/constants';
-import { getMessageReadCount } from './getMessageReadCount';
 
 export function convertFromRaw(
   message: Amity.RawMessage,
@@ -62,6 +61,7 @@ export function convertFromRaw(
     subChannelId: messageFeedId,
     uniqueId: cache ? cache.data.uniqueId : messageId,
     referenceId,
+    syncState: Amity.SyncState.Synced,
   };
 
   if (mentionedUsers) {

package/src/postRepository/observers/getPost.ts

@@ -42,7 +42,14 @@ export const getPost = (
   postId: Amity.Post['postId'],
   callback: Amity.LiveObjectCallback<Amity.Post>,
 ): Amity.Unsubscriber => {
-  return liveObject(postId, callback, 'postId', _getPost, [
+  const responder: Amity.LiveObjectCallback<Amity.InternalPost> = (
+    snapshot: Amity.LiveObject<Amity.InternalPost>,
+  ) => {
+    const { data } = snapshot;
+    callback({ ...snapshot, data: data ? LinkedObject.post(snapshot.data) : data });
+  };
+
+  return liveObject(postId, responder, 'postId', _getPost, [
     onPostApproved,
     onPostDeclined,
     (callback: Amity.Listener<Amity.InternalPost>) => {

package/src/utils/linkedObject/adLinkedObject.ts

@@ -1,19 +1,19 @@
 import { pullFromCache } from '~/cache/api';
-// import AnalyticsEngine from '~/analytic/service/analytic/AnalyticsEngine';
+import AnalyticsEngine from '~/analytic/service/analytic/AnalyticsEngine';
 
-export const adLinkedObject = (ad: Amity.RawAd): Amity.Ad => {
-  // const analyticsEngineInstance = AnalyticsEngine.getInstance();
+export const adLinkedObject = (ad: Amity.InternalAd): Amity.Ad => {
+  const analyticsEngineInstance = AnalyticsEngine.getInstance();
   const { image9_16: image916, image1_1: image11, ...restAds } = ad;
   return {
     ...restAds,
-    // analytics: {
-    //   markAsSeen: (placement: Amity.AdPlacement) => {
-    //     analyticsEngineInstance.markAdAsViewed(ad, placement);
-    //   },
-    //   markLinkAsClicked: (placement: Amity.AdPlacement) => {
-    //     analyticsEngineInstance.markAdAsClicked(ad, placement);
-    //   },
-    // },
+    analytics: {
+      markAsSeen: (placement: Amity.AdPlacement) => {
+        analyticsEngineInstance.markAdAsViewed(ad, placement);
+      },
+      markLinkAsClicked: (placement: Amity.AdPlacement) => {
+        analyticsEngineInstance.markAdAsClicked(ad, placement);
+      },
+    },
     get advertiser(): Amity.Advertiser | undefined {
       const advertiserData = pullFromCache<Amity.RawAdvertiser>([
         'advertiser',