@amityco/ts-sdk-react-native 6.24.1-13ac472.0 → 6.24.2-18b8e6d.0

package/src/communityRepository/observers/getCommunities.ts

@@ -1,31 +1,7 @@
-/* eslint-disable no-use-before-define */
-import { getResolver } from '~/core/model';
-import { dropFromCache, pullFromCache, pushToCache } from '~/cache/api';
+import { dropFromCache } from '~/cache/api';
 import { getActiveClient } from '~/client/api';
-import {
-  createQuery,
-  filterByCommunityMembership,
-  filterByPropEquality,
-  filterByStringComparePartially,
-  queryOptions,
-  runQuery,
-  sortByDisplayName,
-  sortByFirstCreated,
-  sortByLastCreated,
-} from '~/core/query';
-import {
-  COLLECTION_DEFAULT_CACHING_POLICY,
-  COLLECTION_DEFAULT_PAGINATION_LIMIT,
-  ENABLE_CACHE_MESSAGE,
-} from '~/utils/constants';
-import { CACHE_SHORTEN_LIFESPAN } from '~/cache/utils';
-import { onCommunityCreated, onCommunityDeleted, onCommunityUpdated } from '../events';
-import {
-  onCommunityJoined,
-  onCommunityLeft,
-  onCommunityUserChanged,
-} from '../communityMembership/events';
-import { queryCommunities } from '../api/queryCommunities';
+import { ENABLE_CACHE_MESSAGE } from '~/utils/constants';
+import { CommunityLiveCollectionController } from './getCommunities/CommunitiesLiveCollectionController';
 
 /* begin_public_function
   id: community.query
@@ -53,7 +29,7 @@ export const getCommunities = (
   callback: Amity.LiveCollectionCallback<Amity.Community>,
   config?: Amity.LiveCollectionConfig,
 ) => {
-  const { log, cache, userId } = getActiveClient();
+  const { log, cache } = getActiveClient();
 
   if (!cache) {
     console.log(ENABLE_CACHE_MESSAGE);
@@ -62,130 +38,11 @@ export const getCommunities = (
   const timestamp = Date.now();
   log(`getCommunities(tmpid: ${timestamp}) > listen`);
 
-  const { limit: queryLimit, ...queryParams } = params;
+  const communitiesLiveCollection = new CommunityLiveCollectionController(params, callback);
+  const disposers = communitiesLiveCollection.startSubscription();
 
-  const limit = queryLimit ?? COLLECTION_DEFAULT_PAGINATION_LIMIT;
-  const { policy = COLLECTION_DEFAULT_CACHING_POLICY } = config ?? {};
+  const cacheKey = communitiesLiveCollection.getCacheKey();
 
-  const disposers: Amity.Unsubscriber[] = [];
-  const cacheKey = ['community', 'collection', queryParams as Amity.Serializable];
-
-  const responder = (data: Amity.CommunityLiveCollectionCache) => {
-    let communities: Amity.Community[] =
-      data.data
-        .map(communityId => pullFromCache<Amity.Community>(['community', 'get', communityId])!)
-        .filter(Boolean)
-        .map(({ data }) => data) ?? [];
-
-    communities = filterByStringComparePartially(communities, 'displayName', params.displayName);
-
-    if (!params.includeDeleted) {
-      communities = filterByPropEquality(communities, 'isDeleted', false);
-    }
-
-    if (params.categoryId) {
-      communities = communities.filter(c => c.categoryIds?.includes(params.categoryId!));
-    }
-
-    if (params.tags) {
-      communities = communities.filter(c => c.tags?.some(t => params.tags?.includes(t)));
-    }
-
-    if (params.membership && userId) {
-      communities = filterByCommunityMembership(communities, params.membership, userId);
-    }
-
-    const sortBy = params.sortBy || 'lastCreated';
-
-    if (sortBy === 'lastCreated' || sortBy === 'firstCreated') {
-      communities = communities.sort(
-        sortBy === 'lastCreated' ? sortByLastCreated : sortByFirstCreated,
-      );
-    }
-
-    /*
-     * The server returns communities with empty | null displayName's first before
-     * returning sorted list of communities with displayNames
-     *
-     * This section needs to be updated as displayNames can be null as well
-     */
-    if (sortBy === 'displayName') {
-      communities = communities
-        // this needs to be aligned with the backend data type
-        .map(c => (c.displayName ? c : { ...c, displayName: '' }))
-        // @ts-ignore
-        .sort(sortByDisplayName);
-    }
-
-    callback({
-      onNextPage: onFetch,
-      data: communities,
-      hasNextPage: !!data.params?.page,
-      loading: data.loading,
-      error: data.error,
-    });
-  };
-
-  const realtimeRouter = (_: Amity.CommunityActionType) => (community: Amity.Community) => {
-    const collection = pullFromCache<Amity.CommunityLiveCollectionCache>(cacheKey)?.data;
-    if (!collection) return;
-
-    /*
-     * Simply update collection and let responder decide what to do with data
-     */
-    collection.data = [...new Set([community.communityId, ...collection.data])];
-
-    pushToCache(cacheKey, collection);
-    responder(collection);
-  };
-
-  const onFetch = (initial = false) => {
-    const collection = pullFromCache<Amity.CommunityLiveCollectionCache>(cacheKey)?.data;
-
-    const communities = collection?.data ?? [];
-
-    if (!initial && communities.length > 0 && !collection?.params.page) return;
-
-    const query = createQuery(queryCommunities, {
-      ...queryParams,
-      limit: initial ? limit : undefined,
-      page: !initial ? collection?.params.page : undefined,
-    });
-
-    runQuery(
-      query,
-      ({ data: result, error, loading, paging }) => {
-        const data = {
-          loading,
-          error,
-          params: { page: paging?.next },
-          data: communities,
-        };
-
-        if (result) {
-          data.data = initial
-            ? result.map(getResolver('community'))
-            : [...new Set([...communities, ...result.map(getResolver('community'))])];
-        }
-
-        pushToCache(cacheKey, data);
-
-        responder(data);
-      },
-      queryOptions(policy, CACHE_SHORTEN_LIFESPAN),
-    );
-  };
-
-  disposers.push(
-    onCommunityCreated(realtimeRouter('onCreate')),
-    onCommunityDeleted(realtimeRouter('onDelete')),
-    onCommunityUpdated(realtimeRouter('onUpdate')),
-    onCommunityJoined(realtimeRouter('onJoin')),
-    onCommunityLeft(realtimeRouter('onLeft')),
-    onCommunityUserChanged(realtimeRouter('onMemberCountChanged')),
-  );
-
-  onFetch(true);
   disposers.push(() => dropFromCache(cacheKey));
 
   return () => {

package/src/communityRepository/observers/searchCommunities/SearchCommunitiesLiveCollectionController.ts

@@ -1,24 +1,19 @@
-/* eslint-disable no-use-before-define */
 import hash from 'object-hash';
 import { pullFromCache, pushToCache } from '~/cache/api';
 import { CommunitiesPaginationController } from './SearchCommunitiesPaginationController';
 import { CommunitiesQueryStreamController } from './SearchCommunitiesQueryStreamController';
 import { LiveCollectionController } from '~/core/liveCollection/LiveCollectionController';
-import {
-  onCommunityCreated,
-  onCommunityDeleted,
-  onCommunityUpdated,
-} from '~/communityRepository/events';
-import {
-  filterByCommunityMembership,
-  filterByPropEquality,
-  sortByDisplayName,
-  sortByFirstCreated,
-  sortByLastCreated,
-} from '~/core/query';
+import { onCommunityDeleted, onCommunityUpdated } from '~/communityRepository/events';
+import { filterByCommunityMembership, filterByPropEquality } from '~/core/query';
 import { prepareCommunityPayload } from '~/communityRepository/utils';
 import { getActiveClient } from '~/client';
 import { EnumCommunityActions } from './enums';
+import { EnumCommunityMemberActions } from '~/communityRepository/communityMembership/observers/getMembers/enums';
+import {
+  onCommunityJoined,
+  onCommunityLeft,
+  onCommunityUserChanged,
+} from '~/communityRepository/communityMembership';
 
 export class SearchCommunityLiveCollectionController extends LiveCollectionController<
   'community',
@@ -78,6 +73,9 @@ export class SearchCommunityLiveCollectionController extends LiveCollectionContr
     return this.queryStreamController.subscribeRTE([
       { fn: onCommunityDeleted, action: EnumCommunityActions.OnCommunityDeleted },
       { fn: onCommunityUpdated, action: EnumCommunityActions.OnCommunityUpdated },
+      { fn: onCommunityJoined, action: EnumCommunityMemberActions.OnCommunityJoined },
+      { fn: onCommunityLeft, action: EnumCommunityMemberActions.OnCommunityLeft },
+      { fn: onCommunityUserChanged, action: EnumCommunityMemberActions.OnMemberCountChanged },
     ]);
   }
 

