@amityco/ts-sdk 6.35.2 → 6.35.3-024c022.0

package/src/feedRepository/api/getCustomRankingGlobalFeed.ts

@@ -1,6 +1,4 @@
 import { getActiveClient } from '~/client/api/activeClient';
-
-import { toPage, toToken } from '~/core/query';
 import { ingestInCache } from '~/cache/api/ingestInCache';
 import { pullFromCache, pushToCache } from '~/cache/api';
 import { getResolver } from '~/core/model';
@@ -26,40 +24,18 @@ import { LinkedObject } from '~/utils/linkedObject';
  * */
 export const getCustomRankingGlobalFeed = async (query?: {
   dataTypes?: ('video' | 'image' | 'file' | 'liveStream')[];
-  /**
-   * @deprecated please use queryToken to query next pages or previous pages
-   * The first page result includes previous token and next token in paging field
-   * use this token as the queryToken to query next pages or previous pages
-   *
-   */
-  page?: Amity.Page;
   limit?: number;
   queryToken?: string;
 }): Promise<
-  Omit<Amity.Cached<Amity.Paged<Amity.Post>> & Amity.Pagination, 'nextPage' | 'prevPage'> & {
-    /**
-     * @deprecated use `paging.next` value as queryToken instead
-     */
-    nextPage?: Amity.Page;
-    /**
-     * @deprecated use `paging.previous` value as queryToken instead
-     */
-    prevPage?: Amity.Page;
-  }
+  Omit<Amity.Cached<Amity.Paged<Amity.Post>> & Amity.Pagination, 'nextPage' | 'prevPage'>
 > => {
   const client = getActiveClient();
   client.log('feed/getCustomRankingGlobalFeed', query);
 
-  const { page, queryToken, limit, ...params } = query ?? {};
+  const { queryToken, limit, ...params } = query ?? {};
 
   const options = (() => {
     if (queryToken) return { token: queryToken };
-
-    if (page)
-      return {
-        token: toToken(page, 'skiplimit'),
-      };
-
     return undefined;
   })();
 
@@ -85,18 +61,11 @@ export const getCustomRankingGlobalFeed = async (query?: {
   if (client.cache) {
     ingestInCache(data);
 
-    const cacheKey = [
-      'customGlobalFeed',
-      'query',
-      { ...params, options: { ...page } } as Amity.Serializable,
-    ];
+    const cacheKey = ['customGlobalFeed', 'query', { ...params, options } as Amity.Serializable];
     pushToCache(cacheKey, { posts: posts.map(getResolver('post')), paging });
   }
 
-  const nextPage = toPage(paging.next);
-  const prevPage = toPage(paging.previous);
-
-  return { data: posts.map(LinkedObject.post), cachedAt, prevPage, nextPage, paging };
+  return { data: posts.map(LinkedObject.post), cachedAt, paging };
 };
 /* end_public_function */
 
@@ -117,29 +86,16 @@ export const getCustomRankingGlobalFeed = async (query?: {
 getCustomRankingGlobalFeed.locally = (
   query?: Parameters<typeof getCustomRankingGlobalFeed>[0],
 ):
-  | (Omit<Amity.Cached<Amity.Paged<Amity.Post>> & Amity.Pagination, 'nextPage' | 'prevPage'> & {
-      /**
-       * @deprecated use `paging.next` value as queryToken instead
-       */
-      nextPage?: Amity.Page;
-      /**
-       * @deprecated use `paging.previous` value as queryToken instead
-       */
-      prevPage?: Amity.Page;
-    })
+  | Omit<Amity.Cached<Amity.Paged<Amity.Post>> & Amity.Pagination, 'nextPage' | 'prevPage'>
   | undefined => {
   const client = getActiveClient();
   client.log('post/getCustomRankingGlobalFeed.locally', query);
 
   if (!client.cache) return;
 
-  const { page, ...params } = query ?? {};
+  const { ...params } = query ?? {};
 
-  const queryKey = [
-    'customGlobalFeed',
-    'query',
-    { ...params, options: { ...page } } as Amity.Serializable,
-  ];
+  const queryKey = ['customGlobalFeed', 'query', { ...params } as Amity.Serializable];
 
   const { data, cachedAt } =
     pullFromCache<{ posts: Amity.Post['postId'][] } & Amity.Pagination>(queryKey) ?? {};
@@ -151,12 +107,9 @@ getCustomRankingGlobalFeed.locally = (
     .filter(Boolean)
     .map(({ data }) => data);
 
-  const prevPage = toPage(data?.paging.previous);
-  const nextPage = toPage(data?.paging.next);
-
   const { paging } = data;
 
   return posts.length === data?.posts?.length
-    ? { data: posts.map(LinkedObject.post), cachedAt, prevPage, nextPage, paging }
+    ? { data: posts.map(LinkedObject.post), cachedAt, paging }
     : undefined;
 };

package/src/feedRepository/api/queryGlobalFeed.ts

@@ -1,6 +1,5 @@
 import { getActiveClient } from '~/client/api/activeClient';
 
-import { toPage, toToken } from '~/core/query';
 import { ingestInCache } from '~/cache/api/ingestInCache';
 import { pullFromCache, pushToCache } from '~/cache/api';
 import { getResolver } from '~/core/model';
@@ -28,39 +27,15 @@ import { prepareCommunityPayload } from '~/communityRepository/utils';
 export const queryGlobalFeed = async (
   query?: Amity.QueryGlobalFeed,
 ): Promise<
-  Omit<Amity.Cached<Amity.Paged<Amity.Post> & Amity.Pagination>, 'nextPage' | 'prevPage'> & {
-    /**
-     * @deprecated use `paging.next` value as queryToken instead
-     */
-    nextPage?: Amity.Page;
-    /**
-     * @deprecated use `paging.previous` value as queryToken instead
-     */
-    prevPage?: Amity.Page;
-  }
+  Omit<Amity.Cached<Amity.Paged<Amity.Post> & Amity.Pagination>, 'nextPage' | 'prevPage'>
 > => {
   const client = getActiveClient();
   client.log('feed/queryGlobalFeed', query);
 
-  const { useCustomRanking, page, queryToken, ...params } = query ?? {};
-
-  /*
-   * TODO: Remove useCustomRanking key from query
-   */
-  if (useCustomRanking)
-    console.warn(
-      'The param "useCustomRanking" has been deprecated. To get custom ranking feed use FeedRepository.getCustomRankingGlobalFeed instead',
-    );
-
-  if (page) console.warn('The param "page" has been deprecated. Please use "queryToken" instead.');
+  const { queryToken, ...params } = query ?? {};
 
   const options = (() => {
     if (queryToken) return { token: queryToken };
-    if (page)
-      return {
-        token: toToken(page, 'skiplimit'),
-      };
-
     return undefined;
   })();
 
@@ -87,22 +62,13 @@ export const queryGlobalFeed = async (
   if (client.cache) {
     ingestInCache({ ...data, communitis: processedCommunity });
 
-    const cacheKey = [
-      'globalFeed',
-      'query',
-      { ...params, options: { ...page } } as Amity.Serializable,
-    ];
+    const cacheKey = ['globalFeed', 'query', { ...params, options } as Amity.Serializable];
     pushToCache(cacheKey, { posts: posts.map(getResolver('post')), paging });
   }
 
-  const nextPage = toPage(paging.next);
-  const prevPage = toPage(paging.previous);
-
   return {
     data: posts.map(LinkedObject.post),
     cachedAt,
-    prevPage,
-    nextPage,
     paging,
   };
 };
@@ -125,29 +91,16 @@ export const queryGlobalFeed = async (
 queryGlobalFeed.locally = (
   query?: Parameters<typeof queryGlobalFeed>[0],
 ):
-  | (Omit<Amity.Cached<Amity.Paged<Amity.Post> & Amity.Pagination>, 'nextPage' | 'prevPage'> & {
-      /**
-       * @deprecated use `paging.next` value as queryToken instead
-       */
-      nextPage?: Amity.Page;
-      /**
-       * @deprecated use `paging.previous` value as queryToken instead
-       */
-      prevPage?: Amity.Page;
-    })
+  | Omit<Amity.Cached<Amity.Paged<Amity.Post> & Amity.Pagination>, 'nextPage' | 'prevPage'>
   | undefined => {
   const client = getActiveClient();
   client.log('post/queryGlobalFeed.locally', query);
 
   if (!client.cache) return;
 
-  const { page, ...params } = query ?? {};
+  const { ...params } = query ?? {};
 
-  const queryKey = [
-    'globalFeed',
-    'query',
-    { ...params, options: { ...page } } as Amity.Serializable,
-  ];
+  const queryKey = ['globalFeed', 'query', { ...params } as Amity.Serializable];
   const { data, cachedAt } =
     pullFromCache<{ posts: Amity.Post['postId'][] } & Amity.Pagination>(queryKey) ?? {};
 
@@ -161,15 +114,10 @@ queryGlobalFeed.locally = (
 
   const { paging } = data;
 
-  const prevPage = toPage(data?.paging.previous);
-  const nextPage = toPage(data?.paging.next);
-
   return posts.length === data?.posts?.length
     ? {
         data: posts,
         cachedAt,
-        prevPage,
-        nextPage,
         paging,
       }
     : undefined;

package/src/feedRepository/api/test/getCustomRankingGlobalFeed.test.ts

@@ -13,7 +13,7 @@ const postsToQuery = [post11, post12];
 const postIdsToQuery = postsToQuery.map(post => post.postId);
 const pagingCriteria = { limit: 10 };
 const queryCriteriaWithoutPage = {};
-const queryCriteria = { ...queryCriteriaWithoutPage, page: pagingCriteria };
+const queryCriteria = { ...queryCriteriaWithoutPage };
 
 const resolvedQueryFeedValue = {
   data: {

package/src/feedRepository/api/test/queryGlobalFeed.test.ts

@@ -13,7 +13,7 @@ const postsToQuery = [post11, post12];
 const postIdsToQuery = postsToQuery.map(post => post.postId);
 const pagingCriteria = { limit: 10 };
 const queryCriteriaWithoutPage = {};
-const queryCriteria = { ...queryCriteriaWithoutPage, page: pagingCriteria };
+const queryCriteria = { ...queryCriteriaWithoutPage };
 
 const resolvedQueryFeedValue = {
   data: {

package/src/fileRepository/api/index.ts

@@ -4,8 +4,3 @@ export * from './deleteFile';
 export * from './fileUrlWithSize';
 export * from './uploadVideo';
 export * from './uploadImage';
-
-// deprecated
-export * from './createImage';
-export * from './createFile';
-export * from './createVideo';

package/src/fileRepository/index.ts

@@ -1,2 +1 @@
 export * from './api';
-export * from './observers';

package/src/liveStreamPlayer/api/getPlayer.ts

@@ -1,5 +1,5 @@
 import Hls from 'hls.js';
-import { getStream } from '~/streamRepository/api/getStream';
+import { getStream } from '~/streamRepository/internalApi/getStream';
 import { EventRegister } from '../utils/eventRegister';
 
 /**

package/src/messagePreview/utils/getChannelMessagePreviewWithUser.ts

@@ -3,8 +3,8 @@ import { getChannelMessagePreview } from './getChannelMessagePreview';
 import { LinkedObject } from '~/utils/linkedObject';
 
 export const getChannelMessagePreviewWithUser = (
-  channel: Amity.InternalChannel,
-): Amity.InternalChannel & {
+  channel: Amity.StaticInternalChannel,
+): Amity.StaticInternalChannel & {
   messagePreview: Amity.MessagePreview | null;
 } => {
   const messagePreview = channel.messagePreviewId

package/src/messageRepository/api/createMessage.ts

@@ -61,7 +61,7 @@ const createMessageOptimistic = <T extends Amity.MessageContentType>(
       if (channel?.data) {
         upsertInCache(['channel', 'get', subChannel.data.channelId], {
           ...channel.data,
-          messageCount: (channel.data.messageCount ?? 0) + 1,
+          messageCount: (subChannel.data.messageCount ?? 0) + 1,
         });
       }
     }

package/src/messageRepository/api/index.ts

@@ -1,5 +1,3 @@
-export { getMessages as getMessageByIds } from './getMessages';
-
 export * from './createMessage';
 export * from './updateMessage';
 export * from './editMessage';

package/src/messageRepository/api/tests/createMessage.test.ts

@@ -125,7 +125,11 @@ describe('createMessage.optimistically', () => {
 
       createMessage.optimistically(messageWithoutId);
 
-      const cacheChannel = pullFromCache<Amity.Channel>(['channel', 'get', subChannelId])?.data;
+      const cacheChannel = pullFromCache<Amity.StaticInternalChannel>([
+        'channel',
+        'get',
+        subChannelId,
+      ])?.data;
       expect(cacheChannel?.messageCount).toBe(3);
     });
   });

package/src/messageRepository/internalApi/getMessage.ts

@@ -31,12 +31,6 @@ export const getMessage = async (
   const client = getActiveClient();
   client.log('message/getMessage', messageId);
 
-  if (!isLive) {
-    console.log(
-      'getMessage will be deprecated on 15th November 2022, please use liveMessage instead.',
-    );
-  }
-
   isInTombstone('message', messageId);
 
   let data: Amity.ProcessedMessagePayload;

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

@@ -101,26 +101,6 @@ export class MessageLiveCollectionController extends LiveCollectionController<
   applyFilter(data: Amity.Message[]) {
     let messages = data;
 
-    messages = messages.filter(m => {
-      if (this.query.tags) {
-        return this.query.tags.find(value => {
-          if (!m.tags) return false;
-          return m.tags.includes(value);
-        });
-      }
-      return true;
-    });
-
-    messages = messages.filter(m => {
-      if (this.query.excludeTags) {
-        return (this.query.excludeTags || []).find(value => {
-          if (!m.tags) return true;
-          return !m.tags.includes(value);
-        });
-      }
-      return true;
-    });
-
     /*
      * for cases when message is deleted via RTE, this flag is used to get
      * items from cache that are !deleted

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

@@ -79,19 +79,12 @@ export class MessageQueryStreamController extends QueryStreamController<
 
         if (this.query.type && this.query.type !== payload.dataType) return;
 
-        if (this.query.dataType && this.query.dataType !== payload.dataType) return;
-
         if (
           this.query.excludingTags &&
           this.query.excludingTags?.some(value => payload.tags?.includes(value))
         )
           return;
 
-        if (
-          this.query.excludeTags &&
-          this.query.excludeTags?.some(value => payload.tags?.includes(value))
-        )
-          return;
         if (!!this.query.hasFlags !== !!payload.flagCount) return;
 
         if (this.query.parentId && this.query.parentId !== payload.parentId) return;
@@ -109,9 +102,6 @@ export class MessageQueryStreamController extends QueryStreamController<
         )
           return;
 
-        if (this.query.tags && !this.query.tags?.some(value => payload.tags?.includes(value)))
-          return;
-
         if (
           (!this.query.sortBy || this.query.sortBy === 'segmentDesc') &&
           !this.paginationController.getPrevToken()

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

@@ -16,26 +16,6 @@ export const applyFilter = <T extends Amity.Message>(
 ): T[] => {
   let messages = data;
 
-  messages = messages.filter(m => {
-    if (params.tags) {
-      return params.tags.find(value => {
-        if (!m.tags) return false;
-        return m.tags.includes(value);
-      });
-    }
-    return true;
-  });
-
-  messages = messages.filter(m => {
-    if (params.excludeTags) {
-      return (params.excludeTags || []).find(value => {
-        if (!m.tags) return true;
-        return !m.tags.includes(value);
-      });
-    }
-    return true;
-  });
-
   /*
    * for cases when message is deleted via RTE, this flag is used to get
    * items from cache that are !deleted

package/src/messageRepository/observers/index.ts

@@ -1,5 +1,2 @@
 export { getMessage } from './getMessage';
 export { getMessages } from './getMessages';
-
-export { observeMessage } from './observeMessage';
-export { observeMessages } from './observeMessages';

package/src/messageRepository/utils/prepareMessagePayload.ts

@@ -149,8 +149,7 @@ export const prepareMessagePayload = async (
         {};
 
       // exclude getter properties from existing subChannel cache, update only other properties to existing subChannel cache
-      const { unreadCount, hasMentioned, isMentioned, ...restSubChannel } =
-        convertSubChannelFromRaw(messageFeed);
+      const { unreadCount, isMentioned, ...restSubChannel } = convertSubChannelFromRaw(messageFeed);
 
       updateSubChannelCache(messageFeed.messageFeedId, subChannelCache, restSubChannel);
     });
@@ -215,7 +214,6 @@ export function convertParams({
 export function convertQueryParams({
   sortBy,
   subChannelId,
-  tags,
   includingTags,
   excludingTags,
   includeDeleted,
@@ -235,10 +233,6 @@ export function convertQueryParams({
     },
   };
 
-  if (tags) {
-    out.includeTags = tags;
-  }
-
   if (includingTags) {
     out.includeTags = includingTags;
   }

package/src/pollRepository/observers/index.ts

@@ -1,2 +1 @@
-export * from './observePoll';
 export * from './getPoll';

package/src/postRepository/api/index.ts

@@ -1,7 +1,6 @@
 export * from './getPostByIds';
 
 export * from './createPost';
-export * from './updatePost';
 export * from './editPost';
 
 export * from './deletePost';

package/src/postRepository/observers/index.ts

@@ -1,5 +1,3 @@
-export * from './observePosts';
-export * from './observePost';
 export * from './getPost';
 export * from './getPosts';
 export * from './getPinnedPosts';

package/src/role/api/queryRoles.ts

@@ -21,31 +21,19 @@ import { ingestInCache } from '~/cache/api/ingestInCache';
 export const queryRoles = async (query?: {
   displayName?: Amity.Role['displayName'];
   sortBy?: 'displayName' | 'firstCreated' | 'lastCreated';
-  /**
-   * @deprecated please use `queryToken` to query next pages or previous pages
-   * The first page result includes previous token and next token in paging field
-   * use this token as the `queryToken` to query next pages or previous pages
-   *
-   */
-  page?: Amity.Page;
   limit?: number;
   queryToken?: string;
 }): Promise<Amity.Cached<Amity.Paged<Amity.Role>> & Amity.Pagination> => {
   const client = getActiveClient();
   client.log('role/queryRoles', query);
 
-  const { page, limit = 10, queryToken, displayName, sortBy, ...params } = query ?? {};
+  const { limit = 10, queryToken, displayName, sortBy, ...params } = query ?? {};
 
   const options = (() => {
     if (queryToken) return { token: queryToken };
 
     if (limit) return { limit };
 
-    if (page)
-      return {
-        token: toToken(page, 'skiplimit'),
-      };
-
     return undefined;
   })();
 

package/src/streamRepository/api/deleteStream.ts

@@ -2,7 +2,7 @@ import { getActiveClient } from '~/client/api';
 
 import { upsertInCache } from '~/cache/api';
 
-import { getStream } from './getStream';
+import { getStream } from '../internalApi/getStream';
 
 // import { unwrapPayload } from '~/core/transports'
 

package/src/streamRepository/api/index.ts

@@ -2,7 +2,3 @@ export * from './createStream';
 export * from './updateStream';
 export * from './deleteStream';
 export * from './disposeStream';
-
-// deprecated
-export * from './queryStreams';
-export * from './getStream';

package/src/streamRepository/api/tests/getStream.test.ts

@@ -1,6 +1,6 @@
 import { enableCache } from '~/cache/api';
 import { client, connectClient, disconnectClient, streamResponse } from '~/utils/tests';
-import { getStream } from '~/streamRepository/api/getStream';
+import { getStream } from '~/streamRepository/internalApi/getStream';
 
 const STREAM_ID = streamResponse.data.videoStreamings[0].streamId;
 

package/src/streamRepository/events/onStreamFlagged.ts

@@ -28,10 +28,5 @@ export const onStreamFlagged = (
     callback(payload.videoStreamings[0]);
   };
 
-  return createEventSubscriber(
-    client,
-    'stream/onStreamFlagged',
-    'v3.video-streaming.didFlag',
-    filter,
-  );
+  return createEventSubscriber(client, 'stream/onStreamFlagged', 'video-streaming.didFlag', filter);
 };

package/src/streamRepository/events/onStreamRecorded.ts

@@ -31,7 +31,7 @@ export const onStreamRecorded = (
   return createEventSubscriber(
     client,
     'stream/onStreamRecorded',
-    'v3.video-streaming.didRecord',
+    'video-streaming.didRecord',
     filter,
   );
 };

package/src/streamRepository/events/onStreamStarted.ts

@@ -31,7 +31,7 @@ export const onStreamStarted = (
   return createEventSubscriber(
     client,
     'stream/onStreamStarted',
-    'v3.video-streaming.didStart',
+    'video-streaming.didStart',
     filter,
   );
 };

package/src/streamRepository/events/onStreamStopped.ts

@@ -31,7 +31,7 @@ export const onStreamStopped = (
   return createEventSubscriber(
     client,
     'stream/onStreamStropped',
-    'v3.video-streaming.didStop',
+    'video-streaming.didStop',
     filter,
   );
 };

package/src/streamRepository/events/onStreamTerminated.ts

@@ -31,7 +31,7 @@ export const onStreamTerminated = (
   return createEventSubscriber(
     client,
     'stream/onStreamTerminated',
-    'v3.video-streaming.didTerminate',
+    'video-streaming.didTerminate',
     filter,
   );
 };

package/src/streamRepository/observers/getStreamById.ts

@@ -6,7 +6,7 @@ import { pullFromCache } from '~/cache/api';
 import { onStreamFlagged } from '~/streamRepository/events/onStreamFlagged';
 import { onStreamTerminated } from '~/streamRepository/events/onStreamTerminated';
 import { LinkedObject } from '~/utils/linkedObject';
-import { getStream as _getStream } from '../api/getStream';
+import { getStream as _getStream } from '../internalApi/getStream';
 import { onStreamRecorded, onStreamStarted, onStreamStopped } from '../events';
 
 /* begin_public_function