@amityco/ts-sdk 7.5.2-3bdced6.0 → 7.5.2-4215b84.0

package/dist/postRepository/api/getPost.d.ts

@@ -13,7 +13,7 @@
  * @async
  */
 export declare const getPost: {
-    (postId: Amity.Post['postId']): Promise<Amity.Cached<Amity.Post>>;
+    (postId: Amity.Post['postId']): Promise<Amity.Cached<Amity.InternalPost>>;
     /**
      * ```js
      * import { getPost } from '@amityco/ts-sdk'
@@ -27,6 +27,6 @@ export declare const getPost: {
      *
      * @category Post API
      */
-    locally(postId: Amity.Post['postId']): Amity.Cached<Amity.Post> | undefined;
+    locally(postId: Amity.Post['postId']): Amity.Cached<Amity.InternalPost> | undefined;
 };
 //# sourceMappingURL=getPost.d.ts.map

package/dist/postRepository/api/getPost.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getPost.d.ts","sourceRoot":"","sources":["../../../src/postRepository/api/getPost.ts"],"names":[],"mappings":"AAUA;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,OAAO;aAAkB,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,QAAQ,MAAM,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC;IAqC9F;;;;;;;;;;;;OAYG;oBACwB,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,MAAM,MAAM,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS;CAfrF,CAAC"}
+{"version":3,"file":"getPost.d.ts","sourceRoot":"","sources":["../../../src/postRepository/api/getPost.ts"],"names":[],"mappings":"AAUA;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,OAAO;aACV,MAAM,IAAI,CAAC,QAAQ,CAAC,GAC3B,QAAQ,MAAM,MAAM,CAAC,MAAM,YAAY,CAAC,CAAC;IAqC5C;;;;;;;;;;;;OAYG;oBACwB,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,MAAM,MAAM,CAAC,MAAM,YAAY,CAAC,GAAG,SAAS;CAf7F,CAAC"}

package/dist/userRepository/observers/getBlockedUsers.d.ts

