@amityco/ts-sdk 7.5.4-3506dd3.0 → 7.5.4-54f750e3.0

package/src/communityRepository/api/getCommunity.ts

@@ -25,7 +25,7 @@ export const getCommunity = async (
   communityId: Amity.Community['communityId'],
   type?: Amity.JoinRequestType,
   includeDiscoverablePrivateCommunity?: boolean,
-): Promise<Amity.Cached<Amity.Community>> => {
+): Promise<Amity.Cached<Amity.InternalCommunity>> => {
   const client = getActiveClient();
   client.log('community/getCommunity', communityId);
 
@@ -51,9 +51,7 @@ export const getCommunity = async (
   const { communities } = data;
 
   return {
-    data: LinkedObject.community(
-      communities.find(community => community.communityId === communityId)!,
-    ),
+    data: communities.find(community => community.communityId === communityId)!,
     cachedAt,
   };
 };
@@ -73,18 +71,18 @@ export const getCommunity = async (
  */
 getCommunity.locally = (
   communityId: Amity.Community['communityId'],
-): Amity.Cached<Amity.Community> | undefined => {
+): Amity.Cached<Amity.InternalCommunity> | undefined => {
   const client = getActiveClient();
   client.log('community/getCommunity.locally', communityId);
 
   if (!client.cache) return;
 
-  const cached = pullFromCache<Amity.Community>(['community', 'get', communityId]);
+  const cached = pullFromCache<Amity.InternalCommunity>(['community', 'get', communityId]);
 
   if (!cached) return;
 
   return {
-    data: LinkedObject.community(cached.data),
+    data: cached.data,
     cachedAt: cached.cachedAt,
   };
 };

package/src/communityRepository/observers/getCommunity.ts

@@ -12,6 +12,7 @@ import {
   onLocalCommunityJoin,
 } from '../communityMembership/events';
 import { convertEventPayload } from '~/utils/event';
+import { LinkedObject } from '~/utils/linkedObject';
 
 /* begin_public_function
   id: community.get
@@ -39,17 +40,28 @@ export const getCommunity = (
   communityId: Amity.Community['communityId'],
   callback: Amity.LiveObjectCallback<Amity.Community>,
 ): Amity.Unsubscriber => {
-  return liveObject(communityId, callback, 'communityId', _getCommunity, [
-    onCommunityUpdated,
-    onCommunityDeleted,
-    onCommunityJoined,
-    onCommunityLeft,
-    onLocalCommunityJoined,
-    onLocalCommunityLeft,
-    onCommunityUserBanned,
-    onCommunityUserUnbanned,
-    onCommunityUserChanged,
-    convertEventPayload(onLocalCommunityJoin, 'targetId', 'community'),
-  ]);
+  return liveObject(
+    communityId,
+    callback,
+    'communityId',
+    _getCommunity,
+    [
+      onCommunityUpdated,
+      onCommunityDeleted,
+      onCommunityJoined,
+      onCommunityLeft,
+      onLocalCommunityJoined,
+      onLocalCommunityLeft,
+      onCommunityUserBanned,
+      onCommunityUserUnbanned,
+      onCommunityUserChanged,
+      convertEventPayload(onLocalCommunityJoin, 'targetId', 'community'),
+    ],
+    {
+      callbackDataSelector: (data: Amity.InternalCommunity) => {
+        return LinkedObject.community(data);
+      },
+    },
+  );
 };
 /* end_public_function */

package/src/communityRepository/observers/getJoinRequests/JoinRequestsPaginationController.ts

@@ -1,5 +1,4 @@
 import { PaginationController } from '~/core/liveCollection/PaginationController';
-import { COLLECTION_DEFAULT_PAGINATION_LIMIT } from '~/utils/constants';
 
 /**
  * TODO: handle cache receive cache option, and cache policy
@@ -10,7 +9,7 @@ export class JoinRequestsPaginationController extends PaginationController<
   Amity.JoinRequestLiveCollection
 > {
   async getRequest(queryParams: Amity.JoinRequestLiveCollection, token: string | undefined) {
-    const { limit = COLLECTION_DEFAULT_PAGINATION_LIMIT, communityId, ...params } = queryParams;
+    const { limit = 20, communityId, ...params } = queryParams;
     const options = token ? { token } : { limit };
 
     const { data: queryResponse } = await this.http.get<

package/src/utils/linkedObject/channelLinkedObject.ts

@@ -1,8 +1,27 @@
 import { markAsRead } from '~/channelRepository/internalApi/markAsRead';
 import { shallowClone } from '../shallowClone';
+import { queryCache } from '~/cache/api';
+import { channelMemberLinkedObject } from './channelMemberLinkedObject';
 
 export const channelLinkedObject = (channel: Amity.InternalChannel): Amity.Channel => {
+  let previewMembers: Amity.Membership<'channel'>[] = [];
+
+  if (channel.type === 'conversation') {
+    const channelUsers = queryCache<Amity.Membership<'channel'>>(['channelUsers', 'get']);
+    if (channelUsers && channelUsers?.length > 0) {
+      previewMembers = (
+        channelUsers?.filter(({ data }) => data.channelId === channel.channelId) ?? []
+      )
+        // sort in ascending order by userInternalId
+        .sort((a, b) => a.data.userInternalId.localeCompare(b.data.userInternalId))
+        // Select only first 4 members
+        .slice(0, 4)
+        .map(({ data }) => channelMemberLinkedObject(data));
+    }
+  }
+
   return shallowClone(channel, {
     markAsRead: () => markAsRead(channel.channelInternalId),
+    previewMembers,
   });
 };

package/src/utils/linkedObject/channelMemberLinkedObject.ts

@@ -0,0 +1,20 @@
+import { pullFromCache } from '~/cache/api/pullFromCache';
+import { userLinkedObject } from './userLinkedObject';
+
+export const channelMemberLinkedObject = (
+  channelMember: Amity.Membership<'channel'>,
+): Amity.Membership<'channel'> => {
+  const getUser = (): Amity.User | undefined => {
+    const cacheKey = ['user', 'get', channelMember.userId];
+    const internalUser = pullFromCache<Amity.InternalUser>(cacheKey)?.data;
+
+    return internalUser ? userLinkedObject(internalUser) : undefined;
+  };
+
+  return {
+    ...channelMember,
+    get user() {
+      return getUser();
+    },
+  };
+};

package/src/utils/linkedObject/index.ts

@@ -14,6 +14,7 @@ import { notificationTrayLinkedObject } from './notificationTrayLinkedObject';
 import { communityLinkedObject } from './communityLinkedObject';
 import { invitationLinkedObject } from './invitationLinkedObject';
 import { joinRequestLinkedObject } from './joinRequestLinkedObject';
+import { channelMemberLinkedObject } from './channelMemberLinkedObject';
 
 export const LinkedObject = {
   ad: adLinkedObject,
@@ -32,4 +33,5 @@ export const LinkedObject = {
   community: communityLinkedObject,
   invitation: invitationLinkedObject,
   joinRequest: joinRequestLinkedObject,
+  channelMember: channelMemberLinkedObject,
 };

package/src/utils/linkedObject/invitationLinkedObject.ts

@@ -22,8 +22,10 @@ export const invitationLinkedObject = (invitation: Amity.InternalInvitation): Am
           'get',
           invitation.targetId,
         ]);
-        if (cacheData?.data) return cacheData.data;
-        return undefined;
+        return {
+          community: cacheData?.data,
+          communityId: invitation.communityId,
+        };
       }
       return undefined;
     },