@amityco/ts-sdk-react-native 6.14.2-5d7d534.0 → 6.15.1-fee6c8f.0

package/src/subChannelRepository/observers/tests/getSubChannelsWithMessagePreview.test.ts

@@ -61,7 +61,7 @@ describe('getChannels with MessagePreview', () => {
 
   const subChannelWithNoMessagePreviewQueryResponse = {
     data: {
-      messageFeeds: [rawSubChannel],
+      messageFeeds: [{ ...rawSubChannel, messagePreviewId: undefined }],
       messages: [],
       users: [user11],
       files: [],
@@ -448,7 +448,7 @@ describe('getChannels with MessagePreview', () => {
           'message-feed.updated',
           {
             messageFeeds: [rawUpdatedSubChannel],
-            messages: [],
+            messages: [rawMessage],
             users: [],
             files: [],
           },
@@ -589,7 +589,7 @@ describe('getChannels with MessagePreview', () => {
           'it should update message preview to collection onSubChannelUpdated',
           'message-feed.updated',
           {
-            messageFeeds: [rawUpdatedSubChannel],
+            messageFeeds: [{ ...rawUpdatedSubChannel, messagePreviewId: undefined }],
             messages: [],
             users: [],
             files: [],
@@ -600,8 +600,8 @@ describe('getChannels with MessagePreview', () => {
                 ...rawUpdatedSubChannelWithMessagePreview,
                 updatedAt: rawUpdatedSubChannel.updatedAt,
               }),
-              messagePreviewId: updatedSubChannelMessagePreview.messagePreviewId,
-              messagePreview: updatedSubChannelMessagePreview,
+              messagePreviewId: undefined,
+              messagePreview: null,
             },
           ],
         ],
@@ -620,23 +620,60 @@ describe('getChannels with MessagePreview', () => {
         client.emitter.emit(event, eventPayload);
         await pause();
 
-        expect(callback).toHaveBeenCalledTimes(2);
-        expect(callback).toHaveBeenNthCalledWith(1, expect.objectContaining(getSnapshot({})));
-        expect(callback).toHaveBeenNthCalledWith(
-          2,
-          expect.objectContaining(
-            getSnapshot({
-              data: [
-                getSubChannelMessagePreviewWithUser(
-                  convertSubChannelFromRaw(
-                    subChannelWithNoMessagePreviewQueryResponse.data.messageFeeds[0],
+        if (event === 'message-feed.updated') {
+          expect(callback).toHaveBeenCalledTimes(3);
+          expect(callback).toHaveBeenNthCalledWith(1, expect.objectContaining(getSnapshot({})));
+          expect(callback).toHaveBeenNthCalledWith(
+            2,
+            expect.objectContaining(
+              getSnapshot({
+                data: [
+                  getSubChannelMessagePreviewWithUser(
+                    convertSubChannelFromRaw(
+                      subChannelWithNoMessagePreviewQueryResponse.data.messageFeeds[0],
+                    ),
                   ),
-                ),
-              ],
-              loading: false,
-            }),
-          ),
-        );
+                ],
+                loading: false,
+              }),
+            ),
+          );
+          expect(callback).toHaveBeenNthCalledWith(
+            3,
+            expect.objectContaining(
+              getSnapshot({
+                data: [
+                  getSubChannelMessagePreviewWithUser(
+                    convertSubChannelFromRaw({
+                      ...subChannelWithNoMessagePreviewQueryResponse.data.messageFeeds[0],
+                      name: rawUpdatedSubChannel.name,
+                      updatedAt: rawUpdatedSubChannel.updatedAt,
+                    }),
+                  ),
+                ],
+                loading: false,
+              }),
+            ),
+          );
+        } else {
+          expect(callback).toHaveBeenCalledTimes(2);
+          expect(callback).toHaveBeenNthCalledWith(1, expect.objectContaining(getSnapshot({})));
+          expect(callback).toHaveBeenNthCalledWith(
+            2,
+            expect.objectContaining(
+              getSnapshot({
+                data: [
+                  getSubChannelMessagePreviewWithUser(
+                    convertSubChannelFromRaw(
+                      subChannelWithNoMessagePreviewQueryResponse.data.messageFeeds[0],
+                    ),
+                  ),
+                ],
+                loading: false,
+              }),
+            ),
+          );
+        }
       });
     });
   });

package/src/subChannelRepository/utils/prepareSubChannelPayload.ts

@@ -13,7 +13,7 @@ export const MARKER_INCLUDED_SUB_CHANNEL_TYPE = ['broadcast', 'conversation', 'c
 export const isUnreadCountSupport = ({ channelType }: Pick<Amity.RawSubChannel, 'channelType'>) =>
   MARKER_INCLUDED_SUB_CHANNEL_TYPE.includes(channelType);
 
-const preUpdateSubChannelCache = (rawPayload: Amity.SubChannelPayload) => {
+export const preUpdateSubChannelCache = (rawPayload: Amity.SubChannelPayload) => {
   ingestInCache({
     messageFeeds: rawPayload.messageFeeds.map(messageFeed => convertSubChannelFromRaw(messageFeed)),
   });

package/src/utils/constants.ts

@@ -8,4 +8,9 @@ export const UNSYNCED_OBJECT_CACHED_AT_MESSAGE =
 export const UNSYNCED_OBJECT_CACHED_AT_VALUE = -5;
 export const SECOND = 1000;
 export const MINUTE = 60 * SECOND;
+export const HOUR = 60 * MINUTE;
+export const DAY = 24 * HOUR;
+export const WEEK = 7 * DAY;
+export const MONTH = 30 * DAY;
+export const YEAR = 365 * DAY;
 export const ACCESS_TOKEN_WATCHER_INTERVAL = 10 * MINUTE;

package/src/utils/linkedObject/commentLinkedObject.ts

@@ -1,4 +1,5 @@
 import { pullFromCache } from '~/cache/api/pullFromCache';
+import { userLinkedObject } from './userLinkedObject';
 
 export const commentLinkedObject = (comment: Amity.InternalComment): Amity.Comment => {
   return {
@@ -42,7 +43,8 @@ export const commentLinkedObject = (comment: Amity.InternalComment): Amity.Comme
     },
     get creator(): Amity.User | undefined {
       const cacheData = pullFromCache<Amity.User>(['user', 'get', comment.userId]);
-      return cacheData?.data;
+      if (cacheData?.data) return userLinkedObject(cacheData.data);
+      return undefined;
     },
   };
 };

package/src/utils/linkedObject/index.ts

@@ -1,3 +1,4 @@
+import { storyLinkedObject } from '~/utils/linkedObject/storyLinkedObject';
 import { categoryLinkedObject } from './categoryLinkedObject';
 import { commentLinkedObject } from './commentLinkedObject';
 import { userLinkedObject } from './userLinkedObject';
@@ -8,4 +9,5 @@ export const LinkedObject = {
   post: postLinkedObject,
   user: userLinkedObject,
   category: categoryLinkedObject,
+  story: storyLinkedObject,
 };

package/src/utils/linkedObject/postLinkedObject.ts

@@ -1,6 +1,7 @@
 import { pullFromCache } from '~/cache/api';
 import { commentLinkedObject } from '~/utils/linkedObject/commentLinkedObject';
 import AnalyticsEngine from '../../analytic/service/analytic/AnalyticsEngine';
+import { userLinkedObject } from './userLinkedObject';
 
 export const postLinkedObject = (post: Amity.InternalPost): Amity.Post => {
   return {
@@ -29,9 +30,10 @@ export const postLinkedObject = (post: Amity.InternalPost): Amity.Post => {
           .filter(Boolean) || []
       );
     },
-    get creator(): Amity.User | null {
+    get creator(): Amity.User | undefined {
       const cacheData = pullFromCache<Amity.User>(['user', 'get', post.postedUserId]);
-      return cacheData?.data || null;
+      if (cacheData?.data) return userLinkedObject(cacheData.data);
+      return undefined;
     },
   };
 };

package/src/utils/linkedObject/storyLinkedObject.ts

@@ -0,0 +1,83 @@
+import { pullFromCache } from '~/cache/api';
+import AnalyticsEngine from '~/analytic/service/analytic/AnalyticsEngine';
+import { userLinkedObject } from './userLinkedObject';
+
+export const storyLinkedObject = (story: Amity.InternalStory): Amity.Story => {
+  return {
+    ...story,
+    analytics: {
+      markAsViewed: () => {
+        if (!story.expiresAt) return;
+        if (story.syncState !== 'synced') return;
+        const analyticsEngineInstance = AnalyticsEngine.getInstance();
+        analyticsEngineInstance.markStoryAsViewed(story.storyId, story.expiresAt);
+      },
+    },
+
+    get videoData(): Amity.File<'video'> | undefined {
+      const cache = pullFromCache<Amity.File<'video'>>([
+        'file',
+        'get',
+        story.data?.videoFileId?.original,
+      ]);
+
+      if (!cache) return undefined;
+
+      const { data } = cache;
+      return data || undefined;
+    },
+
+    get imageData(): Amity.File<'image'> | undefined {
+      if (!story.data?.fileId) return undefined;
+
+      const cache = pullFromCache<Amity.File<'image'>>(['file', 'get', story.data?.fileId]);
+
+      if (!cache) return undefined;
+
+      const { data } = cache;
+
+      if (!data) return undefined;
+
+      return {
+        ...data,
+        fileUrl: `${data.fileUrl}?size=full`,
+      };
+    },
+
+    get community(): Amity.Community | undefined {
+      if (story.targetType !== 'community') return undefined;
+      const cacheData = pullFromCache<Amity.Community>(['community', 'get', story?.targetId]);
+      if (!cacheData) return undefined;
+      return cacheData?.data || undefined;
+    },
+
+    get communityCategories(): Amity.Category[] | undefined {
+      if (story.targetType !== 'community') return undefined;
+      const cacheData = pullFromCache<Amity.Community>(['community', 'get', story?.targetId]);
+      if (!cacheData) return undefined;
+      const {
+        data: { categoryIds },
+      } = cacheData;
+
+      if (categoryIds.length === 0) return undefined;
+
+      return categoryIds
+        .map(categoryId => {
+          const categoryCacheData = pullFromCache<Amity.Category>(['category', 'get', categoryId]);
+          return categoryCacheData?.data || undefined;
+        })
+        .filter(category => category !== undefined) as Amity.Category[];
+    },
+
+    get creator(): Amity.User | undefined {
+      const cacheData = pullFromCache<Amity.User>(['user', 'get', story.creatorPublicId]);
+      if (!cacheData?.data) return;
+      return userLinkedObject(cacheData.data);
+    },
+
+    get storyTarget(): Amity.StoryTarget | undefined {
+      const cacheData = pullFromCache<Amity.StoryTarget>(['storyTarget', 'get', story.targetId]);
+      return cacheData?.data || undefined;
+    },
+  };
+};

package/src/utils/tests/dummy/channel.ts

@@ -76,7 +76,7 @@ export const mockPage = {
   },
 };
 
-export const channelRaw1: Amity.RawChannel = generateRawChannel({ type: 'community' });
+export const channelRaw1: Amity.RawChannel = generateRawChannel({ type: 'conversation' });
 
 export const channelRawLive1: Amity.RawChannel = generateRawChannel({ type: 'live' });
 
@@ -198,6 +198,16 @@ export const channelQueryResponse = {
   },
 };
 
+export const channelQueryResponseWithoutPaging = {
+  data: {
+    channels: [channelRaw1, channelRaw2],
+    channelUsers: [],
+    files: [],
+    users: [],
+    messagePreviews: [],
+  },
+};
+
 export const channelGetResponseWithMessagePreview = {
   data: {
     channels: [channelRawWithMessgePreviewConversation1],
@@ -421,19 +431,19 @@ export const channelDisplayName4 = generateRawChannel({
 });
 
 export const channelCreatedAt1 = generateRawChannel({
-  channelId: 'channelId1',
+  channelId: 'channelId-CreateAt1',
   createdAt: '2023-09-29T12:00:00.000Z',
   displayName: '',
 });
 
 export const channelCreatedAt2 = generateRawChannel({
-  channelId: 'channelId2',
+  channelId: 'channelId-CreateAt2',
   createdAt: '2023-09-29T12:00:01.000Z',
   displayName: '',
 });
 
 export const channelCreatedAt3 = generateRawChannel({
-  channelId: 'channelId3',
+  channelId: 'channelId-CreateAt3',
   createdAt: '2023-09-29T12:00:02.000Z',
   displayName: '',
 });

package/dist/categoryRepository/api/queryCategories.d.ts

@@ -1,32 +0,0 @@
-/**
- * ```js
- * import { queryCategories } from '@amityco/ts-sdk-react-native'
- * const { data: categories, prevPage, nextPage } = await queryCategories()
- * ```
- *
- * Queries a paginable list of {@link Amity.Category} objects
- *
- * @param query The query parameters
- * @returns A page of {@link Amity.Category} objects
- *
- * @category Category API
- * @async
- * */
-export declare const queryCategories: {
-    (query?: Amity.QueryCategories): Promise<Amity.Cached<Amity.Paged<Amity.Category, Amity.Page>>>;
-    /**
-     * ```js
-     * import { queryCategories } from '@amityco/ts-sdk-react-native'
-     * const { data: categories, prevPage, nextPage } = queryCategories.locally()
-     * ```
-     *
-     * Queries a paginable list of {@link Amity.Category} objects from cache
-     *
-     * @param query The query parameters
-     * @returns categories
-     *
-     * @category category API
-     */
-    locally(query: Parameters<typeof queryCategories>[0]): Amity.Cached<Amity.Paged<Amity.Category, Amity.Page>> | undefined;
-};
-//# sourceMappingURL=queryCategories.d.ts.map

package/dist/categoryRepository/api/queryCategories.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"queryCategories.d.ts","sourceRoot":"","sources":["../../../src/categoryRepository/api/queryCategories.ts"],"names":[],"mappings":"AAWA;;;;;;;;;;;;;KAaK;AACL,eAAO,MAAM,eAAe;aAClB,MAAM,eAAe,GAC5B,QAAQ,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,MAAM,QAAQ,EAAE,MAAM,IAAI,CAAC,CAAC,CAAC;IA8CjE;;;;;;;;;;;;OAYG;mBAEM,WAAW,sBAAsB,CAAC,CAAC,CAAC,CAAC,GAC3C,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,MAAM,QAAQ,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,SAAS;CAjBnE,CAAC"}

package/src/categoryRepository/api/queryCategories.ts

@@ -1,116 +0,0 @@
-import { getActiveClient } from '~/client/api/activeClient';
-
-import { toToken, toPage } from '~/core/query';
-
-import { pullFromCache, pushToCache } from '~/cache/api';
-import { ingestInCache } from '~/cache/api/ingestInCache';
-import { getResolver } from '~/core/model';
-
-import { inferIsDeleted } from '~/utils/inferIsDeleted';
-import { LinkedObject } from '~/utils/linkedObject';
-
-/**
- * ```js
- * import { queryCategories } from '@amityco/ts-sdk-react-native'
- * const { data: categories, prevPage, nextPage } = await queryCategories()
- * ```
- *
- * Queries a paginable list of {@link Amity.Category} objects
- *
- * @param query The query parameters
- * @returns A page of {@link Amity.Category} objects
- *
- * @category Category API
- * @async
- * */
-export const queryCategories = async (
-  query?: Amity.QueryCategories,
-): Promise<Amity.Cached<Amity.Paged<Amity.Category, Amity.Page>>> => {
-  const client = getActiveClient();
-  client.log('category/queryCategories', query);
-
-  const { page = { limit: 10 }, includeDeleted, ...params } = query ?? {};
-
-  const { data } = await client.http.get<Amity.CategoryPayload & Amity.Pagination>(
-    `/api/v3/community-categories`,
-    {
-      params: {
-        ...params,
-        isDeleted: inferIsDeleted(includeDeleted),
-        options: {
-          token: toToken(page, 'skiplimit'),
-        },
-      },
-    },
-  );
-
-  const { paging, ...payload } = data;
-  const { categories } = payload;
-
-  const cachedAt = client.cache && Date.now();
-
-  if (client.cache) {
-    ingestInCache(payload as Amity.CategoryPayload, { cachedAt });
-
-    const cacheKey = [
-      'category',
-      'query',
-      { ...params, includeDeleted, options: { ...page } } as Amity.Serializable,
-    ];
-    pushToCache(cacheKey, { categories: categories.map(getResolver('category')), paging });
-  }
-
-  const nextPage = toPage(paging.next);
-  const prevPage = toPage(paging.previous);
-
-  return {
-    data: categories.map(category => LinkedObject.category(category)),
-    cachedAt,
-    prevPage,
-    nextPage,
-  };
-};
-
-/**
- * ```js
- * import { queryCategories } from '@amityco/ts-sdk-react-native'
- * const { data: categories, prevPage, nextPage } = queryCategories.locally()
- * ```
- *
- * Queries a paginable list of {@link Amity.Category} objects from cache
- *
- * @param query The query parameters
- * @returns categories
- *
- * @category category API
- */
-queryCategories.locally = (
-  query: Parameters<typeof queryCategories>[0],
-): Amity.Cached<Amity.Paged<Amity.Category, Amity.Page>> | undefined => {
-  const client = getActiveClient();
-  client.log('category/queryCategories.locally', query);
-
-  if (!client.cache) return;
-
-  const { page = { limit: 10 }, ...params } = query ?? {};
-
-  const queryKey = ['category', 'query', { ...params, options: { ...page } } as Amity.Serializable];
-  const { data, cachedAt } =
-    pullFromCache<{ categories: Pick<Amity.Category, 'categoryId'>[] } & Amity.Pagination>(
-      queryKey,
-    ) ?? {};
-
-  if (!data?.categories.length) return;
-
-  const categories: Amity.Category[] = data.categories
-    .map(categoryId => pullFromCache<Amity.Category>(['category', 'get', categoryId])!)
-    .filter(Boolean)
-    .map(({ data }) => data);
-
-  const prevPage = toPage(data?.paging.previous);
-  const nextPage = toPage(data?.paging.next);
-
-  return categories.length === data?.categories?.length
-    ? { data: categories.map(LinkedObject.category), cachedAt, prevPage, nextPage }
-    : undefined;
-};