@amityco/ts-sdk 0.0.1-beta.32 → 0.0.1-beta.36

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

@@ -1,6 +1,7 @@
+export declare function generateRawMessage(params?: Partial<Amity.RawMessage>): Amity.RawMessage;
 export declare const message11: Amity.Message;
 export declare const messages: {
-    channelId: string;
+    subChannelId: string;
     page1: string[];
     page2: string[];
     page3: string[];
@@ -16,4 +17,9 @@ export declare const messageQueryResponse: {
         };
     };
 };
+export declare const messagePayload: {
+    messages: Amity.Message<any>[];
+    files: Amity.File<"image">[];
+    users: Amity.User[];
+};
 //# sourceMappingURL=message.d.ts.map

package/dist/utils/tests/dummy/message.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../../../src/utils/tests/dummy/message.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,OAa7B,CAAC;AAEF,eAAO,MAAM,QAAQ;;;;;CAKpB,CAAC;AAEF,eAAO,MAAM,oBAAoB;;;;;;;;;;CAUhC,CAAC"}
+{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../../../src/utils/tests/dummy/message.ts"],"names":[],"mappings":"AAGA,wBAAgB,kBAAkB,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC,UAAU,CAyBvF;AAED,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,OAM7B,CAAC;AAEF,eAAO,MAAM,QAAQ;;;;;CAKpB,CAAC;AAEF,eAAO,MAAM,oBAAoB;;;;;;;;;;CAUhC,CAAC;AAGF,eAAO,MAAM,cAAc;;;;CAI1B,CAAC"}

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

@@ -0,0 +1,3 @@
+export declare const poll11: Amity.Poll;
+export declare const pollPayload: Amity.PollPayload;
+//# sourceMappingURL=poll.d.ts.map

package/dist/utils/tests/dummy/poll.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"poll.d.ts","sourceRoot":"","sources":["../../../../src/utils/tests/dummy/poll.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAmC1B,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,WAG/B,CAAC"}

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

@@ -1,6 +1,10 @@
 export declare const post11: Amity.Post;
+export declare const comment11: Amity.Comment;
 export declare const post12: Amity.Post;
 export declare const post13: Amity.Post;
+export declare const post14: Amity.Post;
+export declare const post15: Amity.Post;
+export declare const post16: Amity.Post;
 export declare const posts: {
     targetId: string;
     targetType: Amity.PostTargetType;
@@ -8,7 +12,21 @@ export declare const posts: {
     page2: string[];
     page3: string[];
 };
+export declare const commentPayload: Amity.CommentPayload;
+export declare const postPayload: Amity.PostPayload;
 export declare const postQueryResponse: {
+    data: {
+        posts: Amity.Post<any>[];
+        files: never[];
+        reactor: {
+            userId: string;
+        };
+        paging: {
+            next: string;
+        };
+    };
+};
+export declare const postQueryResponsePage2: {
     data: {
         posts: Amity.Post<any>[];
         files: never[];

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

@@ -1 +1 @@
-{"version":3,"file":"post.d.ts","sourceRoot":"","sources":["../../../../src/utils/tests/dummy/post.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAoB1B,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAG1B,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAG1B,CAAC;AAEF,eAAO,MAAM,KAAK;;;;;;CAMjB,CAAC;AAIF,eAAO,MAAM,iBAAiB;;;;;;;;CAQ7B,CAAC"}
+{"version":3,"file":"post.d.ts","sourceRoot":"","sources":["../../../../src/utils/tests/dummy/post.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAoB1B,CAAC;AAEF,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,OAuB7B,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAG1B,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAG1B,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAM1B,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAO1B,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAI1B,CAAC;AAEF,eAAO,MAAM,KAAK;;;;;;CAMjB,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,cAGlC,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,WAM/B,CAAC;AAIF,eAAO,MAAM,iBAAiB;;;;;;;;;;;CAS7B,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;;;;;CAQlC,CAAC"}

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

@@ -0,0 +1,4 @@
+export declare const reaction11: Amity.Reaction;
+export declare const reactor11: Amity.Reactor;
+export declare const reactionPayload: Amity.ReactionPayload;
+//# sourceMappingURL=reaction.d.ts.map

package/dist/utils/tests/dummy/reaction.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"reaction.d.ts","sourceRoot":"","sources":["../../../../src/utils/tests/dummy/reaction.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,QAO9B,CAAC;AAEF,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,OAK7B,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,KAAK,CAAC,eAGnC,CAAC"}

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

@@ -0,0 +1,4 @@
+export declare const role11: Amity.Role;
+export declare const role12: Amity.Role;
+export declare const rolePayload: Amity.RolePayload;
+//# sourceMappingURL=role.d.ts.map

package/dist/utils/tests/dummy/role.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"role.d.ts","sourceRoot":"","sources":["../../../../src/utils/tests/dummy/role.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAO1B,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAO1B,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,WAE/B,CAAC"}

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

@@ -0,0 +1,3 @@
+export declare function generateRawSubChannel(params?: Partial<Amity.RawSubChannel>): Amity.RawSubChannel;
+export declare function generateSubChannel(params?: Record<string, any>): Amity.SubChannel;
+//# sourceMappingURL=subChannel.d.ts.map

package/dist/utils/tests/dummy/subChannel.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"subChannel.d.ts","sourceRoot":"","sources":["../../../../src/utils/tests/dummy/subChannel.ts"],"names":[],"mappings":"AAGA,wBAAgB,qBAAqB,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,KAAK,CAAC,aAAa,CAkBhG;AAED,wBAAgB,kBAAkB,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,KAAK,CAAC,UAAU,CAKjF"}

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

@@ -12,4 +12,6 @@ export declare const userQueryResponse: {
         };
     };
 };
+export declare const users: Amity.User[];
+export declare const userPayload: Amity.UserPayload;
 //# sourceMappingURL=user.d.ts.map

package/dist/utils/tests/dummy/user.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../../src/utils/tests/dummy/user.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAQ1B,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAG1B,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAG1B,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAG1B,CAAC;AAEF,eAAO,MAAM,iBAAiB;;;;;;;;;CAS7B,CAAC"}
+{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../../src/utils/tests/dummy/user.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAS1B,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAG1B,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAG1B,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAG1B,CAAC;AAEF,eAAO,MAAM,iBAAiB;;;;;;;;;CAS7B,CAAC;AACF,eAAO,MAAM,KAAK,cAAmC,CAAC;AAGtD,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,WAG/B,CAAC"}

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

@@ -1,3 +1,4 @@
 export declare const encodeJson: (value: Record<string, any>) => string;
 export declare const pause: (ms?: number) => Promise<unknown>;
+export declare const deepCopy: <T>(value: T) => T;
 //# sourceMappingURL=utils.d.ts.map

package/dist/utils/tests/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/utils/tests/utils.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,UAAU,UAAW,OAAO,MAAM,EAAE,GAAG,CAAC,WAAkC,CAAC;AAOxF,eAAO,MAAM,KAAK,mCAGd,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/utils/tests/utils.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,UAAU,UAAW,OAAO,MAAM,EAAE,GAAG,CAAC,WAAkC,CAAC;AAOxF,eAAO,MAAM,KAAK,mCAGd,CAAC;AAEL,eAAO,MAAM,QAAQ,oBAAwD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amityco/ts-sdk",
-  "version": "0.0.1-beta.32",
+  "version": "0.0.1-beta.36",
   "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

@@ -26,21 +26,6 @@ declare global {
       reconnect_error: Amity.ErrorResponse | undefined;
       reconnect_failed: Amity.ErrorResponse | undefined;
 
-      'v3.channel.didCreate': Amity.ChannelPayload;
-      'v3.channel.didUpdate': Amity.ChannelPayload;
-      'v3.channel.didDelete': Amity.ChannelPayload;
-      'v3.channel.didJoin': Amity.ChannelPayload;
-      'v3.channel.didLeave': Amity.ChannelPayload;
-      'v3.channel.didAddUsers': Amity.ChannelMembershipPayload;
-      'v3.channel.didRemoveUsers': Amity.ChannelMembershipPayload;
-      'v3.channel.didBan': Amity.ChannelPayload;
-      'v3.channel.didUnban': Amity.ChannelPayload;
-
-      'v3.message.didFetch': Amity.MessagePayload;
-      'v3.message.didCreate': Amity.MessagePayload;
-      'v3.message.didUpdate': Amity.MessagePayload;
-      'v3.message.didDelete': Amity.MessagePayload;
-
       'video-streaming.didRecord': Amity.StreamPayload;
       'video-streaming.didStart': Amity.StreamPayload;
       'video-streaming.didStop': Amity.StreamPayload;
@@ -56,7 +41,40 @@ declare global {
       reconnect: undefined;
     };
 
-    type MqttCommunityUserMessageEvents = {
+    type MqttChannelUserEvents = {
+      'channel.joined': Amity.ChannelMembershipPayload;
+      'channel.left': Amity.ChannelMembershipPayload;
+      'channel.membersAdded': Amity.ChannelMembershipPayload;
+      'channel.membersRemoved': Amity.ChannelMembershipPayload;
+      'channel.banned': Amity.ChannelMembershipPayload;
+      'channel.unbanned': Amity.ChannelMembershipPayload;
+    };
+
+    type MqttChannelEvents = {
+      'channel.created': Amity.ChannelPayload;
+      'channel.updated': Amity.ChannelPayload;
+      'channel.deleted': Amity.ChannelPayload;
+      'channel.setMuted': Amity.ChannelPayload;
+    } & MqttChannelUserEvents;
+
+    type MqttSubChannelEvents = {
+      'message-feed.created': Amity.RawSubChannelPayload;
+      'message-feed.updated': Amity.RawSubChannelPayload;
+      'message-feed.deleted': Amity.RawSubChannelPayload;
+    };
+
+    type MqttMessageEvents = {
+      'message.created': Amity.RawMessagePayload;
+      'message.updated': Amity.RawMessagePayload;
+      'message.deleted': Amity.RawMessagePayload;
+      'message.flagged': Amity.RawMessagePayload;
+      'message.unflagged': Amity.RawMessagePayload;
+      'message.flagCleared': Amity.RawMessagePayload;
+      'message.reactionAdded': Amity.RawMessagePayload;
+      'message.reactionRemoved': Amity.RawMessagePayload;
+    };
+
+    type MqttCommunityUserEvents = {
       'community.joined': Amity.CommunityMembershipPayload;
       'community.left': Amity.CommunityMembershipPayload;
       'community.userAdded': Amity.CommunityMembershipPayload;
@@ -65,13 +83,13 @@ declare global {
       'community.userUnbanned': Amity.CommunityMembershipPayload;
     };
 
-    type MqttCommunityMessageEvents = {
+    type MqttCommunityEvents = {
       'community.created': Amity.CommunityPayload;
       'community.updated': Amity.CommunityPayload;
       'community.deleted': Amity.CommunityPayload;
-    } & MqttCommunityUserMessageEvents;
+    } & MqttCommunityUserEvents;
 
-    type MqttPostMessageEvents = {
+    type MqttPostEvents = {
       'post.created': Amity.PostPayload;
       'post.updated': Amity.PostPayload;
       'post.deleted': Amity.PostPayload;
@@ -83,7 +101,7 @@ declare global {
       'post.removeReaction': Amity.PostPayload & { reactor: Amity.Reaction };
     };
 
-    type MqttCommentMessageEvents = {
+    type MqttCommentEvents = {
       'comment.created': Amity.CommentPayload;
       'comment.updated': Amity.CommentPayload;
       'comment.deleted': Amity.CommentPayload;
@@ -93,7 +111,7 @@ declare global {
       'comment.removeReaction': Amity.CommentPayload & { reactor: Amity.Reaction };
     };
 
-    type MqttUserMessageEvents = {
+    type MqttUserEvents = {
       'user.fetched': Amity.UserPayload;
       'user.updated': Amity.UserPayload;
       'user.deleted': Amity.UserPayload; // received from network topic
@@ -102,7 +120,7 @@ declare global {
       'user.flagCleared': Amity.UserPayload;
     };
 
-    type MqttFollowMessageEvents = {
+    type MqttFollowEvents = {
       'follow.created': Amity.FollowersPayload | Amity.FollowStatusPayload;
       'follow.requested': Amity.FollowersPayload | Amity.FollowStatusPayload;
       'follow.accepted': Amity.FollowersPayload | Amity.FollowStatusPayload;
@@ -112,17 +130,27 @@ declare global {
       'follow.followerDeleted': Amity.FollowersPayload | Amity.FollowStatusPayload;
     };
 
-    type MqttMessageEvents = MqttCommunityMessageEvents &
-      MqttPostMessageEvents &
-      MqttCommentMessageEvents &
-      MqttUserMessageEvents &
-      MqttFollowMessageEvents;
+    type MqttRTE = MqttChannelEvents &
+      MqttSubChannelEvents &
+      MqttMessageEvents &
+      MqttCommunityEvents &
+      MqttPostEvents &
+      MqttCommentEvents &
+      MqttUserEvents &
+      MqttFollowEvents;
 
     type LocalEvents = {
+      'local.channel.updated': { channels: Amity.Channel[] };
+      'local.message.created': Amity.MessagePayload;
+      'local.message.updated': Amity.MessagePayload;
+      'local.message.deleted': Amity.MessagePayload;
+      'local.message.fetched': Amity.MessagePayload;
+      'local.message-feed.fetched': Amity.SubChannelPayload;
+      'local.message-feed.deleted': Amity.SubChannelPayload;
       'poll.updated': Amity.PollPayload;
       'poll.deleted': Amity.PollPayload;
     };
 
-    type Events = WsEvents & MqttEvents & MqttMessageEvents & LocalEvents;
+    type Events = WsEvents & MqttEvents & MqttRTE & LocalEvents;
   }
 }

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

@@ -12,6 +12,7 @@ declare global {
       role: Amity.Role;
 
       channel: Amity.Channel;
+      subChannel: Amity.SubChannel;
       channelUsers: Amity.Membership<'channel'>;
       message: Amity.Message;
 
@@ -42,6 +43,7 @@ declare global {
       role: Pick<Amity.Role, 'roleId'>;
 
       channel: Pick<Amity.Channel, 'channelId'>;
+      subChannel: Pick<Amity.SubChannel, 'subChannelId'>;
       channelUsers: Pick<Amity.Membership<'channel'>, 'channelId' | 'userId'>;
       message: Pick<Amity.Message, 'messageId'>;
 

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

@@ -7,6 +7,7 @@ declare global {
       file: Amity.FilePayload;
       role: Amity.RolePayload;
       channel: Amity.ChannelPayload;
+      subChannel: Amity.SubChannelPayload;
       channelUser: Amity.ChannelMembershipPayload;
       message: Amity.MessagePayload;
       community: Amity.CommunityPayload;
@@ -44,12 +45,20 @@ declare global {
       U extends Amity.Channel<T> | Amity.ChannelRaw<T> = Amity.ChannelRaw<T>,
     > = {
       channels: U[];
-      channelUsers: Amity.Membership<'channel'>[];
+      channelUsers: Amity.MembershipRaw<'channel'>[];
     } & Amity.UserPayload;
 
+    type RawSubChannelPayload = {
+      messageFeeds: Amity.RawSubChannel[];
+    };
+
+    type SubChannelPayload = {
+      messageFeeds: Amity.SubChannel[];
+    };
+
     type ChannelMembershipPayload = {
       channels: Amity.ChannelRaw[];
-      channelUsers: Amity.Membership<'channel'>[];
+      channelUsers: Amity.MembershipRaw<'channel'>[];
     } & Amity.UserPayload;
 
     type MessagePayload<T extends Amity.MessageContentType = any> = {
@@ -58,6 +67,13 @@ declare global {
       files?: Amity.File[];
     };
 
+    type RawMessagePayload<T extends Amity.MessageContentType = any> = Omit<
+      MessagePayload<T>,
+      'messages'
+    > & {
+      messages: Amity.RawMessage<T>[];
+    };
+
     type StreamPayload = {
       videoStreamings: Amity.Stream[];
       users?: Amity.User[];
@@ -66,7 +82,7 @@ declare global {
 
     type CommunityPayload = {
       communities: Amity.RawCommunity[];
-      communityUsers?: Amity.Membership<'community'>[];
+      communityUsers?: Amity.MembershipRaw<'community'>[];
       categories?: Amity.Category[];
       feeds?: Amity.Feed[];
       users?: Amity.User[];
@@ -80,7 +96,7 @@ declare global {
 
     type CommunityMembershipPayload = {
       communities: Amity.RawCommunity[];
-      communityUsers: Amity.Membership<'community'>[];
+      communityUsers: Amity.MembershipRaw<'community'>[];
       categories?: Amity.Category[];
       feeds?: Amity.Feed[];
       users: Amity.User[];
@@ -91,7 +107,7 @@ declare global {
       posts: Amity.Post<T>[];
       postChildren?: Amity.Post[];
       communities?: Amity.RawCommunity[];
-      communityUsers?: Amity.Membership<'community'>[];
+      communityUsers?: Amity.MembershipRaw<'community'>[];
       categories?: Amity.Category[];
       comments?: Amity.Comment[];
       feeds?: Amity.Feed[];

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

@@ -5,6 +5,9 @@ declare global {
     type ChannelType = 'broadcast' | 'conversation' | 'community' | 'live';
 
     type ChannelMemberActionType =
+      | 'onJoin'
+      | 'onLeft'
+      | 'onMemberRead'
       | 'onMemberAdded'
       | 'onMemberRemoved'
       | 'onChannelMemberBanned'
@@ -17,11 +20,13 @@ declare global {
       | 'onDelete'
       | 'onJoin'
       | 'onLeft'
+      | 'onMute'
       | 'onMemberAdded'
       | 'onMemberRemoved';
 
     type Channel<T extends ChannelType = any> = {
       channelId: string;
+      defaultSubChannelId: string;
       displayName?: string;
       avatarFileId?: Amity.File<'image'>['fileId'];
       type: T;
@@ -40,19 +45,31 @@ declare global {
       autoDeleteMessageByFlagLimit?: number;
 
       memberCount?: number;
-      messageCount?: number;
+      messageCount: number; // TODO remove from public interface
       moderatorMemberCount?: number;
 
       lastActivity?: Amity.timestamp;
 
-      unreadCount: number;
-      hasMention: boolean;
+      defaultSubChannelUnreadCount: number;
+      defaultSubChannelHasUnreadMention: boolean;
+      localReadToSegment: number;
+      localLastMentionSegment: number;
     } & Amity.Metadata &
       Amity.Taggable &
       Amity.Timestamps &
-      Amity.SoftDelete;
-
-    type ChannelRaw<T extends ChannelType = any> = Omit<Channel<T>, 'unreadCount' | 'hasMention'>;
+      Amity.SoftDelete &
+      Amity.Subscribable;
+
+    type ChannelRaw<T extends ChannelType = any> = Omit<
+      Channel<T>,
+      | 'defaultSubChannelId'
+      | 'defaultSubChannelUnreadCount'
+      | 'defaultSubChannelHasUnreadMention'
+      | 'localReadToSegment'
+      | 'localLastMentionSegment'
+    > & {
+      _id: string;
+    };
 
     type QueryChannels = {
       displayName?: string;

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

@@ -39,10 +39,31 @@ declare global {
       refreshToken: string;
     };
 
+    type ChatSettings = {
+      enabled: boolean;
+      mention: {
+        isAllowMentionedChannelEnabled: boolean;
+      };
+    };
+
     type FeedSettings = {
       [name in Amity.ContentFeedType]?: Amity.ContentSetting[];
     };
 
+    type SocialSettings = {
+      enabled: boolean;
+      isAllowEditPostWhenReviewingEnabled: boolean;
+      isFollowWithRequestEnabled: boolean;
+      globalFeed: {
+        showCommunityPost: boolean;
+        showEveryonePost: boolean;
+        showFollowingPost: boolean;
+        showMyPost: boolean;
+        showOnlyMyFeed: boolean;
+      };
+      userPrivacySetting: 'public' | 'private ';
+    };
+
     type ConnectClientParams = {
       userId: Amity.User['userId'];
       displayName?: Amity.User['displayName'];

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

@@ -51,9 +51,10 @@ declare global {
       ? string | Record<string, unknown> // custom type
       : never;
 
-    type Content<T extends ContentType, K extends 'type' | 'dataType' = 'dataType'> = {
-      [S in K]?: T;
-    } & { data: ContentData<T> };
+    type Content<T extends ContentType> = {
+      dataType?: T;
+      data: ContentData<T>;
+    };
 
     type ContentSettingText = {
       contentType: 'text';

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

@@ -25,12 +25,16 @@ declare global {
       : never) &
       Amity.Timestamps;
 
-    type Membership<T extends GroupType> = {
+    type MemberWithUser<T extends GroupType> = Member<T> & { user: Amity.User | undefined };
+
+    type MembershipRaw<T extends GroupType, WithUser = false> = {
       isBanned: boolean;
       isMuted: boolean;
       muteTimeout: string;
       lastActivity: Amity.timestamp;
-    } & Member<T> &
+    } & (WithUser extends true ? MemberWithUser<T> : Member<T>) &
       Amity.Accredited;
+
+    type Membership<T extends Amity.GroupType> = Amity.MembershipRaw<T, true>;
   }
 }

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

@@ -11,48 +11,81 @@ declare global {
   namespace Amity {
     type MessageContentType = ValueOf<typeof MessageContentType>;
 
-    type MessageContent<T extends Amity.MessageContentType = any> = {
-      fileId: T extends 'file' | 'image' | 'video' | 'audio' ? string : null;
-    };
-
-    type MessageActionType = 'onCreate' | 'onUpdate' | 'onDelete' | 'onFetch';
+    type MessageActionType =
+      | 'onCreate'
+      | 'onUpdate'
+      | 'onDelete'
+      | 'onFetch'
+      | 'onFlagged'
+      | 'onUnflagged'
+      | 'onFlagCleared'
+      | 'onReactionAdded'
+      | 'onReactionRemoved';
 
-    type Message<T extends Amity.MessageContentType = any> = {
+    type RawMessage<T extends Amity.MessageContentType = any> = {
+      channelId: string;
+      channelPublicId: string;
+      channelType: Amity.Channel['type'];
+      childCount: number;
+      creatorId: string;
+      creatorPublicId: string;
+      // TODO: check if editedAt appears on edit
+      editedAt?: Amity.timestamp;
+      mentionedUsers?: Array<
+        Amity.ChannelMention | (Amity.UserMention & { userPublicIds: string[] })
+      >;
+      messageFeedId: Amity.RawSubChannel['messageFeedId'];
       messageId: string;
+      myReactions?: string[];
+      parentId?: string;
+      reactionCount: number;
+      reactions?: Record<string, number>;
+      referenceId?: string; // https://ekoapp.atlassian.net/wiki/spaces/UP/pages/2085716114/SDK+V5+message+migration#Handling-%E2%80%98ReferenceId%E2%80%99-in-message-creation
+      segment: number;
+    } & Amity.Content<T> &
+      Amity.Flaggable &
+      Amity.Metadata &
+      // Amity.Reactable &
+      Amity.SoftDelete &
+      Amity.Subscribable &
+      Amity.Taggable &
+      Amity.Timestamps;
 
+    type Message<T extends Amity.MessageContentType = any> = {
       channelId: Amity.Channel['channelId'];
-      userId: Amity.User['userId'];
-
-      parentId?: Message['messageId'];
-      childrenNumber: number;
-
       channelSegment: number;
-
-      editedAt: Amity.timestamp;
-    } & Amity.Content<T, 'type'> &
-      Amity.MessageContent<T> &
+      childrenNumber: number;
+      creatorId: string;
+      editedAt?: Amity.timestamp;
+      parentId?: string;
+      messageId: string;
+      subChannelId: Amity.SubChannel['subChannelId'];
+      uniqueId: string;
+    } & Amity.Content<T> &
+      Amity.Mentionable<'user' | 'channel'> &
       Amity.Metadata &
-      Amity.Timestamps &
-      Amity.SoftDelete &
-      Amity.Taggable &
       Amity.Reactable &
-      Amity.Mentionable<'user' | 'channel'>;
+      Amity.SoftDelete &
+      Amity.Subscribable &
+      Amity.Timestamps &
+      Amity.Taggable;
 
     type QueryMessages = {
-      channelId: Amity.Channel['channelId'];
-      type?: Amity.MessageContentType;
-      parentId?: Amity.Message['parentId'];
-      filterByParentId?: boolean;
-      isDeleted?: boolean;
-      tags?: Amity.Taggable['tags'];
+      subChannelId: Amity.SubChannel['subChannelId'];
+      dataType?: Amity.MessageContentType;
       excludeTags?: Amity.Taggable['tags'];
+      hasFlags?: boolean;
+      isDeleted?: boolean;
       page?: Amity.Page;
+      parentId?: Amity.Message['parentId'];
+      sortBy?: 'segmentAsc' | 'segmentDesc';
+      tags?: Amity.Taggable['tags'];
     };
 
     type MessagesLiveCollection = Amity.LiveCollectionParams<Omit<QueryMessages, 'page'>>;
 
     type MessageLiveCollectionCache = Amity.LiveCollectionCache<
-      Amity.Message['channelId'],
+      Amity.Message['subChannelId'],
       Pick<QueryMessages, 'page'>
     >;
   }

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

@@ -39,7 +39,7 @@ declare global {
       hasFlaggedChildren: false;
       hasFlaggedComment: false;
       editedAt: Amity.timestamp;
-    } & Amity.Content<T, 'dataType'> &
+    } & Amity.Content<T> &
       Amity.Metadata &
       Amity.Flaggable &
       Amity.Reactable &
@@ -53,7 +53,7 @@ declare global {
       targetId: string;
       targetType: Amity.Post['targetType'];
       sortBy?: 'lastCreated' | 'firstCreated' | 'lastUpdated' | 'firstUpdated';
-      dataType?: Exclude<Amity.PostContentType, 'text'>;
+      dataTypes?: Exclude<Amity.PostContentType, 'text'>[];
       isDeleted?: Amity.Post['isDeleted'];
       hasFlag?: boolean;
       feedType?: 'reviewing' | 'published';