@amityco/ts-sdk 6.35.3-fa3d4ac.0 → 7.0.1-7547014.0

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

@@ -1,62 +1,8 @@
-/* eslint-disable no-use-before-define */
 import { getActiveClient } from '~/client/api';
 import { dropFromCache } from '~/cache/api';
-import { filterByPropEquality } from '~/core/query';
-
 import { ENABLE_CACHE_MESSAGE } from '~/utils/constants';
 import { MessageLiveCollectionController } from './MessageLiveCollectionController';
 
-/*
- * Exported for testing
- * @hidden
- */
-export const applyFilter = <T extends Amity.Message>(
-  data: T[],
-  params: Amity.MessagesLiveCollection,
-): 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
-   */
-  if (!params.includeDeleted) {
-    messages = filterByPropEquality(messages, 'isDeleted', false);
-  }
-
-  messages = messages.sort((message1, message2) => {
-    if (params.sortBy === 'segmentAsc') {
-      return message1.channelSegment - message2.channelSegment;
-    }
-    if (params.sortBy === 'segmentDesc') {
-      return message2.channelSegment - message1.channelSegment;
-    }
-    return 0;
-  });
-
-  return messages;
-};
-
 /* begin_public_function
   id: message.query
 */

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

package/src/subChannelRepository/utils/markReadEngine.ts

@@ -1,17 +1,10 @@
 import { onSessionStateChange } from '~/client/events/onSessionStateChange';
-import { getMarkedMessageTopic, subscribeTopic } from '~/core/subscription';
 import { setIntervalTask } from '~/utils/timer';
-
-import { onOnline } from '~/client/utils/onOnline';
-import { getSubChannel } from '../api/getSubChannel';
 import { readingAPI } from '../api/readingAPI';
-import { startReadingAPI } from '../api/startReadingAPI';
-import { stopReadingAPI } from '../api/stopReadingAPI';
 
 const START_READING_INTERVAL_TIME = 30000;
 
 let isSyncRunning = false;
