@amityco/ts-sdk-react-native 6.12.1 → 6.13.0

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

@@ -4,6 +4,13 @@ export declare const user13: Amity.User;
 export declare const user14: Amity.User;
 export declare const user21: Amity.User;
 export declare const user22: Amity.User;
+export declare const viewedUserQueryResponse: {
+    data: {
+        users: Amity.User[];
+        files: never[];
+        paging: {};
+    };
+};
 export declare const userQueryResponse: {
     data: {
         users: Amity.User[];
@@ -28,6 +35,7 @@ export declare const flaggedUser: {
     userId: string;
     flagCount: number;
     _id: string;
+    isGlobalBanned: boolean;
     displayName?: string | undefined;
     avatarFileId?: string | undefined;
     avatarCustomUrl?: string | undefined;
@@ -46,6 +54,7 @@ export declare const flaggedUser: {
     deletedAt?: string | undefined;
     isDeleted?: boolean | undefined;
     path: string;
+    avatar?: Amity.File<"image"> | null | undefined;
 };
 export declare const flaggedUserQueryResponse: {
     data: {
@@ -53,6 +62,7 @@ export declare const flaggedUserQueryResponse: {
             userId: string;
             flagCount: number;
             _id: string;
+            isGlobalBanned: boolean;
             displayName?: string | undefined;
             avatarFileId?: string | undefined;
             avatarCustomUrl?: string | undefined;
@@ -71,6 +81,7 @@ export declare const flaggedUserQueryResponse: {
             deletedAt?: string | undefined;
             isDeleted?: boolean | undefined;
             path: string;
+            avatar?: Amity.File<"image"> | null | undefined;
         }[];
         files: never[];
     };
@@ -88,7 +99,7 @@ export declare const userUpdateResponse: {
             hashFlag: null;
             avatarCustomUrl: string;
             avatarFileId: null;
-            isGlobalBan: boolean;
+            isGlobalBanned: boolean;
         }[];
         files: never[];
     };

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,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,MAAM,EAAE,KAAK,CAAC,IAI1B,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAG1B,CAAC;AAEF,eAAO,MAAM,iBAAiB;;;;;;;;;CAS7B,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;;;;;;CASlC,CAAC;AAEF,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;CAIvB,CAAC;AAEF,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;CAKpC,CAAC;AAEF,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;CAmB9B,CAAC;AAEF,eAAO,MAAM,KAAK,cAAmC,CAAC;AAGtD,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,WAG/B,CAAC"}
+{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../../src/utils/tests/dummy/user.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAW1B,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,MAAM,EAAE,KAAK,CAAC,IAI1B,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAG1B,CAAC;AAEF,eAAO,MAAM,uBAAuB;;;;;;CAMnC,CAAC;AAEF,eAAO,MAAM,iBAAiB;;;;;;;;;CAS7B,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;;;;;;CASlC,CAAC;AAEF,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;CAIvB,CAAC;AAEF,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAKpC,CAAC;AAEF,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;CAmB9B,CAAC;AAEF,eAAO,MAAM,KAAK,cAAmC,CAAC;AAGtD,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,WAG/B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amityco/ts-sdk-react-native",
-  "version": "6.12.1",
+  "version": "6.13.0",
   "license": "CC-BY-ND-4.0",
   "author": "amity.co <developers@amity.co> (https://amity.co)",
   "description": "Amity Social Cloud Typescript SDK",
@@ -77,4 +77,4 @@
   "peerDependencies": {
     "react-native": "^0.70.13"
   }
-}
+}

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

@@ -4,7 +4,7 @@ declare global {
   namespace Amity {
     type ChannelMarker = {
       entityId: Amity.RawChannel['channelId'];
-      userId: Amity.User['userId'];
+      userId: Amity.InternalUser['userId'];
       unreadCount: number;
       isDeleted: boolean;
       hasMentioned: boolean;
@@ -13,7 +13,7 @@ declare global {
     type SubChannelMarker = {
       feedId: Amity.RawSubChannel['messageFeedId'];
       entityId: Amity.RawChannel['channelId'];
-      userId: Amity.User['userId'];
+      userId: Amity.InternalUser['userId'];
       readToSegment: number;
       deliveredToSegment: number;
       unreadCount: number;
@@ -23,7 +23,7 @@ declare global {
     type MessageMarker = {
       feedId: Amity.RawSubChannel['messageFeedId'];
       contentId: Amity.RawMessage['messageId'];
-      creatorId: Amity.User['userId'];
+      creatorId: Amity.InternalUser['userId'];
       readCount: number;
       deliveredCount: number;
     } & Amity.Timestamps;
@@ -36,7 +36,7 @@ declare global {
     } & Amity.Timestamps;
 
     type UserMarker = {
-      userId: Amity.User['userId'];
+      userId: Amity.InternalUser['userId'];
       unreadCount: number;
       hasMentioned: boolean;
     } & Amity.SyncAt &

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

@@ -7,7 +7,7 @@ declare global {
      * @hidden
      */
     type Models = {
-      user: Amity.User;
+      user: Amity.InternalUser;
       file: Amity.File;
       role: Amity.Role;
 
@@ -26,9 +26,9 @@ declare global {
       userMarker: Amity.UserMarker;
 
       community: Amity.Community;
-      category: Amity.Category;
+      category: Amity.InternalCategory;
       communityUsers: Amity.Membership<'community'>;
-      post: Amity.Post;
+      post: Amity.InternalPost;
       comment: Amity.InternalComment;
       poll: Amity.Poll;
       reaction: Amity.Reaction;
@@ -52,7 +52,7 @@ declare global {
      * @hidden
      */
     type Minimal = {
-      user: Pick<Amity.User, 'userId'>;
+      user: Pick<Amity.InternalUser, 'userId'>;
       file: Pick<Amity.File, 'fileId'>;
       role: Pick<Amity.Role, 'roleId'>;
 
@@ -71,9 +71,9 @@ declare global {
       userMarker: Pick<Amity.UserMarker, 'userId'>;
 
       community: Pick<Amity.Community, 'communityId'>;
-      category: Pick<Amity.Category, 'categoryId'>;
+      category: Pick<Amity.InternalCategory, 'categoryId'>;
       communityUsers: Pick<Amity.Membership<'community'>, 'communityId' | 'userId'>;
-      post: Pick<Amity.Post, 'postId'>;
+      post: Pick<Amity.InternalPost, 'postId'>;
       comment: Pick<Amity.InternalComment, 'commentId'>;
       poll: Pick<Amity.Poll, 'pollId'>;
       reaction: Pick<Amity.Reaction, 'referenceType' | 'referenceId'>;

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

@@ -21,7 +21,7 @@ declare global {
     };
 
     type UserPayload = {
-      users: Amity.User[];
+      users: Amity.InternalUser[];
       files: Amity.File<'image'>[];
     };
 
@@ -117,14 +117,14 @@ declare global {
       contentMarkers: Amity.MessageMarker[];
       feedMarkers: Amity.FeedMarker[];
       userFeedMarkers: UserFeedMarkerResponse[];
-      publicUserIds: Amity.User['userId'][];
+      publicUserIds: Amity.InternalUser['userId'][];
     };
 
     type DeliveredUserPayload = {
       contentMarkers: Amity.MessageMarker[];
       feedMarkers: Amity.FeedMarker[];
       userFeedMarkers: UserFeedMarkerResponse[];
-      publicUserIds: Amity.User['userId'][];
+      publicUserIds: Amity.InternalUser['userId'][];
     };
 
     type StartReadingPayload = {
@@ -167,7 +167,7 @@ declare global {
     type SubChannelPayload<T extends Amity.MessageContentType = any> = {
       messageFeeds: Amity.RawSubChannel[];
       messages: Amity.RawMessage<T>[];
-      users: Amity.User[];
+      users: Amity.InternalUser[];
       files: Amity.File[];
     };
 
@@ -179,7 +179,7 @@ declare global {
     type ProcessedSubChannelPayload<T extends Amity.MessageContentType = any> = {
       messageFeeds: Amity.SubChannel[];
       messages: Amity.Message<T>[];
-      users: Amity.User[];
+      users: Amity.InternalUser[];
       files: Amity.File[];
     };
 
@@ -209,8 +209,7 @@ declare global {
      */
     type ProcessedMessagePayload<T extends Amity.MessageContentType = any> = {
       messages: Amity.Message<T>[];
-      messageFeeds: Amity.SubChannel[];
-      users: Amity.User[];
+      users: Amity.InternalUser[];
       files: Amity.File[];
       reactions: Amity.Reactor[];
     };
@@ -225,16 +224,16 @@ declare global {
 
     type StreamPayload = {
       videoStreamings: Amity.Stream[];
-      users: Amity.User[];
+      users: Amity.InternalUser[];
       files: Amity.File<'image'>[];
     };
 
     type CommunityPayload = {
       communities: Amity.RawCommunity[];
       communityUsers: Amity.RawMembership<'community'>[];
-      categories: Amity.Category[];
+      categories: Amity.InternalCategory[];
       feeds: Amity.Feed[];
-      users: Amity.User[];
+      users: Amity.InternalUser[];
       files: Amity.File[];
     };
 
@@ -249,16 +248,16 @@ declare global {
     };
 
     type CategoryPayload = {
-      categories: Amity.Category[];
+      categories: Amity.InternalCategory[];
       files: Amity.File[];
     };
 
     type CommunityMembershipPayload = {
       communities: Amity.RawCommunity[];
       communityUsers: Amity.RawMembership<'community'>[];
-      categories: Amity.Category[];
+      categories: Amity.InternalCategory[];
       feeds: Amity.Feed[];
-      users: Amity.User[];
+      users: Amity.InternalUser[];
       files: Amity.File[];
     };
 
@@ -275,15 +274,16 @@ declare global {
       communityUsers: Amity.Membership<'community'>[];
     };
 
+    // Raw response from BE, not contain all linked objects
     type PostPayload<T extends Amity.PostContentType = any> = {
-      posts: Amity.Post<T>[];
-      postChildren: Amity.Post[];
+      posts: Amity.InternalPost<T>[];
+      postChildren: Amity.InternalPost<T>[];
       communities: Amity.RawCommunity[];
       communityUsers: Amity.RawMembership<'community'>[];
-      categories: Amity.Category[];
+      categories: Amity.InternalCategory[];
       comments: Amity.InternalComment[];
       feeds: Amity.Feed[];
-      users: Amity.User[];
+      users: Amity.InternalUser[];
       files: Amity.File[];
     };
 
@@ -292,7 +292,8 @@ declare global {
      * - communities: `Amity.RawCommunity` -> `Amity.Community` (Added Marker Service related props)
      * - communityUsers: `Amity.RawMembership` -> `Amity.Membership` (Add user getter prop)
      */
-    type ProcessedPostPayload = Omit<PostPayload, 'communities' | 'communityUsers'> & {
+    type ProcessedPostPayload = Omit<PostPayload, 'communities' | 'communityUsers' | 'posts'> & {
+      posts: Amity.Post[];
       communities: Amity.Community[];
       communityUsers: Amity.Membership<'community'>[];
     };
@@ -300,19 +301,19 @@ declare global {
     type CommentPayload<T extends Amity.CommentContentType = any> = {
       comments: Amity.InternalComment<T>[];
       commentChildren: Amity.InternalComment[];
-      users: Amity.User[];
+      users: Amity.InternalUser[];
       files: Amity.File[];
       communityUsers: Amity.Membership<'community'>[];
     };
 
     type PollPayload = {
-      users: Amity.User[];
+      users: Amity.InternalUser[];
       polls: Amity.Poll[];
     };
 
     type ReactionPayload = {
       reactions: Amity.Reaction[];
-      users: Amity.User[];
+      users: Amity.InternalUser[];
     };
 
     type GlobalFeedPayload = Amity.PostPayload;

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

@@ -0,0 +1,39 @@
+export {};
+
+declare global {
+  namespace Amity {
+    type AnalyticEventContentType = 'post'; // For this version we focus on post only
+    type AnalyticEventActivityType = 'view';
+
+    type AnalyticEventModel = {
+      contentId: Amity.InternalPost['postId'];
+      contentType: AnalyticEventContentType;
+      activityType: AnalyticEventActivityType;
+      timestamp: Amity.timestamp;
+    };
+
+    type AnalyticPostData = {
+      impression: number;
+      reach: number;
+    };
+
+    type QueryPostViewedUser = {
+      token?: Amity.Token;
+      limit?: Amity.PageLimit['limit'];
+    };
+
+    type PostViewedUsersLiveCollection = {
+      postId: Amity.InternalPost['postId'];
+    } & Amity.LiveCollectionParams<QueryPostViewedUser>;
+
+    type PostViewedUsersLiveCollectionCache = Amity.LiveCollectionCache<
+      Amity.User['userId'],
+      {
+        page?: {
+          next?: Amity.Token;
+          previous?: Amity.Token;
+        };
+      }
+    >;
+  }
+}

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

@@ -14,7 +14,7 @@ declare global {
     type BlockedUsersLiveCollection = Amity.LiveCollectionParams<QueryBlockedUser>;
 
     type BlockedUserLiveCollectionCache = Amity.LiveCollectionCache<
-      Amity.User['userId'],
+      Amity.InternalUser['userId'],
       {
         page: Amity.Page;
         total: number;

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

@@ -2,7 +2,7 @@ export {};
 
 declare global {
   namespace Amity {
-    type Category = {
+    type InternalCategory = {
       categoryId: string;
       name: string;
       avatarFileId?: Amity.File<'image'>['fileId'];
@@ -10,6 +10,10 @@ declare global {
       Amity.Timestamps &
       Amity.SoftDelete;
 
+    type Category = InternalCategory & {
+      avatar?: Amity.File<'image'> | null;
+    };
+
     type QueryCategories = {
       includeDeleted?: boolean;
       sortBy?: 'name' | 'firstCreated' | 'lastCreated';
@@ -19,7 +23,7 @@ declare global {
     type CategoryLiveCollection = Amity.LiveCollectionParams<Omit<QueryCategories, 'page'>>;
 
     type CategoryLiveCollectionCache = Amity.LiveCollectionCache<
-      Amity.Category['categoryId'],
+      Amity.InternalCategory['categoryId'],
       Pick<QueryCategories, 'page'>
     >;
   }

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

@@ -119,8 +119,8 @@ declare global {
     };
 
     type ConnectClientParams = {
-      userId: Amity.User['userId'];
-      displayName?: Amity.User['displayName'];
+      userId: Amity.InternalUser['userId'];
+      displayName?: Amity.InternalUser['displayName'];
       authToken?: string;
       deviceId?: Amity.Device['deviceId'];
     };
@@ -129,7 +129,7 @@ declare global {
       disableRTE: boolean;
     };
 
-    type ActiveUser = Pick<Amity.User, '_id' | 'userId' | 'path' | 'displayName'>;
+    type ActiveUser = Pick<Amity.InternalUser, '_id' | 'userId' | 'path' | 'displayName'>;
 
     type UserUnread = Pick<Amity.UserMarker, 'unreadCount' | 'hasMentioned'>;
   }

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

@@ -40,12 +40,15 @@ declare global {
     type CommentTarget = {
       type: InternalComment['targetType'] | 'unknown';
       communityId?: Amity.Community['communityId'];
-      userId?: Amity.User['userId'];
+      userId?: Amity.InternalUser['userId'];
       contentId?: string;
       creatorMember?: Amity.Membership<'community'>;
     };
 
-    type Comment = Amity.InternalComment & { target: Amity.CommentTarget };
+    type Comment = Amity.InternalComment & {
+      target: Amity.CommentTarget;
+      creator?: Amity.User;
+    };
 
     type QueryComments = {
       referenceType: Amity.InternalComment['referenceType'];

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

@@ -46,7 +46,7 @@ declare global {
       description?: string;
 
       channelId: Amity.Channel['channelId'];
-      userId: Amity.User['userId'];
+      userId: Amity.InternalUser['userId'];
 
       isOfficial?: boolean;
       isPublic?: boolean;
@@ -57,7 +57,7 @@ declare global {
       postsCount: number;
       membersCount: number;
 
-      categoryIds: Amity.Category['categoryId'][];
+      categoryIds: Amity.InternalCategory['categoryId'][];
 
       hasFlaggedComment: boolean;
       hasFlaggedPost: boolean;
@@ -74,7 +74,7 @@ declare global {
     type QueryCommunities = {
       displayName?: string;
       membership?: 'all' | 'member' | 'notMember';
-      categoryId?: Amity.Category['categoryId'];
+      categoryId?: Amity.InternalCategory['categoryId'];
       includeDeleted?: boolean;
       tags?: Amity.Taggable['tags'];
       sortBy?: 'displayName' | 'firstCreated' | 'lastCreated';
@@ -90,10 +90,10 @@ declare global {
 
     type QueryCommunityMembers = {
       communityId: string;
-      membership?: ('banned' | 'member')[];
+      memberships?: ('banned' | 'member')[];
       roles?: string[];
       sortBy?: 'firstCreated' | 'lastCreated';
-      search?: Amity.User['displayName'] | Amity.User['userId'];
+      search?: Amity.InternalUser['displayName'] | Amity.InternalUser['userId'];
       page?: Amity.Page;
     };
 

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

@@ -14,14 +14,14 @@ declare global {
     type FollowStatusType = 'all' | 'pending' | 'accepted' | 'blocked' | 'none';
 
     type FollowStatus = {
-      from: Amity.User['userId'];
-      to: Amity.User['userId'];
+      from: Amity.InternalUser['userId'];
+      to: Amity.InternalUser['userId'];
       status: Exclude<FollowStatusType, 'all'>;
     } & Amity.CreatedAt &
       Amity.UpdatedAt;
 
     type FollowCount = {
-      userId: Amity.User['userId'];
+      userId: Amity.InternalUser['userId'];
       followerCount: number;
       followingCount: number;
       pendingCount: number;
@@ -32,7 +32,7 @@ declare global {
     } & FollowCount;
 
     type QueryFollowers = {
-      userId: Amity.User['userId'];
+      userId: Amity.InternalUser['userId'];
       status?: Exclude<Amity.FollowStatusType, 'none'>;
       page?: Amity.PageRaw;
     };

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

@@ -9,7 +9,7 @@ declare global {
     };
 
     type Member<T extends GroupType> = {
-      userId: Amity.User['userId'];
+      userId: Amity.InternalUser['userId'];
     } & (T extends 'channel'
       ? {
           channelId: Amity.Channel['channelId'];
@@ -25,7 +25,7 @@ declare global {
       : never) &
       Amity.Timestamps;
 
-    type MemberWithUser<T extends GroupType> = Member<T> & { user: Amity.User | undefined };
+    type MemberWithUser<T extends GroupType> = Member<T> & { user: Amity.InternalUser | undefined };
 
     type RawMembership<T extends GroupType, WithUser = false> = {
       isBanned: boolean;

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

@@ -12,10 +12,10 @@ declare global {
       isDeleted?: boolean;
       segment: number;
       subChannelUpdatedAt: Amity.timestamp;
-      creatorId: Amity.User['userId'];
+      creatorId: Amity.InternalUser['userId'];
     } & Amity.Timestamps;
 
-    type MessagePreview = Omit<InternalMessagePreview, 'creatorId'> & { user?: Amity.User };
+    type MessagePreview = Omit<InternalMessagePreview, 'creatorId'> & { user?: Amity.InternalUser };
 
     const enum MessagePreviewSetting {
       NO_MESSAGE_PREVIEW = 'no-message-preview',

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

@@ -25,7 +25,7 @@ declare global {
       closedIn?: number;
       isVoted?: boolean;
       status: PollStatus;
-      userId: Amity.User['userId'];
+      userId: Amity.InternalUser['userId'];
     } & Amity.Timestamps &
       Amity.SoftDelete;
   }

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

@@ -27,16 +27,16 @@ declare global {
       | 'onReactionAdded'
       | 'onReactionRemoved';
 
-    type Post<T extends PostContentType = any> = {
+    type InternalPost<T extends PostContentType = any> = {
       postId: string;
-      postedUserId: Amity.User['userId']; // API-FIX: it should be "userId"
-      parentId: Post['postId'];
+      postedUserId: Amity.InternalUser['userId']; // API-FIX: it should be "userId"
+      parentId: Amity.InternalPost['postId'];
       targetType: PostTargetType;
       targetId: string;
       feedId: Amity.Feed['feedId'];
-      children: Amity.Post['postId'][];
+      children: Amity.InternalPost['postId'][];
       comments: Amity.InternalComment['commentId'][];
-      commentsCount: number; // API-FIX: backend doesnt follow its own convention
+      commentsCount: number; // API-FIX: backend doesn't follow its own convention
       hasFlaggedChildren: false;
       hasFlaggedComment: false;
       editedAt: Amity.timestamp;
@@ -48,11 +48,22 @@ declare global {
       Amity.Timestamps &
       Amity.SoftDelete &
       Amity.Subscribable &
+      Amity.AnalyticPostData &
       Amity.Mentionable<'user'>;
 
+    type PostLinkObject = {
+      latestComments: (Amity.Comment | null)[];
+      creator: Amity.User | null;
+      analytics: {
+        markAsViewed: () => void;
+      };
+    };
+
+    type Post<T extends PostContentType = any> = Amity.InternalPost<T> & Amity.PostLinkObject;
+
     type QueryPosts = {
       targetId: string;
-      targetType: Amity.Post['targetType'];
+      targetType: Amity.InternalPost['targetType'];
       sortBy?: 'lastCreated' | 'firstCreated';
       dataTypes?: Exclude<Amity.PostContentType, 'text'>[];
       includeDeleted?: boolean;
@@ -71,7 +82,7 @@ declare global {
     >;
 
     type PostLiveCollectionCache = Amity.LiveCollectionCache<
-      Amity.Post['postId'],
+      Amity.InternalPost['postId'],
       Pick<QueryPosts, 'page'>
     >;
   }

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

@@ -9,7 +9,7 @@ declare global {
     type Reactor = {
       reactionId: string;
       reactionName: string;
-      userId: Amity.User['userId'];
+      userId: Amity.InternalUser['userId'];
     } & Amity.Timestamps;
 
     type Reactable = {

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

@@ -55,7 +55,7 @@ declare global {
       isLive?: boolean;
       endedAt: Amity.timestamp;
       startedAt: Amity.timestamp;
-      userId: Amity.User['userId'];
+      userId: Amity.InternalUser['userId'];
       resolution: StreamResolution;
 
       streamerUrl: StreamEndpoint;
@@ -68,7 +68,7 @@ declare global {
     type QueryStreams = {
       isLive?: boolean;
       statuses?: Amity.StreamStatus[];
-      userPublicIds?: Amity.User['userId'][];
+      userPublicIds?: Amity.InternalUser['userId'][];
       sortBy?: 'lastCreated' | 'firstCreated';
       isDeleted?: Amity.Stream['isDeleted'];
       page?: Amity.Page;

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

@@ -10,9 +10,10 @@ declare global {
       | 'onUnflagged'
       | 'onFlagCleared';
 
-    type User = {
+    type InternalUser = {
       _id: string;
       userId: string;
+      isGlobalBanned: boolean;
       displayName?: string;
       avatarFileId?: Amity.File<'image'>['fileId'];
       avatarCustomUrl?: string;
@@ -25,8 +26,12 @@ declare global {
       Amity.SoftDelete &
       Amity.Subscribable;
 
+    type User = Amity.InternalUser & {
+      avatar?: Amity.File<'image'> | null;
+    };
+
     type QueryUsers = {
-      displayName?: Amity.User['displayName'];
+      displayName?: Amity.InternalUser['displayName'];
       filter?: 'all' | 'flagged';
       sortBy?: 'displayName' | 'firstCreated' | 'lastCreated';
       page?: Amity.Page;
@@ -37,7 +42,7 @@ declare global {
     type UserSearchLiveCollection = Amity.LiveCollectionParams<Omit<QueryUsers, 'sortBy'>>;
 
     type UserLiveCollectionCache = Amity.LiveCollectionCache<
-      Amity.User['userId'],
+      Amity.InternalUser['userId'],
       Pick<QueryUsers, 'page'>
     >;
   }