@@ -4,14 +4,14 @@
  * const unblockedUser = await UserRepository.blockUser('userId')
  * ```
  *
- * Blocks a {@link Amity.InternalUser}
+ * Blocks a {@link Amity.User}
  *
- * @param params The params to get blocked {@link Amity.InternalUser}s
- * @param callback to recieve updates on unblocked {@link Amity.InternalUser}s
+ * @param params The params to get blocked {@link Amity.User}s
+ * @param callback to recieve updates on unblocked {@link Amity.User}s
  * @returns {@link Amity.Unsubscriber} to unsubscribe from collection
  *
  * @category Post API
  * @async
  */
-export declare const getBlockedUsers: (params: Amity.BlockedUsersLiveCollection, callback: Amity.LiveCollectionCallback<Amity.InternalUser>, config?: Amity.LiveCollectionConfig) => Amity.Unsubscriber;
+export declare const getBlockedUsers: (params: Amity.BlockedUsersLiveCollection, callback: Amity.LiveCollectionCallback<Amity.User>, config?: Amity.LiveCollectionConfig) => Amity.Unsubscriber;
 //# sourceMappingURL=getBlockedUsers.d.ts.map

package/dist/userRepository/observers/getBlockedUsers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getBlockedUsers.d.ts","sourceRoot":"","sources":["../../../src/userRepository/observers/getBlockedUsers.ts"],"names":[],"mappings":"AAQA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,eAAe,WAClB,MAAM,0BAA0B,YAC9B,MAAM,sBAAsB,CAAC,MAAM,YAAY,CAAC,WACjD,MAAM,oBAAoB,KAClC,MAAM,YAsBR,CAAC"}
+{"version":3,"file":"getBlockedUsers.d.ts","sourceRoot":"","sources":["../../../src/userRepository/observers/getBlockedUsers.ts"],"names":[],"mappings":"AAQA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,eAAe,WAClB,MAAM,0BAA0B,YAC9B,MAAM,sBAAsB,CAAC,MAAM,IAAI,CAAC,WACzC,MAAM,oBAAoB,KAClC,MAAM,YAsBR,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amityco/ts-sdk",
-  "version": "7.5.2-3bdced6.0",
+  "version": "7.5.2-4215b84.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/domains/post.ts

@@ -40,15 +40,32 @@ declare global {
       hasFlaggedChildren: false;
       hasFlaggedComment: false;
       editedAt: Amity.timestamp;
+      // Amity.Metadata
+      metadata?: Record<string, any>;
+      // Amity.Flaggable
+      flagCount: number;
+      hashFlag: {
+        bits: number;
+        hashes: number;
+        hash: string;
+      } | null;
+      // Amity.Taggable
+      tags?: string[];
+      // Amity.Timestamps
+      createdAt: Amity.timestamp;
+      updatedAt?: Amity.timestamp;
+      // Amity.SoftDelete
+      isDeleted?: boolean;
+      // Amity.Subscribable
+      path: string;
+      // Amity.AnalyticPostData
+      impression: number;
+      reach: number;
+      // Amity.Reactable
+      reactionsCount: number;
+      reactions: Record<string, number>;
+      myReactions?: string[];
     } & Amity.Content<T> &
-      Amity.Metadata &
-      Amity.Flaggable &
-      Amity.Reactable &
-      Amity.Taggable &
-      Amity.Timestamps &
-      Amity.SoftDelete &
-      Amity.Subscribable &
-      Amity.AnalyticPostData &
       Amity.Mentionable<'user'>;
 
     type InternalPost<T extends PostContentType = any> = RawPost<T> & {

package/src/commentRepository/api/createComment.ts

@@ -51,7 +51,7 @@ export const createComment = async (
   if (client.cache) ingestInCache(data, { cachedAt });
 
   if (['post', 'content'].includes(bundle.referenceType)) {
-    const post = pullFromCache<Amity.Post>(['post', 'get', bundle.referenceId])?.data;
+    const post = pullFromCache<Amity.InternalPost>(['post', 'get', bundle.referenceId])?.data;
 
     if (post) {
       post.commentsCount += 1;

package/src/commentRepository/api/deleteComment.ts

@@ -62,7 +62,7 @@ export const deleteComment = async (
       users: [],
     });
   } else {
-    const post = pullFromCache<Amity.Post>(['post', 'get', comment.data.referenceId])?.data;
+    const post = pullFromCache<Amity.InternalPost>(['post', 'get', comment.data.referenceId])?.data;
 
     if (post) {
       let removeCount: number;

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,
+      },
     ]);
   }
 

package/src/postRepository/api/getPost.ts

@@ -22,7 +22,9 @@ import { LinkedObject } from '~/utils/linkedObject';
  * @category Post API
  * @async
  */
-export const getPost = async (postId: Amity.Post['postId']): Promise<Amity.Cached<Amity.Post>> => {
+export const getPost = async (
+  postId: Amity.Post['postId'],
+): Promise<Amity.Cached<Amity.InternalPost>> => {
   const client = getActiveClient();
   client.log('post/getPost', postId);
 
@@ -54,7 +56,7 @@ export const getPost = async (postId: Amity.Post['postId']): Promise<Amity.Cache
   const result = posts.find(post => post.postId === postId)!;
 
   return {
-    data: LinkedObject.post(result),
+    data: result,
     cachedAt,
   };
 };
@@ -72,7 +74,7 @@ export const getPost = async (postId: Amity.Post['postId']): Promise<Amity.Cache
  *
  * @category Post API
  */
-getPost.locally = (postId: Amity.Post['postId']): Amity.Cached<Amity.Post> | undefined => {
+getPost.locally = (postId: Amity.Post['postId']): Amity.Cached<Amity.InternalPost> | undefined => {
   const client = getActiveClient();
   client.log('post/getPost.locally', postId);
 
@@ -83,7 +85,7 @@ getPost.locally = (postId: Amity.Post['postId']): Amity.Cached<Amity.Post> | und
   if (!cached) return;
 
   return {
-    data: LinkedObject.post(cached.data),
+    data: cached.data,
     cachedAt: cached.cachedAt,
   };
 };

package/src/postRepository/observers/getPost.ts

@@ -85,12 +85,12 @@ export const getPost = (
     onPostFlagged,
     (callback: Amity.Listener<Amity.InternalPost>) => {
       return onPostReactionAdded((post: Amity.InternalPost) => {
-        callback(LinkedObject.post(post));
+        callback(post);
       });
     },
     (callback: Amity.Listener<Amity.InternalPost>) => {
       return onPostReactionRemoved((post: Amity.InternalPost) => {
-        callback(LinkedObject.post(post));
+        callback(post);
       });
     },
     onPostUnflagged,

package/src/userRepository/observers/getBlockedUsers.ts

@@ -12,10 +12,10 @@ import { BlockedUserLiveCollectionController } from './getBlockedUsers/BlockedUs
  * const unblockedUser = await UserRepository.blockUser('userId')
  * ```
  *
- * Blocks a {@link Amity.InternalUser}
+ * Blocks a {@link Amity.User}
  *
- * @param params The params to get blocked {@link Amity.InternalUser}s
- * @param callback to recieve updates on unblocked {@link Amity.InternalUser}s
+ * @param params The params to get blocked {@link Amity.User}s
+ * @param callback to recieve updates on unblocked {@link Amity.User}s
  * @returns {@link Amity.Unsubscriber} to unsubscribe from collection
  *
  * @category Post API
@@ -23,7 +23,7 @@ import { BlockedUserLiveCollectionController } from './getBlockedUsers/BlockedUs
  */
 export const getBlockedUsers = (
   params: Amity.BlockedUsersLiveCollection,
-  callback: Amity.LiveCollectionCallback<Amity.InternalUser>,
+  callback: Amity.LiveCollectionCallback<Amity.User>,
   config?: Amity.LiveCollectionConfig,
 ): Amity.Unsubscriber => {
   const { log, cache } = getActiveClient();

package/src/utils/linkedObject/streamLinkedObject.ts

@@ -9,7 +9,7 @@ export const streamLinkedObject = (stream: Amity.InternalStream): Amity.Stream =
     },
     get post() {
       if (stream.referenceType !== 'post') return;
-      return pullFromCache<Amity.Post>(['post', 'get', stream.referenceId])?.data;
+      return pullFromCache<Amity.InternalPost>(['post', 'get', stream.referenceId])?.data;
     },
     get community() {
       if (stream.targetType !== 'community') return;