package/src/communityRepository/observers/searchCommunities/SearchCommunitiesQueryStreamController.ts

@@ -4,6 +4,7 @@ import { ingestInCache } from '~/cache/api/ingestInCache';
 import { getResolver } from '~/core/model';
 import { getActiveClient } from '~/client';
 import { EnumCommunityActions } from './enums';
+import { EnumCommunityMemberActions } from '~/communityRepository/communityMembership/observers/getMembers/enums';
 
 export class CommunitiesQueryStreamController extends QueryStreamController<
   Amity.CommunityPayload,
@@ -58,7 +59,7 @@ export class CommunitiesQueryStreamController extends QueryStreamController<
     }
   }
 
-  reactor(action: EnumCommunityActions) {
+  reactor(action: EnumCommunityActions | EnumCommunityMemberActions) {
     return (community: Amity.Community) => {
       const collection = pullFromCache<Amity.SearchCommunityLiveCollectionCache>(
         this.cacheKey,
@@ -73,7 +74,7 @@ export class CommunitiesQueryStreamController extends QueryStreamController<
   subscribeRTE(
     createSubscriber: {
       fn: (reactor: (channel: Amity.Community) => void) => Amity.Unsubscriber;
-      action: EnumCommunityActions;
+      action: EnumCommunityActions | EnumCommunityMemberActions;
     }[],
   ) {
     return createSubscriber.map(subscriber => subscriber.fn(this.reactor(subscriber.action)));

package/src/communityRepository/observers/searchCommunities.ts

@@ -8,7 +8,7 @@ import { SearchCommunityLiveCollectionController } from './searchCommunities/Sea
 */
 /**
  * ```js
- * import { CommunityRepository } from '@amityco/ts-sdk'
+ * import { CommunityRepository } from '@amityco/ts-sdk-react-native'
  *
  * let communities = []
  * const unsub = CommunityRepository.searchCommunities({

package/src/communityRepository/utils/payload.ts

@@ -1,4 +1,5 @@
 import { CommunityPostSettingMaps, DefaultCommunityPostSetting } from '~/@types';
+import { pullFromCache } from '~/cache/api';
 import { withUsers } from '~/group/utils';
 import { updateMembershipStatus } from './communityWithMembership';
 
@@ -13,6 +14,22 @@ const getMatchPostSetting = (value: {
       value.onlyAdminCanPost === CommunityPostSettingMaps[key].onlyAdminCanPost,
   ) ?? DefaultCommunityPostSetting;
 
+const convertCommunityUsersToUniqueObject = (
+  communityUsers: Amity.RawMembership<'community'>[],
+) => {
+  if (!communityUsers) return communityUsers;
+
+  const result: {
+    [key: string]: Amity.RawMembership<'community'>;
+  } = {};
+
+  communityUsers.forEach(user => {
+    result[`${user.userId}#${user.communityId}`] = user;
+  });
+
+  return result;
+};
+
 export const prepareCommunityPayload = (
   rawPayload: Amity.CommunityPayload,
 ): Amity.ProcessedCommunityPayload => {
@@ -27,7 +44,24 @@ export const prepareCommunityPayload = (
     }),
   );
 
-  const communityUsers = withUsers(rawPayload.communityUsers);
+  const mergeCommunityUsers = communities.reduce<{
+    [key: string]: Amity.RawMembership<'community'>;
+  }>((acc, { communityId }) => {
+    const users = pullFromCache<Amity.RawMembership<'community'>[]>([
+      'communityUsers',
+      'collection',
+      communityId,
+    ])?.data;
+
+    if (!users) return acc;
+
+    return {
+      ...convertCommunityUsersToUniqueObject(users),
+      ...acc,
+    };
+  }, convertCommunityUsersToUniqueObject(rawPayload.communityUsers));
+
+  const communityUsers = withUsers(Object.values(mergeCommunityUsers));
 
   const communityWithMembershipStatus = updateMembershipStatus(communities, communityUsers);
 

package/src/communityRepository/utils/saveCommunityUsers.ts

@@ -0,0 +1,16 @@
+import { pushToCache } from '~/cache/api';
+
+export const saveCommunityUsers = (
+  communities: Amity.CommunityPayload['communities'],
+  communityUsers: Amity.CommunityPayload['communityUsers'],
+) => {
+  if (communities.length === 0 || communityUsers.length === 0) return;
+
+  communities.forEach(({ communityId }) => {
+    const collection = communityUsers.filter(
+      ({ communityId: userCommunityId }) => communityId === userCommunityId,
+    );
+
+    pushToCache(['communityUsers', 'collection', communityId], collection);
+  });
+};

package/src/fileRepository/api/createFile.ts

@@ -24,8 +24,11 @@ export const createFile = async <T extends Amity.FileType = any>(
   const client = getActiveClient();
   client.log('file/createFile', formData);
 
-  if (!formData.getAll('files').length)
-    throw new Error('The formData object must have a `files` key.');
+  const files = formData.getAll('files');
+
+  if (!files.length) throw new Error('The formData object must have a `files` key.');
+
+  formData.append('preferredFilename', (files[0] as File).name);
 
   const headers =
     'getHeaders' in formData

package/src/fileRepository/api/createImage.ts

@@ -23,8 +23,12 @@ export const createImage = async (
   const client = getActiveClient();
   client.log('file/createImage', formData);
 
-  if (!formData.getAll('files').length)
-    throw new Error('The formData object must have a `files` key.');
+  const files = formData.getAll('files');
+
+  if (!files.length) throw new Error('The formData object must have a `files` key.');
+
+  formData.append('preferredFilename', (files[0] as File).name);
+
   const headers =
     'getHeaders' in formData
       ? (formData as any).getHeaders()

package/src/fileRepository/api/createVideo.ts

@@ -26,8 +26,11 @@ export const createVideo = async (
   const client = getActiveClient();
   client.log('file/createVideo', formData);
 
-  if (!formData.getAll('files').length)
-    throw new Error('The formData object must have a `files` key.');
+  const files = formData.getAll('files');
+
+  if (!files.length) throw new Error('The formData object must have a `files` key.');
+
+  formData.append('preferredFilename', (files[0] as File).name);
 
   if (feedType) {
     formData.append('feedType', feedType);

package/src/fileRepository/api/uploadFile.ts

@@ -27,8 +27,11 @@ export const uploadFile = async <T extends Amity.FileType = any>(
   const client = getActiveClient();
   client.log('file/uploadFile', formData);
 
-  if (!formData.getAll('files').length)
-    throw new Error('The formData object must have a `files` key.');
+  const files = formData.getAll('files');
+
+  if (!files.length) throw new Error('The formData object must have a `files` key.');
+
+  formData.append('preferredFilename', (files[0] as File).name);
 
   const headers =
     'getHeaders' in formData

package/src/fileRepository/api/uploadImage.ts

@@ -27,8 +27,11 @@ export const uploadImage = async (
   const client = getActiveClient();
   client.log('file/uploadImage', formData);
 
-  if (!formData.getAll('files').length)
-    throw new Error('The formData object must have a `files` key.');
+  const files = formData.getAll('files');
+
+  if (!files.length) throw new Error('The formData object must have a `files` key.');
+
+  formData.append('preferredFilename', (files[0] as File).name);
 
   const headers =
     'getHeaders' in formData

package/src/fileRepository/api/uploadVideo.ts

@@ -29,8 +29,11 @@ export const uploadVideo = async (
   const client = getActiveClient();
   client.log('file/uploadVideo', formData);
 
-  if (!formData.getAll('files').length)
-    throw new Error('The formData object must have a `files` key.');
+  const files = formData.getAll('files');
+
+  if (!files.length) throw new Error('The formData object must have a `files` key.');
+
+  formData.append('preferredFilename', (files[0] as File).name);
 
   if (feedType) {
     formData.append('feedType', feedType);

package/src/streamRepository/api/getStreams.ts

@@ -8,7 +8,7 @@ import { ingestInCache } from '~/cache/api/ingestInCache';
 */
 /**
  * ```js
- * import { getStreams } from '@amityco/ts-sdk'
+ * import { getStreams } from '@amityco/ts-sdk-react-native'
  * const streams = await getStreams()
  * ```
  *
@@ -62,7 +62,7 @@ export const getStreams = async (query?: {
 
 /**
  * ```js
- * import { getStreams } from '@amityco/ts-sdk'
+ * import { getStreams } from '@amityco/ts-sdk-react-native'
  * const streams = getStreams.locally()
  * ```
  *

package/src/utils/liveObject.ts

@@ -10,6 +10,9 @@ import { convertGetterPropsToStatic } from '~/utils/object';
 
 import { isEqual } from './isEqual';
 
+/**
+ * @deprecated This function is deprecated
+ */
 export const liveObject = <
   T extends Amity.Model,
   K extends keyof T,