Further cleanup

Author: arnautov-anton

src/client.ts

@@ -46,6 +46,7 @@ import type {
   MuteUserOptions,
   MuteUserResponse,
   OwnUserResponse,
+  PartializeAllBut,
   PartialThreadUpdate,
   PartialUserUpdate,
   QueryBannedUsersPayload,
@@ -56,7 +57,6 @@ import type {
   QueryUserGroupsOptions,
   QueryUserGroupsResponse,
   ReactionResponse,
-  RequireLiteral,
   SdkIdentifier,
   SearchPayload,
   StreamChatOptions,
@@ -132,7 +132,7 @@ export type MessageComposerSetupState = {
 
 export type ListenerKeys = CombinedEvents['type'] | 'all';
 
-type ClientUser = RequireLiteral<Partial<OwnUserResponse>, 'id'> & { anon?: boolean };
+type ClientUser = PartializeAllBut<OwnUserResponse, 'id'> & { anon?: boolean };
 
 export class StreamChat extends ChatApi {
   private static _instance?: unknown | StreamChat; // type is undefined|StreamChat, unknown is due to TS limitations with statics

src/messageComposer/middleware/messageComposer/messageComposerState.ts

@@ -37,7 +37,7 @@ export const createMessageComposerStateCompositionMiddleware = (
         localMessage: {
           ...state.localMessage,
           ...payload,
-          quoted_message: (composer.quotedMessage as LocalMessage) ?? undefined,
+          quoted_message: composer.quotedMessage ?? undefined,
         },
         message: {
           ...state.message,

src/messageComposer/middleware/messageComposer/userDataInjection.ts

@@ -33,12 +33,12 @@ export const createUserDataInjectionMiddleware = (
         devices: _devices,
         mutes: _mutes,
         ...messageUser
-      } = composer.client.user as RequireLiteral<OwnUserResponse, 'blocked_user_ids'>; // TODO: drop RequireLiteral once the oapi spec is adjusted
+      } = composer.client.user;
       return next({
         ...state,
         localMessage: {
           ...state.localMessage,
-          user: messageUser,
+          user: messageUser as RequireLiteral<OwnUserResponse, 'blocked_user_ids'>, // TODO: drop RequireLiteral once the oapi spec is adjusted,
           user_id: messageUser.id,
         },
       });

src/messageComposer/middleware/textComposer/mentions.ts

@@ -664,14 +664,9 @@ export class MentionsSearchSource extends BaseSearchSource<MentionSuggestion> {
 
     return {
       items: user_groups.map((userGroup) =>
-        this.toUserGroupMentionSuggestion(
-          userGroup as unknown as UserGroupResponse,
-          searchQuery,
-        ),
-      ),
-      next: this.buildUserGroupSearchCursor(
-        user_groups as unknown as UserGroupResponse[],
+        this.toUserGroupMentionSuggestion(userGroup, searchQuery),
       ),
+      next: this.buildUserGroupSearchCursor(user_groups),
     };
   };
 

src/pagination/UserGroupPaginator.ts

@@ -8,10 +8,9 @@ import type {
 import type { QueryUserGroupsOptions, UserGroupResponse } from '../types';
 import type { StreamChat } from '../client';
 
-type UserGroupListCursor = {
-  created_at_gt: string;
-  id_gt: string;
-};
+type UserGroupListCursor = Required<
+  Pick<QueryUserGroupsOptions, 'created_at_gt' | 'id_gt'>
+>;
 
 const isRecord = (value: unknown): value is Record<string, unknown> =>
   typeof value === 'object' && value !== null;
@@ -65,7 +64,7 @@ export class UserGroupPaginator extends BasePaginator<UserGroupResponse> {
     if (!lastItem) return undefined;
 
     return JSON.stringify({
-      created_at_gt: lastItem.created_at,
+      created_at_gt: lastItem.created_at.toISOString(), // TODO: this should not be the case
       id_gt: lastItem.id,
     } satisfies UserGroupListCursor);
   };