@amityco/ts-sdk 7.5.2-aad2dac.0 → 7.5.3-5f273be.0

package/dist/utils/tests/dummy/comment.d.ts

@@ -18,7 +18,7 @@ export declare const generateComment: (params?: Partial<Amity.InternalComment>)
     editedAt: string;
     attachments?: Amity.Attachment[] | undefined;
     targetId: string;
-    targetType: "community" | "user" | "content";
+    targetType: "user" | "community" | "content";
     referenceId: string;
     referenceType: Amity.CommentReferenceType;
     dataType?: any;

package/dist/utils/tests/dummy/post.d.ts

@@ -28,21 +28,21 @@ export declare const emptyPostPayload: {
     files: never[];
 };
 export declare const postQueryResponse: {
-    data: Omit<Amity.PostPayload<any>, "communityUsers" | "communities" | "posts"> & {
+    data: Omit<Amity.PostPayload<any>, "communities" | "communityUsers" | "posts"> & {
         posts: Amity.InternalPost<any>[];
         communities: Amity.InternalCommunity[];
         communityUsers: Amity.Membership<"community">[];
     } & Amity.Pagination;
 };
 export declare const postQueryResponse2: {
-    data: Omit<Amity.PostPayload<any>, "communityUsers" | "communities" | "posts"> & {
+    data: Omit<Amity.PostPayload<any>, "communities" | "communityUsers" | "posts"> & {
         posts: Amity.InternalPost<any>[];
         communities: Amity.InternalCommunity[];
         communityUsers: Amity.Membership<"community">[];
     } & Amity.Pagination;
 };
 export declare const postQueryResponsePage2: {
-    data: Omit<Amity.PostPayload<any>, "communityUsers" | "communities" | "posts"> & {
+    data: Omit<Amity.PostPayload<any>, "communities" | "communityUsers" | "posts"> & {
         posts: Amity.InternalPost<any>[];
         communities: Amity.InternalCommunity[];
         communityUsers: Amity.Membership<"community">[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amityco/ts-sdk",
-  "version": "7.5.2-aad2dac.0",
+  "version": "7.5.3-5f273be.0",
   "license": "CC-BY-ND-4.0",
   "author": "amity.co <developers@amity.co> (https://amity.co)",
   "description": "Amity Social Cloud Typescript SDK",

package/src/communityRepository/communityMembership/observers/getMembers/enums.ts

@@ -10,4 +10,5 @@ export enum EnumCommunityMemberActions {
   OnCommunityUserAdded = 'OnCommunityUserAdded',
   onCommunityUserRemoved = 'onCommunityUserRemoved',
   OnUserDeleted = 'OnUserDeleted',
+  OnLocalCommunityJoin = 'OnLocalCommunityJoin',
 }

package/src/communityRepository/communityMembership/observers/searchMembers/enums.ts

@@ -1,5 +1,6 @@
 export enum EnumCommunityMemberActions {
   OnCommunityJoined = 'onCommunityJoined',
+  OnLocalCommunityJoin = 'onLocalCommunityJoin',
   OnCommunityLeft = 'onCommunityLeft',
   OnCommunityUserBanned = 'onCommunityUserBanned',
   OnCommunityUserChanged = 'onCommunityUserChanged',

package/src/communityRepository/joinRequest/internalAPI/cancelJoinRequest.ts

@@ -1,6 +1,7 @@
 import { fireEvent } from '~/core/events';
-import { dropFromCache, pullFromCache } from '~/cache/api';
+import { pullFromCache, upsertInCache } from '~/cache/api';
 import { getActiveClient } from '~/client/api/activeClient';
+import { JoinRequestStatusEnum } from '~/@types';
 
 /* begin_public_function
   id: joinRequest.cancel
@@ -36,7 +37,9 @@ export const cancelJoinRequest = async (
   ])?.data;
 
   if (joinRequestCache) {
-    dropFromCache(['joinRequest', 'get', joinRequest.joinRequestId]);
+    upsertInCache(['joinRequest', 'get', joinRequest.joinRequestId], {
+      status: JoinRequestStatusEnum.Cancelled,
+    });
 
     fireEvent('local.joinRequest.deleted', [joinRequestCache]);
   }

package/src/communityRepository/observers/getJoinRequestList/JoinRequestListLiveCollectionController.ts

@@ -13,6 +13,7 @@ import {
   onJoinRequestDeleted,
   onJoinRequestUpdated,
 } from '~/communityRepository/joinRequest/events/';
+import { onLocalCommunityJoin } from '~/communityRepository/communityMembership';
 
 export class JoinRequestListLiveCollectionController extends LiveCollectionController<
   'joinRequest',
@@ -75,7 +76,11 @@ export class JoinRequestListLiveCollectionController extends LiveCollectionContr
     return this.queryStreamController.subscribeRTE([
       { fn: onJoinRequestCreated, action: EnumJoinRequestAction.OnLocalJoinRequestCreated },
       { fn: onJoinRequestUpdated, action: EnumJoinRequestAction.OnLocalJoinRequestUpdated },
-      { fn: onJoinRequestDeleted, action: EnumJoinRequestAction.OnLocalJoinRequestDeleted },
+      { fn: onJoinRequestDeleted, action: EnumJoinRequestAction.OnLocalJoinRequestUpdated },
+      {
+        fn: onLocalCommunityJoin,
+        action: EnumJoinRequestAction.OnLocalJoinRequestUpdated,
+      },
     ]);
   }
 

package/src/communityRepository/observers/getJoinRequestList/JoinRequestListQueryStreamController.ts

@@ -72,28 +72,30 @@ export class JoinRequestListQueryStreamController extends QueryStreamController<
   }
 
   reactor(action: EnumJoinRequestAction) {
-    return (joinRequest: Amity.InternalJoinRequest[]) => {
+    return (joinRequest: Amity.InternalJoinRequest[] | Amity.InternalJoinRequest) => {
       const collection = pullFromCache<Amity.JoinRequestListLiveCollectionCache>(
         this.cacheKey,
       )?.data;
       if (!collection) return;
 
+      const isArrayJoinRequest = Array.isArray(joinRequest);
+
+      const joinRequestIds = (isArrayJoinRequest ? joinRequest : [joinRequest]).map(
+        jr => jr.joinRequestId,
+      );
+
       if (action === EnumJoinRequestAction.OnLocalJoinRequestUpdated) {
-        const isExist = collection.data.find(id => id === joinRequest[0].joinRequestId);
+        const isExist = collection.data.find(id => joinRequestIds.includes(id));
+
         if (!isExist) return;
       }
 
       if (action === EnumJoinRequestAction.OnLocalJoinRequestCreated) {
-        collection.data = [
-          ...new Set([
-            ...joinRequest.map(joinRequest => joinRequest.joinRequestId),
-            ...collection.data,
-          ]),
-        ];
+        collection.data = [...new Set([...joinRequestIds, ...collection.data])];
       }
 
       if (action === EnumJoinRequestAction.OnLocalJoinRequestDeleted) {
-        collection.data = collection.data.filter(id => id !== joinRequest[0].joinRequestId);
+        collection.data = collection.data.filter(id => !joinRequestIds.includes(id));
       }
 
       pushToCache(this.cacheKey, collection);
@@ -103,7 +105,9 @@ export class JoinRequestListQueryStreamController extends QueryStreamController<
 
   subscribeRTE(
     createSubscriber: {
-      fn: (reactor: Amity.Listener<Amity.InternalJoinRequest[]>) => Amity.Unsubscriber;
+      fn: (
+        reactor: Amity.Listener<Amity.InternalJoinRequest[] | Amity.InternalJoinRequest>,
+      ) => Amity.Unsubscriber;
       action: EnumJoinRequestAction;
     }[],
   ) {

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

@@ -13,9 +13,11 @@ import {
   onLocalCommunityJoined,
   onLocalCommunityLeft,
   onCommunityUserChanged,
+  onLocalCommunityJoin,
 } from '~/communityRepository/communityMembership';
 import { isNonNullable } from '~/utils';
 import { communityLinkedObject } from '~/utils/linkedObject/communityLinkedObject';
+import { convertEventPayload } from '~/utils/event';
 
 export class RecommendedCommunityLiveCollectionController extends LiveCollectionController<
   'community',
@@ -82,6 +84,10 @@ export class RecommendedCommunityLiveCollectionController extends LiveCollection
       { fn: onCommunityUserChanged, action: EnumCommunityMemberActions.OnMemberCountChanged },
       { fn: onLocalCommunityJoined, action: EnumCommunityMemberActions.OnCommunityJoined },
       { fn: onLocalCommunityLeft, action: EnumCommunityMemberActions.OnCommunityLeft },
+      {
+        fn: convertEventPayload(onLocalCommunityJoin, 'targetId', 'community'),
+        action: EnumCommunityActions.OnCommunityUpdated,
+      },
     ]);
   }
 

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

@@ -1,4 +1,5 @@
 export enum EnumCommunityActions {
   OnCommunityDeleted = 'onCommunityDeleted',
   OnCommunityUpdated = 'onCommunityUpdated',
+  OnLocalCommunityJoin = 'onLocalCommunityJoin',
 }

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

@@ -13,9 +13,12 @@ import {
   onLocalCommunityJoined,
   onLocalCommunityLeft,
   onCommunityUserChanged,
+  onLocalCommunityJoin,
 } from '~/communityRepository/communityMembership';
+
 import { isNonNullable } from '~/utils';
 import { communityLinkedObject } from '~/utils/linkedObject/communityLinkedObject';
+import { convertEventPayload } from '~/utils/event';
 
 export class TrendingCommunityLiveCollectionController extends LiveCollectionController<
   'community',
@@ -82,6 +85,10 @@ export class TrendingCommunityLiveCollectionController extends LiveCollectionCon
       { fn: onCommunityUserChanged, action: EnumCommunityMemberActions.OnMemberCountChanged },
       { fn: onLocalCommunityJoined, action: EnumCommunityMemberActions.OnCommunityJoined },
       { fn: onLocalCommunityLeft, action: EnumCommunityMemberActions.OnCommunityLeft },
+      {
+        fn: convertEventPayload(onLocalCommunityJoin, 'targetId', 'community'),
+        action: EnumCommunityActions.OnCommunityUpdated,
+      },
     ]);
   }
 

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

@@ -15,8 +15,10 @@ import {
   onCommunityLeft,
   onLocalCommunityLeft,
   onCommunityUserChanged,
+  onLocalCommunityJoin,
 } from '~/communityRepository/communityMembership';
 import { isNonNullable } from '~/utils';
+import { convertEventPayload } from '~/utils/event';
 
 export class SearchCommunityLiveCollectionController extends LiveCollectionController<
   'community',
@@ -81,6 +83,10 @@ export class SearchCommunityLiveCollectionController extends LiveCollectionContr
       { fn: onCommunityUserChanged, action: EnumCommunityMemberActions.OnMemberCountChanged },
       { fn: onLocalCommunityJoined, action: EnumCommunityMemberActions.OnCommunityJoined },
       { fn: onLocalCommunityLeft, action: EnumCommunityMemberActions.OnCommunityLeft },
+      {
+        fn: convertEventPayload(onLocalCommunityJoin, 'targetId', 'community'),
+        action: EnumCommunityActions.OnCommunityUpdated,
+      },
     ]);
   }
 

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

@@ -15,6 +15,7 @@ import {
   onLocalCommunityJoined,
   onLocalCommunityLeft,
   onCommunityUserChanged,
+  onLocalCommunityJoin,
 } from '~/communityRepository/communityMembership';
 
 import { isNonNullable } from '~/utils';
@@ -24,6 +25,7 @@ import { prepareSemanticSearchCommunityPayload } from '~/communityRepository/uti
 import { getActiveClient } from '~/client';
 import { EnumCommunityMemberActions } from '~/communityRepository/communityMembership/observers/getMembers/enums';
 import { filterByCommunityMembership } from '~/core/query';
+import { convertEventPayload } from '~/utils/event';
 
 export class SemanticSearchCommunityLiveCollectionController extends LiveCollectionController<
   'semanticSearchCommunity',
@@ -94,6 +96,10 @@ export class SemanticSearchCommunityLiveCollectionController extends LiveCollect
       { fn: onCommunityUserChanged, action: EnumCommunityMemberActions.OnMemberCountChanged },
       { fn: onLocalCommunityJoined, action: EnumCommunityMemberActions.OnCommunityJoined },
       { fn: onLocalCommunityLeft, action: EnumCommunityMemberActions.OnCommunityLeft },
+      {
+        fn: convertEventPayload(onLocalCommunityJoin, 'targetId', 'community'),
+        action: EnumCommunityActions.OnCommunityUpdated,
+      },
     ]);
   }