-let disposers: (() => void)[] = [];
 
 /**
  * map contains subChannelId and isReading flag to determine which subChannel is on reading state
@@ -66,105 +59,6 @@ export const markReadEngineOnLoginHandler = () => {
   };
 };
 
-const getParentChannelId = async (
-  subChannelId: Amity.SubChannel['subChannelId'],
-): Promise<Amity.SubChannel['channelId']> => {
-  const cached = getSubChannel.locally(subChannelId);
-
-  if (cached) {
-    return cached.data.channelId;
-  }
-
-  const { data } = await getSubChannel(subChannelId);
-  return data.channelId;
-};
-
-const registerEventListeners = () => {
-  if (disposers.length > 0) {
-    return;
-  }
-
-  disposers.push(
-    onOnline(() => {
-      // Start reading the reading subChannel again when resume from offline state
-      startReadingFromReadingList();
-    }),
-  );
-};
-
-const registerTopicSubscribers = async (subChannelId: Amity.SubChannel['subChannelId']) => {
-  const channelId = await getParentChannelId(subChannelId);
-  const markedMessageTopic = getMarkedMessageTopic({ channelId, subChannelId });
-  disposers.push(subscribeTopic(markedMessageTopic));
-};
-
-const disposeAll = () => {
-  disposers.forEach(fn => fn());
-  disposers = [];
-};
-
-/* begin_public_function
-  id: subchannel.start_reading
-*/
-/**
- * @deprecated Use {@link startMessageReceiptSync} instead.
- * ```js
- * import { startReading } from '@amityco/ts-sdk'
- * const success = await startReading('foo')
- * ```
- *
- * Set local reading state of channel to `true` and then call mark all
- * messages as read API.
- *
- * @param subChannelId - The sub channel ID to start reading.
- * @return A success boolean if reading of the sub channel had begun.
- *
- * @category Channel API
- * @async
- */
-export const startReading = async (subChannelId: Amity.SubChannel['subChannelId']) => {
-  isReadingMap[subChannelId] = true;
-
-  if (disposers.length === 0) {
-    registerEventListeners();
-    registerTopicSubscribers(subChannelId);
-  }
-
-  try {
-    return await startReadingAPI(subChannelId);
-  } catch (e) {
-    isReadingMap[subChannelId] = false;
-    return false;
-  }
-};
-/* end_public_function */
-
-/* begin_public_function
-  id: subchannel.stop_reading
-*/
-/**
- * @deprecated Use {@link stopMessageReceiptSync} instead.
- * ```js
- * import { stopReading } from '@amityco/ts-sdk'
- * const success = await stopReading('foo')
- * ```
- *
- * Set local reading state of channel to `false` and then call mark all
- * messages as unread API.
- *
- * @param subChannelId - The sub channel ID to stop reading.
- * @return A success boolean if reading of the sub channel had begun.
- *
- * @category Channel API
- * @async
- */
-export const stopReading = (subChannelId: Amity.SubChannel['subChannelId']) => {
-  isReadingMap[subChannelId] = false;
-  disposeAll();
-  return stopReadingAPI(subChannelId);
-};
-/* end_public_function */
-
 setIntervalTask(async () => {
   if (!isSyncRunning) return;
 

package/src/userRepository/internalApi/queryUsers.ts

@@ -27,19 +27,11 @@ export const queryUsers = async (
   const client = getActiveClient();
   client.log('user/queryUsers', query);
 
-  const {
-    page,
-    limit = 10,
-    displayName,
-    filter = 'all',
-    sortBy = 'displayName',
-    ...params
-  } = query;
+  const { page, limit = 10, filter = 'all', sortBy = 'displayName', ...params } = query;
 
   const { data } = await client.http.get<Amity.UserPayload & Amity.Pagination>(`/api/v3/users`, {
     params: {
       ...params,
-      keyword: displayName,
       filter,
       sortBy,
       options: page ? { token: page } : { limit },

package/src/userRepository/observers/getUsers/UserLiveCollectionController.ts

@@ -103,22 +103,18 @@ export class UserLiveCollectionController extends LiveCollectionController<
   applyFilter(data: Amity.InternalUser[]) {
     let users = data;
 
-    if (!this.query.displayName) {
-      const sortFn = (() => {
-        switch (this.query.sortBy) {
-          case 'firstCreated':
-            return sortByFirstCreated;
-          case 'lastCreated':
-            return sortByLastCreated;
-          case 'displayName':
-            return sortByDisplayName;
-          default:
-            return sortByLastCreated;
-        }
-      })();
-
-      users = users.sort(sortFn);
-    }
+    const sortFn = (() => {
+      switch (this.query.sortBy) {
+        case 'firstCreated':
+          return sortByFirstCreated;
+        case 'lastCreated':
+          return sortByLastCreated;
+        default:
+          return sortByLastCreated;
+      }
+    })();
+
+    users = users.sort(sortFn);
 
     if (this.query.filter === 'flagged') {
       users = users.filter(user => !!user.hashFlag);

package/src/userRepository/observers/getUsers/UserPaginationController.ts

@@ -6,7 +6,7 @@ export class UserPaginationController extends PaginationController<
   Amity.UserLiveCollection
 > {
   async getRequest(queryParams: Amity.UserLiveCollection, token: string | undefined) {
-    const { limit = COLLECTION_DEFAULT_PAGINATION_LIMIT, displayName, ...params } = queryParams;
+    const { limit = COLLECTION_DEFAULT_PAGINATION_LIMIT, ...params } = queryParams;
     const options = token ? { token } : { limit };
 
     const { data: queryResponse } = await this.http.get<Amity.UserPayload & Amity.Pagination>(
@@ -14,7 +14,6 @@ export class UserPaginationController extends PaginationController<
       {
         params: {
           ...params,
-          keyword: displayName,
           options,
           isDeleted: false,
         },

package/src/userRepository/observers/index.ts

@@ -1,7 +1,5 @@
 export { getUser } from './getUser';
 export { getUsers } from './getUsers';
-export { observeUser } from './observeUser';
 export { getBlockedUsers } from './getBlockedUsers';
 export { searchUserByDisplayName } from './searchUserByDisplayName';
-export { getViewedUsers } from './getViewedUsers';
 export { getReachedUsers } from './getReachedUsers';

package/src/userRepository/observers/tests/getUsers.test.ts

@@ -14,7 +14,7 @@ import {
 // makes it easier to spy on applyFilter
 import * as getUsersModule from '../getUsers';
 
-const { getUsers, applyFilter } = getUsersModule;
+const { getUsers } = getUsersModule;
 
 const getSnapshot = (params?: Record<string, any>) => {
   return {
@@ -174,47 +174,5 @@ describe('getUsers', () => {
         ),
       );
     });
-
-    test('it should apply filters on RTE only', async () => {
-      const callback = jest.fn();
-      const applyFilterSpy = jest.spyOn(getUsersModule, 'applyFilter');
-      client.http.get = jest.fn().mockResolvedValue(userQueryResponse);
-
-      getUsers(params, callback);
-      await pause();
-
-      expect(applyFilterSpy).not.toHaveBeenCalled();
-
-      client.emitter.emit('user.updated', { users: [updatedUser], files: [] });
-      await pause();
-
-      expect(applyFilterSpy).toHaveBeenCalled();
-    });
-  });
-});
-
-describe('getUsers > applyFilter', () => {
-  const u1 = {
-    userId: 'test',
-    displayName: 'a',
-    createdAt: new Date().toISOString(),
-  } as Amity.InternalUser;
-
-  const u2 = {
-    userId: 'searchable',
-    displayName: 'b',
-    createdAt: getPastDate(),
-  } as Amity.InternalUser;
-
-  const filters: [string, Amity.UserLiveCollection, Amity.InternalUser[], Amity.InternalUser[]][] =
-    [
-      ['it should filter by display name', { displayName: 'a' }, [u1, u2], [u1]],
-      ['it should sort by dispaly name', {}, [u1, u2], [u1, u2]],
-      ['it should sort by last created', { sortBy: 'lastCreated' }, [u1, u2], [u1, u2]],
-      ['it should sort by first created', { sortBy: 'firstCreated' }, [u1, u2], [u2, u1]],
-    ];
-
-  test.each(filters)('%s', (test, param, input, expected) => {
-    expect(applyFilter(input, param)).toStrictEqual(expected);
   });
 });

package/src/userRepository/relationship/block/index.ts

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

package/src/userRepository/relationship/follow/api/index.ts

@@ -1,8 +1,4 @@
 export * from './follow';
 export * from './unfollow';
-
-export * from './acceptFollower';
 export * from './acceptMyFollower';
-
-export * from './declineFollower';
 export * from './declineMyFollower';

package/src/userRepository/relationship/follow/observers/index.ts

@@ -1,7 +1,3 @@
-export * from './observeFollowInfo';
-export * from './observeFollowers';
-export * from './observeFollowings';
-
 export * from './getFollowers';
 export * from './getFollowings';
 export * from './getFollowInfo';

package/src/utils/linkedObject/channelLinkedObject.ts

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

package/src/utils/liveObject.ts

@@ -11,7 +11,7 @@ import { convertGetterPropsToStatic } from '~/utils/object';
 import { isEqual } from './isEqual';
 
 /**
- * @deprecated This function is deprecated
+ * @deprecated This function will to be deprecated soon.
  */
 export const liveObject = <
   T extends Amity.Model,
@@ -27,7 +27,7 @@ export const liveObject = <
 ): Amity.Unsubscriber => {
   const { forceDispatch, callbackDataSelector, callbackFilter } = {
     forceDispatch: false,
-    callbackDataSelector: (data: T) => <CallbackData>data,
+    callbackDataSelector: (data: T) => data as unknown as CallbackData,
     ...options,
   };
 

package/dist/channelRepository/api/getChannel.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getChannel.d.ts","sourceRoot":"","sources":["../../../src/channelRepository/api/getChannel.ts"],"names":[],"mappings":"AAaA;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,UAAU;gBACV,MAAM,OAAO,CAAC,iBAAiB,CAAC,GAC1C,QAAQ,MAAM,MAAM,CAAC,MAAM,eAAe,CAAC,CAAC;IAsC/C;;;;;;;;;;;;OAYG;uBAEU,MAAM,OAAO,CAAC,iBAAiB,CAAC,GAC1C,MAAM,MAAM,CAAC,MAAM,eAAe,CAAC,GAAG,SAAS;CAjBjD,CAAC"}

package/dist/channelRepository/api/markAsRead.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"markAsRead.d.ts","sourceRoot":"","sources":["../../../src/channelRepository/api/markAsRead.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,UAAU,cACV,MAAM,OAAO,CAAC,mBAAmB,CAAC,KAC5C,QAAQ,OAAO,CAuCjB,CAAC"}

package/dist/channelRepository/observers/observeChannel.d.ts

@@ -1,18 +0,0 @@
-/**
- * ```js
- * import { observeChannel } from '@amityco/ts-sdk'
- *
- * let channel = {}
- * const dispose = observeChannel(channelId, ({ data }) => channel = data)
- * ```
- *
- * Observe all mutation on a given {@link Amity.Channel}
- *
- * @param channelId the ID of the channel to observe
- * @param callback the function to call when new data are available
- * @returns An {@link Amity.Unsubscriber} function to run when willing to stop observing the channel
- *
- * @category Channel Observer
- */
-export declare const observeChannel: <Events extends [Amity.ChannelActionType.OnResolveChannel | Amity.ChannelActionType.OnResolveUnread | Amity.ChannelActionType.OnFetch | Amity.ChannelActionType.OnUpdate | Amity.ChannelActionType.OnDelete | Amity.ChannelActionType.OnJoin | Amity.ChannelActionType.OnLeft | Amity.ChannelActionType.OnMute | Amity.ChannelActionType.OnMemberAdded | Amity.ChannelActionType.OnMemberRemoved | Amity.ChannelActionType.OnUserMessageFeedMarkerFetch]>(channelId: string, callback: Amity.ObjectListener<Amity.Snapshot<Amity.Channel<any>>, Events>) => Amity.Unsubscriber;
-//# sourceMappingURL=observeChannel.d.ts.map

package/dist/channelRepository/observers/observeChannel.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"observeChannel.d.ts","sourceRoot":"","sources":["../../../src/channelRepository/observers/observeChannel.ts"],"names":[],"mappings":"AAoBA;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,cAAc,ucACd,MAAM,iFAEhB,MAAM,YAqER,CAAC"}