@amityco/ts-sdk 7.5.1-37cf937.0 → 7.5.1-3d3fd19.0

package/dist/utils/linkedObject/communityLinkedObject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"communityLinkedObject.d.ts","sourceRoot":"","sources":["../../../src/utils/linkedObject/communityLinkedObject.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,qBAAqB,cAAe,MAAM,iBAAiB,KAAG,MAAM,SAiDhF,CAAC"}
+{"version":3,"file":"communityLinkedObject.d.ts","sourceRoot":"","sources":["../../../src/utils/linkedObject/communityLinkedObject.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,qBAAqB,cAAe,MAAM,iBAAiB,KAAG,MAAM,SAgDhF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amityco/ts-sdk",
-  "version": "7.5.1-37cf937.0",
+  "version": "7.5.1-3d3fd19.0",
   "license": "CC-BY-ND-4.0",
   "author": "amity.co <developers@amity.co> (https://amity.co)",
   "description": "Amity Social Cloud Typescript SDK",

package/src/@types/core/events.ts

@@ -238,7 +238,7 @@ declare global {
 
       'local.subChannelUnread.updated': Amity.SubChannelUnreadInfo;
       'local.channelUnreadInfo.updated': Amity.ChannelUnreadInfo;
-      'local.channelUnread.updated': Amity.ChannelUnread;
+      'local.channelUnread.updated': Amity.ChannelUnread[];
 
       'local.story.created': Amity.StoryPayload;
       'local.story.updated': Amity.StoryPayload;

package/src/@types/domains/community.ts

@@ -122,6 +122,7 @@ declare global {
       sortBy?: Amity.CommunitySortBy | Amity.CommunitySortByEnum;
       page?: string;
       limit?: number;
+      includeDiscoverablePrivateCommunity?: boolean;
     };
 
     type QueryJoinCommunity = {
@@ -171,8 +172,14 @@ declare global {
 
     type CommunityLiveCollection = Amity.LiveCollectionParams<Omit<QueryCommunities, 'page'>>;
 
-    type RecommendedCommunityLiveCollection = Amity.LiveCollectionParams<{ limit?: number }>;
-    type TrendingCommunityLiveCollection = Amity.LiveCollectionParams<{ limit?: number }>;
+    type RecommendedCommunityLiveCollection = Amity.LiveCollectionParams<{
+      limit?: number;
+      includeDiscoverablePrivateCommunity?: boolean;
+    }>;
+    type TrendingCommunityLiveCollection = Amity.LiveCollectionParams<{
+      limit?: number;
+      includeDiscoverablePrivateCommunity?: boolean;
+    }>;
 
     type JoinRequestLiveCollection = Amity.LiveCollectionParams<QueryJoinRequest>;
 
@@ -274,7 +281,7 @@ declare global {
         callback: Amity.LiveCollectionCallback<Amity.Invitation>,
       ) => Amity.Unsubscriber;
       getInvitation: () => Promise<Amity.Invitation | undefined>;
-      join: () => Promise<void>;
+      join: () => Promise<Amity.JoinResult>;
       getJoinRequests: (
         params: QueryJoinRequest,
         callback: Amity.LiveCollectionCallback<Amity.JoinRequest>,

package/src/@types/domains/invitation.ts

@@ -33,6 +33,9 @@ declare global {
 
     type InvitationSortBy = InvitationSortByEnum;
 
+    type InvitationDomain<T extends Amity.InvitationTargetType = Amity.InvitationTargetType> =
+      T extends 'community' ? { communityId: string } : { communityId?: string };
+
     type RawInvitation = {
       _id: string;
       networkId: string;
@@ -50,7 +53,8 @@ declare global {
       inviterUserId: string;
       inviterUserInternalId: string;
       inviterUserPublicId: string;
-    } & Amity.Timestamps;
+    } & Amity.Timestamps &
+      Amity.InvitationDomain<Amity.InvitationTargetType>;
 
     type InternalInvitation = Omit<RawInvitation, 'createdBy'> & {
       createdById: string;

package/src/channelRepository/observers/getChannel.ts

@@ -297,7 +297,17 @@ export const getChannel = (
       ),
       convertEventPayload(onSubChannelCreated, 'channelId', 'channel'),
       convertEventPayload(onChannelUnreadInfoUpdatedLocal, 'channelId', 'channel'),
-      convertEventPayload(onChannelUnreadUpdatedLocal, 'channelId', 'channel'),
+      convertEventPayload(
+        (callback: Amity.Listener<Amity.ChannelUnread>) => {
+          const processPayload = (payloads: Amity.ChannelUnread[]) => {
+            payloads.forEach(callback);
+          };
+
+          return onChannelUnreadUpdatedLocal(processPayload);
+        },
+        'channelId',
+        'channel',
+      ),
     ],
     {
       forceDispatch: true,

package/src/channelRepository/observers/getChannels/ChannelLiveCollectionController.ts

@@ -572,7 +572,16 @@ export class ChannelLiveCollectionController extends LiveCollectionController<
         action: Amity.ChannelActionType.OnUpdate,
       },
       {
-        fn: convertEventPayload(onChannelUnreadUpdatedLocal, 'channelId', 'channel'),
+        fn: convertEventPayload(
+          (callback: Amity.Listener<Amity.ChannelUnread>) => {
+            const processPayload = (payloads: Amity.ChannelUnread[]) => {
+              payloads.forEach(callback);
+            };
+            return onChannelUnreadUpdatedLocal(processPayload);
+          },
+          'channelId',
+          'channel',
+        ),
         action: Amity.ChannelActionType.OnUpdate,
       },
     ];

package/src/channelRepository/observers/getTotalChannelsUnread.ts

@@ -82,7 +82,9 @@ export const getTotalChannelsUnread = (
     });
   };
 
-  const realtimeRouter = (userUnread: Amity.UserUnread) => {
+  const realtimeRouter = (_: Amity.ChannelUnread[]) => {
+    const { data: userUnread } = _getTotalChannelsUnread();
+
     if (isEqual(model, userUnread)) return;
 
     dispatcher({

package/src/channelRepository/utils/prepareChannelPayload.ts

@@ -7,6 +7,7 @@ import { getActiveClient } from '~/client/api/activeClient';
 import { pullFromCache } from '~/cache/api/pullFromCache';
 import { convertRawUserToInternalUser } from '~/userRepository/utils/convertRawUserToInternalUser';
 import { pushToCache } from '~/cache/api';
+import { fireEvent } from '~/core/events';
 
 export const MARKER_INCLUDED_CHANNEL_TYPE = ['broadcast', 'conversation', 'community'];
 export const isUnreadCountSupport = ({ type }: Pick<Amity.RawChannel, 'type'>) =>
@@ -56,6 +57,8 @@ const updateChannelUnread = ({
   channels: Amity.RawChannel[];
   channelUsers: Amity.RawMembership<'channel'>[];
 }) => {
+  const channelsUnread: Amity.ChannelUnread[] = [];
+
   for (let i = 0; i < channels.length; i += 1) {
     const cacheKey = ['channelUnread', 'get', channels[i].channelId];
     const channelUser = channelUsers.find(
@@ -84,9 +87,11 @@ const updateChannelUnread = ({
       isMentioned,
       isDeleted: channels[i].isDeleted || false,
     };
-
     pushToCache(cacheKey, cacheChannelUnread);
+
+    channelsUnread.push(cacheChannelUnread);
   }
+  fireEvent('local.channelUnread.updated', channelsUnread);
 };
 
 export const prepareChannelPayload = async (

package/src/client/utils/ReadReceiptSync/readReceiptSyncEngine.ts

@@ -167,7 +167,7 @@ export class MessageReadReceiptSyncEngine {
       channelUnread.unreadCount = Math.max(channelUnread.lastSegment - segment, 0);
 
       pushToCache(cacheKey, channelUnread);
-      fireEvent('local.channelUnread.updated', channelUnread);
+      fireEvent('local.channelUnread.updated', [channelUnread]);
     }
 
     // Step 2: Enqueue the read receipt

package/src/communityRepository/api/queryCommunities.ts

@@ -50,6 +50,7 @@ export const queryCommunities = async (
         ...restParams,
         isDeleted: inferIsDeleted(includeDeleted),
         filter: membership,
+        includeDiscoverablePrivateCommunity: params?.includeDiscoverablePrivateCommunity ?? true,
         options,
       },
     },

package/src/communityRepository/observers/getCommunities/CommunitiesPaginationController.ts

@@ -21,6 +21,7 @@ export class CommunitiesPaginationController extends PaginationController<
           ...params,
           isDeleted: inferIsDeleted(params.includeDeleted),
           filter: params.membership,
+          includeDiscoverablePrivateCommunity: params.includeDiscoverablePrivateCommunity ?? true,
           options,
         },
       },

package/src/communityRepository/observers/getRecommendedCommunities/RecommendedCommunitiesPaginationController.ts

@@ -14,7 +14,11 @@ export class RecommendedCommunitiesPaginationController extends PaginationContro
     queryParams: Amity.RecommendedCommunityLiveCollection,
     token: string | undefined,
   ) {
-    const { limit = COLLECTION_DEFAULT_PAGINATION_LIMIT, ...params } = queryParams;
+    const {
+      limit = COLLECTION_DEFAULT_PAGINATION_LIMIT,
+      includeDiscoverablePrivateCommunity,
+      ...params
+    } = queryParams;
     const options = token ? { token } : { limit };
 
     const { data: queryResponse } = await this.http.get<Amity.CommunityPayload & Amity.Pagination>(
@@ -23,6 +27,7 @@ export class RecommendedCommunitiesPaginationController extends PaginationContro
         params: {
           ...params,
           options,
+          includeDiscoverablePrivateCommunity: includeDiscoverablePrivateCommunity ?? true,
         },
       },
     );

package/src/communityRepository/observers/getTrendingCommunities/TrendingCommunitiesPaginationController.ts

@@ -11,7 +11,11 @@ export class TrendingCommunitiesPaginationController extends PaginationControlle
   Amity.TrendingCommunityLiveCollection
 > {
   async getRequest(queryParams: Amity.TrendingCommunityLiveCollection, token: string | undefined) {
-    const { limit = COLLECTION_DEFAULT_PAGINATION_LIMIT, ...params } = queryParams;
+    const {
+      limit = COLLECTION_DEFAULT_PAGINATION_LIMIT,
+      includeDiscoverablePrivateCommunity,
+      ...params
+    } = queryParams;
     const options = token ? { token } : { limit };
 
     const { data: queryResponse } = await this.http.get<Amity.CommunityPayload & Amity.Pagination>(
@@ -20,6 +24,7 @@ export class TrendingCommunitiesPaginationController extends PaginationControlle
         params: {
           ...params,
           options,
+          includeDiscoverablePrivateCommunity: includeDiscoverablePrivateCommunity ?? true,
         },
       },
     );

package/src/communityRepository/observers/semanticSearch/SemanticSearchCommunityPaginationController.ts

@@ -29,6 +29,7 @@ export class SemanticSearchCommunityPaginationController extends PaginationContr
         ...params,
         filter: communityMembershipStatus ?? AmityCommunityMemberStatusFilter.ALL,
         options,
+        includeDiscoverablePrivateCommunity: params.includeDiscoverablePrivateCommunity ?? true,
       },
     });
     return queryResponse;

package/src/invitationRepository/observers/getMyInvitations/MyInvitationsPaginationController.ts

@@ -15,7 +15,7 @@ export class MyInvitationsPaginationController extends PaginationController<
       { params: { ...params, options } },
     );
 
-    await getCommunityByIds(data.invitations.map(invitation => invitation.targetId));
+    await getCommunityByIds(data.invitations.map(invitation => invitation.communityId));
 
     return data;
   }

package/src/messageRepository/events/onMessageCreated.ts

@@ -80,7 +80,7 @@ export const onMessageCreatedMqtt = (
         };
 
         pushToCache(['channelUnread', 'get', message.channelId], updatedChannelUnread);
-        fireEvent('local.channelUnread.updated', updatedChannelUnread);
+        fireEvent('local.channelUnread.updated', [updatedChannelUnread]);
       });
     }
 

package/src/utils/linkedObject/communityLinkedObject.ts

@@ -35,9 +35,8 @@ export const communityLinkedObject = (community: Amity.InternalCommunity): Amity
       const { data } = await getInvitation('community', community.communityId);
       return data;
     },
-    join: async () => {
-      await joinRequest(community.communityId);
-    },
+    join: async () => joinRequest(community.communityId),
+
     getJoinRequests: (
       params: Omit<Amity.QueryJoinRequest, 'communityId'>,
       callback: Amity.LiveCollectionCallback<Amity.JoinRequest>,