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

package/src/communityRepository/communityMembership/events/onUserDeleted.ts

@@ -22,9 +22,7 @@ import { getResolver } from '~/core/model';
  */
 export const onUserDeleted =
   (communityId: string) =>
-  (
-    callback: (community: Amity.InternalCommunity, member: Amity.Membership<'community'>[]) => void,
-  ) => {
+  (callback: (community: Amity.Community, member: Amity.Membership<'community'>[]) => void) => {
     const client = getActiveClient();
 
     const filter = (payload: Amity.UserPayload) => {

package/src/communityRepository/communityMembership/events/utils.ts

@@ -53,7 +53,7 @@ function getEventRelatedMember(
 
 export const createCommunityMemberEventSubscriber = (
   event: keyof Amity.MqttCommunityUserEvents,
-  callback: (community: Amity.InternalCommunity, members: Amity.Membership<'community'>[]) => void,
+  callback: (community: Amity.Community, members: Amity.Membership<'community'>[]) => void,
 ) => {
   const client = getActiveClient();
 
@@ -102,7 +102,7 @@ export const createCommunityMemberEventSubscriber = (
 
 export const createLocalCommunityMemberEventSubscriber = (
   event: keyof Amity.LocalCommunityEvents,
-  callback: (community: Amity.InternalCommunity, members: Amity.Membership<'community'>[]) => void,
+  callback: (community: Amity.Community, members: Amity.Membership<'community'>[]) => void,
 ) => {
   const client = getActiveClient();
 

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

@@ -70,10 +70,7 @@ export class CommunityMembersQueryStreamController extends QueryStreamController
   }
 
   reactor(action: EnumCommunityMemberActions) {
-    return (
-      community: Amity.InternalCommunity,
-      communityMembers: Amity.Membership<'community'>[],
-    ) => {
+    return (community: Amity.Community, communityMembers: Amity.Membership<'community'>[]) => {
       const collection = pullFromCache<Amity.CommunityMemberLiveCollectionCache>(
         this.cacheKey,
       )?.data;
@@ -100,10 +97,7 @@ export class CommunityMembersQueryStreamController extends QueryStreamController
   subscribeRTE(
     createSubscriber: {
       fn: (
-        reactor: (
-          channel: Amity.InternalCommunity,
-          communityUser: Amity.Membership<'community'>[],
-        ) => void,
+        reactor: (channel: Amity.Community, communityUser: Amity.Membership<'community'>[]) => void,
       ) => Amity.Unsubscriber;
       action: EnumCommunityMemberActions;
     }[],

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

@@ -70,10 +70,7 @@ export class SearchCommunityMembersQueryStreamController extends QueryStreamCont
   }
 
   reactor(action: EnumCommunityMemberActions) {
-    return (
-      community: Amity.InternalCommunity,
-      communityMembers: Amity.Membership<'community'>[],
-    ) => {
+    return (community: Amity.Community, communityMembers: Amity.Membership<'community'>[]) => {
       const collection = pullFromCache<Amity.SearchCommunityMemberLiveCollectionCache>(
         this.cacheKey,
       )?.data;
@@ -98,10 +95,7 @@ export class SearchCommunityMembersQueryStreamController extends QueryStreamCont
   subscribeRTE(
     createSubscriber: {
       fn: (
-        reactor: (
-          channel: Amity.InternalCommunity,
-          communityUser: Amity.Membership<'community'>[],
-        ) => void,
+        reactor: (channel: Amity.Community, communityUser: Amity.Membership<'community'>[]) => void,
       ) => Amity.Unsubscriber;
       action: EnumCommunityMemberActions;
     }[],

package/src/communityRepository/communityModeration/events/onLocalCommunityRoleAdded.ts

@@ -17,7 +17,7 @@ import { createEventSubscriber } from '~/core/events';
  * @category Community Events
  */
 export const onLocalCommunityRoleAdded = (
-  callback: (community: Amity.InternalCommunity, member: Amity.Membership<'community'>[]) => void,
+  callback: (community: Amity.Community, member: Amity.Membership<'community'>[]) => void,
 ): Amity.Unsubscriber => {
   const client = getActiveClient();
 

package/src/communityRepository/communityModeration/events/onLocalCommunityRoleRemoved.ts

@@ -17,7 +17,7 @@ import { createEventSubscriber } from '~/core/events';
  * @category Community Events
  */
 export const onLocalCommunityRoleRemoved = (
-  callback: (community: Amity.InternalCommunity, member: Amity.Membership<'community'>[]) => void,
+  callback: (community: Amity.Community, member: Amity.Membership<'community'>[]) => void,
 ): Amity.Unsubscriber => {
   const client = getActiveClient();
 

package/src/communityRepository/events/onCommunityCreated.ts

@@ -15,5 +15,5 @@ import { createCommunityEventSubscriber } from './utils';
  *
  * @category Community Events
  */
-export const onCommunityCreated = (callback: Amity.Listener<Amity.InternalCommunity>) =>
+export const onCommunityCreated = (callback: Amity.Listener<Amity.Community>) =>
   createCommunityEventSubscriber('community.created', callback);

package/src/communityRepository/events/onCommunityDeleted.ts

@@ -15,5 +15,5 @@ import { createCommunityEventSubscriber } from './utils';
  *
  * @category Community Events
  */
-export const onCommunityDeleted = (callback: Amity.Listener<Amity.InternalCommunity>) =>
+export const onCommunityDeleted = (callback: Amity.Listener<Amity.Community>) =>
   createCommunityEventSubscriber('community.deleted', callback);

package/src/communityRepository/events/onCommunityUpdated.ts

@@ -15,5 +15,5 @@ import { createCommunityEventSubscriber } from './utils';
  *
  * @category Community Events
  */
-export const onCommunityUpdated = (callback: Amity.Listener<Amity.InternalCommunity>) =>
+export const onCommunityUpdated = (callback: Amity.Listener<Amity.Community>) =>
   createCommunityEventSubscriber('community.updated', callback);

package/src/communityRepository/events/utils.ts

@@ -7,7 +7,7 @@ import { prepareCommunityPayload } from '../utils';
 
 export const createCommunityEventSubscriber = (
   event: keyof Amity.MqttCommunityEvents,
-  callback: Amity.Listener<Amity.InternalCommunity>,
+  callback: Amity.Listener<Amity.Community>,
 ) => {
   const client = getActiveClient();
 

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

@@ -25,10 +25,8 @@ import {
   onLocalCommunityJoined,
   onLocalCommunityLeft,
   onCommunityUserChanged,
-  onLocalCommunityJoin,
 } from '~/communityRepository/communityMembership';
 import { isNonNullable } from '~/utils';
-import { convertEventPayload } from '~/utils/event';
 
 export class CommunityLiveCollectionController extends LiveCollectionController<
   'community',
@@ -94,10 +92,6 @@ export class CommunityLiveCollectionController extends LiveCollectionController<
       { 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/getCommunities/CommunitiesPaginationController.ts

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

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

@@ -60,7 +60,7 @@ export class CommunitiesQueryStreamController extends QueryStreamController<
   }
 
   reactor(action: EnumCommunityActions | EnumCommunityMemberActions) {
-    return (community: Amity.InternalCommunity) => {
+    return (community: Amity.Community) => {
       const collection = pullFromCache<Amity.CommunityLiveCollectionCache>(this.cacheKey)?.data;
       if (!collection) return;
 
@@ -76,7 +76,7 @@ export class CommunitiesQueryStreamController extends QueryStreamController<
 
   subscribeRTE(
     createSubscriber: {
-      fn: (reactor: (channel: Amity.InternalCommunity) => void) => Amity.Unsubscriber;
+      fn: (reactor: (channel: Amity.Community) => void) => Amity.Unsubscriber;
       action: EnumCommunityActions | EnumCommunityMemberActions;
     }[],
   ) {

package/src/communityRepository/observers/getCommunity.ts

@@ -9,9 +9,7 @@ import {
   onCommunityLeft,
   onLocalCommunityJoined,
   onLocalCommunityLeft,
-  onLocalCommunityJoin,
 } from '../communityMembership/events';
-import { convertEventPayload } from '~/utils/event';
 
 /* begin_public_function
   id: community.get
@@ -49,7 +47,6 @@ export const getCommunity = (
     onCommunityUserBanned,
     onCommunityUserUnbanned,
     onCommunityUserChanged,
-    convertEventPayload(onLocalCommunityJoin, 'targetId', 'community'),
   ]);
 };
 /* end_public_function */

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

@@ -15,7 +15,6 @@ import {
   onCommunityUserChanged,
 } from '~/communityRepository/communityMembership';
 import { isNonNullable } from '~/utils';
-import { communityLinkedObject } from '~/utils/linkedObject/communityLinkedObject';
 
 export class RecommendedCommunityLiveCollectionController extends LiveCollectionController<
   'community',
@@ -95,7 +94,7 @@ export class RecommendedCommunityLiveCollectionController extends LiveCollection
       collection.data
         .map(id => pullFromCache<Amity.Community>(['community', 'get', id]))
         .filter(isNonNullable)
-        .map(({ data }) => communityLinkedObject(data)) ?? [];
+        .map(({ data }) => data) ?? [];
 
     if (!this.shouldNotify(data) && origin === 'event') return;
 

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

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

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

@@ -66,7 +66,7 @@ export class RecommendedCommunitiesQueryStreamController extends QueryStreamCont
   }
 
   reactor(action: EnumCommunityActions | EnumCommunityMemberActions) {
-    return (community: Amity.InternalCommunity) => {
+    return (community: Amity.Community) => {
       const collection = pullFromCache<Amity.RecommendedCommunityLiveCollectionCache>(
         this.cacheKey,
       )?.data;
@@ -79,7 +79,7 @@ export class RecommendedCommunitiesQueryStreamController extends QueryStreamCont
 
   subscribeRTE(
     createSubscriber: {
-      fn: (reactor: (channel: Amity.InternalCommunity) => void) => Amity.Unsubscriber;
+      fn: (reactor: (channel: Amity.Community) => void) => Amity.Unsubscriber;
       action: EnumCommunityActions | EnumCommunityMemberActions;
     }[],
   ) {

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

@@ -15,7 +15,6 @@ import {
   onCommunityUserChanged,
 } from '~/communityRepository/communityMembership';
 import { isNonNullable } from '~/utils';
-import { communityLinkedObject } from '~/utils/linkedObject/communityLinkedObject';
 
 export class TrendingCommunityLiveCollectionController extends LiveCollectionController<
   'community',
@@ -95,7 +94,7 @@ export class TrendingCommunityLiveCollectionController extends LiveCollectionCon
       collection.data
         .map(id => pullFromCache<Amity.Community>(['community', 'get', id]))
         .filter(isNonNullable)
-        .map(({ data }) => communityLinkedObject(data)) ?? [];
+        .map(({ data }) => data) ?? [];
 
     if (!this.shouldNotify(data) && origin === 'event') return;
 

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

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

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

@@ -64,7 +64,7 @@ export class TrendingCommunitiesQueryStreamController extends QueryStreamControl
   }
 
   reactor(action: EnumCommunityActions | EnumCommunityMemberActions) {
-    return (community: Amity.InternalCommunity) => {
+    return (community: Amity.Community) => {
       const collection = pullFromCache<Amity.TrendingCommunityLiveCollectionCache>(
         this.cacheKey,
       )?.data;
@@ -77,7 +77,7 @@ export class TrendingCommunitiesQueryStreamController extends QueryStreamControl
 
   subscribeRTE(
     createSubscriber: {
-      fn: (reactor: (channel: Amity.InternalCommunity) => void) => Amity.Unsubscriber;
+      fn: (reactor: (channel: Amity.Community) => void) => Amity.Unsubscriber;
       action: EnumCommunityActions | EnumCommunityMemberActions;
     }[],
   ) {

package/src/communityRepository/observers/index.ts

@@ -5,4 +5,3 @@ export * from './getTrendingCommunities';
 export * from './getRecommendedCommunities';
 
 export * from './semanticSearchCommunities';
-export * from './getJoinRequestList';

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

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

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

@@ -60,7 +60,7 @@ export class CommunitiesQueryStreamController extends QueryStreamController<
   }
 
   reactor(action: EnumCommunityActions | EnumCommunityMemberActions) {
-    return (community: Amity.InternalCommunity) => {
+    return (community: Amity.Community) => {
       const collection = pullFromCache<Amity.SearchCommunityLiveCollectionCache>(
         this.cacheKey,
       )?.data;
@@ -73,7 +73,7 @@ export class CommunitiesQueryStreamController extends QueryStreamController<
 
   subscribeRTE(
     createSubscriber: {
-      fn: (reactor: (channel: Amity.InternalCommunity) => void) => Amity.Unsubscriber;
+      fn: (reactor: (channel: Amity.Community) => void) => Amity.Unsubscriber;
       action: EnumCommunityActions | EnumCommunityMemberActions;
     }[],
   ) {

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

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

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

@@ -63,7 +63,7 @@ export class SemanticSearchCommunityQueryStreamController extends QueryStreamCon
   }
 
   reactor(action: EnumCommunityActions | EnumCommunityMemberActions) {
-    return (community: Amity.InternalCommunity) => {
+    return (community: Amity.Community) => {
       const collection = pullFromCache<Amity.CommunityLiveCollectionCache>(this.cacheKey)?.data;
       if (!collection) return;
 
@@ -77,7 +77,7 @@ export class SemanticSearchCommunityQueryStreamController extends QueryStreamCon
 
   subscribeRTE(
     createSubscriber: {
-      fn: (reactor: (community: Amity.InternalCommunity) => void) => Amity.Unsubscriber;
+      fn: (reactor: (community: Amity.Community) => void) => Amity.Unsubscriber;
       action: EnumCommunityActions | EnumCommunityMemberActions;
     }[],
   ) {

package/src/communityRepository/utils/communityWithMembership.ts

@@ -1,5 +1,5 @@
 import { pullFromCache } from '~/cache/api';
-import { getActiveUser } from '~/client/api/activeUser';
+import { getActiveUser } from '~/client';
 
 /*
  * verifies membership status
@@ -12,7 +12,7 @@ function isMember(membership: Amity.Membership<'community'>['communityMembership
  * checks if currently logged in user is part of the community
  */
 function isCurrentUserPartOfCommunity(
-  c: Amity.InternalCommunity,
+  c: Amity.Community,
   m: Amity.Membership<'community'>,
 ): boolean {
   const { userId } = getActiveUser();
@@ -28,15 +28,11 @@ function isCurrentUserPartOfCommunity(
  * Althought this can be calculated, it's not scalable.
  */
 export function updateMembershipStatus(
-  communities: Amity.RawCommunity[],
+  communities: Amity.Community[],
   communityUsers: Amity.Membership<'community'>[],
-): Amity.InternalCommunity[] {
+): Amity.Community[] {
   return communities.map(c => {
-    const cachedCommunity = pullFromCache<Amity.InternalCommunity>([
-      'community',
-      'get',
-      c.communityId,
-    ]);
+    const cachedCommunity = pullFromCache<Amity.Community>(['community', 'get', c.communityId]);
     if (cachedCommunity?.data && cachedCommunity?.data.hasOwnProperty('isJoined')) {
       return {
         ...cachedCommunity.data,

package/src/communityRepository/utils/payload.ts

@@ -1,6 +1,5 @@
 import { CommunityPostSettingMaps, DefaultCommunityPostSetting } from '~/@types';
 import { updateMembershipStatus } from './communityWithMembership';
-import { convertRawUserToInternalUser } from '~/userRepository/utils/convertRawUserToInternalUser';
 
 const getMatchPostSetting = (value: {
   needApprovalOnPostCreation: Amity.RawCommunity['needApprovalOnPostCreation'];
@@ -14,7 +13,7 @@ const getMatchPostSetting = (value: {
   ) ?? DefaultCommunityPostSetting;
 
 export function addPostSetting({ communities }: { communities: Amity.RawCommunity[] }) {
-  return communities.map<Amity.InternalCommunity>(
+  return communities.map<Amity.Community>(
     ({ needApprovalOnPostCreation, onlyAdminCanPost, ...restCommunityPayload }) => ({
       postSetting: getMatchPostSetting({
         needApprovalOnPostCreation,
@@ -30,13 +29,10 @@ export const prepareCommunityPayload = (
 ): Amity.ProcessedCommunityPayload => {
   const communitiesWithPostSetting = addPostSetting({ communities: rawPayload.communities });
 
-  // Convert users to internal format
-  const internalUsers = rawPayload.users.map(convertRawUserToInternalUser);
-
   // map users with community
   const mappedCommunityUsers: Array<Amity.Membership<'community'>> = rawPayload.communityUsers.map(
     communityUser => {
-      const user = internalUsers.find(user => user.userId === communityUser.userId)!;
+      const user = rawPayload.users.find(user => user.userId === communityUser.userId)!;
 
       return {
         ...communityUser,
@@ -52,33 +48,11 @@ export const prepareCommunityPayload = (
 
   return {
     ...rawPayload,
-    users: rawPayload.users.map(convertRawUserToInternalUser),
     communities: communityWithMembershipStatus,
     communityUsers: mappedCommunityUsers,
   };
 };
 
-export const prepareCommunityJoinRequestPayload = (
-  rawPayload: Amity.CommunityJoinRequestPayload,
-): Amity.ProcessedJoinRequestPayload => {
-  const mappedJoinRequests: Array<Amity.InternalJoinRequest> = rawPayload.joinRequests.map(
-    joinRequest => {
-      return {
-        ...joinRequest,
-        joinRequestId: joinRequest._id,
-      };
-    },
-  );
-
-  const users = rawPayload.users.map(convertRawUserToInternalUser);
-
-  return {
-    ...rawPayload,
-    joinRequests: mappedJoinRequests,
-    users,
-  };
-};
-
 export const prepareCommunityMembershipPayload = (
   rawPayload: Amity.CommunityMembershipPayload,
 ): Amity.ProcessedCommunityMembershipPayload => {

package/src/core/liveCollection/PaginationController.ts

@@ -1,5 +1,5 @@
 import { AxiosInstance } from 'axios';
-import { getActiveClient } from '~/client/api/activeClient';
+import { getActiveClient } from '~/client/api';
 
 export abstract class PaginationController<
   TPayloadDomain extends keyof Amity.Payloads,

package/src/core/liveCollection/PaginationNoPageController.ts

@@ -1,5 +1,5 @@
 import { AxiosInstance } from 'axios';
-import { getActiveClient } from '~/client/api/activeClient';
+import { getActiveClient } from '~/client/api';
 
 export abstract class PaginationNoPageController<
   TPayloadDomain extends keyof Amity.Payloads,

package/src/core/model/idResolvers.ts

@@ -64,9 +64,6 @@ const idResolvers: Resolvers = {
 
   notificationTrayItem: ({ _id }) => _id,
   notificationTraySeen: ({ userId }) => userId,
-
-  invitation: ({ _id }) => _id,
-  joinRequest: ({ joinRequestId }) => joinRequestId,
 };
 
 /**

package/src/core/model/index.ts

@@ -54,9 +54,6 @@ export const PAYLOAD2MODEL: Record<string, Amity.Domain> = {
   pins: 'pin',
 
   notificationTrayItems: 'notificationTrayItem',
-
-  invitations: 'invitation',
-  joinRequests: 'joinRequest',
 };
 
 /** hidden */

package/src/index.ts

@@ -51,5 +51,3 @@ export * as AdRepository from './adRepository';
 export * from './external/api';
 
 export * as notificationTray from './notificationTray';
-
-export * as InvitationRepository from './invitationRepository';

package/src/messagePreview/utils/getChannelMessagePreviewWithUser.ts

@@ -1,4 +1,4 @@
-import { pullFromCache } from '~/cache/api/pullFromCache';
+import { pullFromCache } from '~/cache/api';
 import { getChannelMessagePreview } from './getChannelMessagePreview';
 import { userLinkedObject } from '~/utils/linkedObject/userLinkedObject';
 

package/src/messageRepository/api/deleteMessage.ts

@@ -23,6 +23,22 @@ export const deleteMessage = async (
   const client = getActiveClient();
   client.log('message/deleteMessage', messageId);
 
+  if (messageId.includes('LOCAL_')) {
+    const message = pullFromCache<Amity.InternalMessage>(['message', 'get', messageId])?.data;
+    if (!message) throw Error('messageId not found');
+
+    const deletedMessage = {
+      ...message,
+      isDeleted: true,
+    };
+
+    fireEvent('local.message.deleted', {
+      messages: [deletedMessage],
+    });
+
+    return LinkedObject.message(deletedMessage);
+  }
+
   // API-FIX: This endpoint has not been implemented yet.
   const { data: deleted } = await client.http.delete<Amity.MessagePayload>(
     `/api/v5/messages/${encodeURIComponent(messageId)}`,

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/messageRepository/observers/getMessages/MessageQueryStreamController.ts

@@ -116,6 +116,19 @@ export class MessageQueryStreamController extends QueryStreamController<
         pushToCache(this.cacheKey, collection);
       }
 
+      if (action === 'onDelete' && payload.syncState === Amity.SyncState.Error) {
+        const collection = pullFromCache<Amity.MessageLiveCollectionCache>(this.cacheKey)?.data;
+        if (!collection) return;
+
+        if (collection.data.includes(payload.messageId)) {
+          const newCollectionData = collection.data.filter(
+            messageId => messageId !== payload.messageId,
+          );
+
+          pushToCache(this.cacheKey, { ...collection, data: newCollectionData });
+        }
+      }
+
       this.notifyChange({ origin: Amity.LiveDataOrigin.EVENT, loading: false });
     };
   }

package/src/postRepository/api/createPost.ts

@@ -2,8 +2,8 @@ import { getActiveClient } from '~/client/api';
 
 import { ingestInCache } from '~/cache/api/ingestInCache';
 import { fireEvent } from '~/core/events';
-import { prepareMembershipPayload } from '~/group/utils';
 import { LinkedObject } from '~/utils/linkedObject';
+import { preparePostPayload } from '../utils/payload';
 
 /* begin_public_function
   id: post.create.text_post, post.create.image_post, post.create.file_post, post.create.video_post, post.create.poll_post, post.create.livestream_post, post.create.custom_post
@@ -46,7 +46,8 @@ export const createPost = async <T extends Amity.PostContentType | string>(
 
   fireEvent('post.created', payload);
 
-  const data = prepareMembershipPayload(payload, 'communityUsers');
+  const data = preparePostPayload(payload);
+
   const cachedAt = client.cache && Date.now();
 
   if (client.cache) ingestInCache(data, { cachedAt });

package/src/postRepository/observers/getGlobalPinnedPosts/GlobalPinnedPostQueryStreamController.ts

@@ -4,7 +4,6 @@ import { ingestInCache } from '~/cache/api/ingestInCache';
 import { getResolver } from '~/core/model';
 import { getActiveClient } from '~/client';
 import { EnumPostActions } from '../enums';
-import { convertRawUserToInternalUser } from '~/userRepository/utils/convertRawUserToInternalUser';
 
 export class GlobalPinnedPostQueryStreamController extends QueryStreamController<
   Amity.PinnedPostPayload,
@@ -31,12 +30,7 @@ export class GlobalPinnedPostQueryStreamController extends QueryStreamController
     const cachedAt = client.cache && Date.now();
 
     if (client.cache) {
-      const processedPayload = {
-        ...response,
-        users: response.users.map(convertRawUserToInternalUser),
-      };
-
-      ingestInCache(processedPayload, { cachedAt });
+      ingestInCache(response, { cachedAt });
     }
   }