stream-chat 9.50.2 → 10.0.0-rc.1

package/src/messageComposer/LocationComposer.ts

@@ -4,7 +4,7 @@ import type {
   DraftMessage,
   LiveLocationPayload,
   LocalMessage,
-  StaticLocationPayload,
+  SharedLocation,
 } from '../types';
 
 export type Coords = { latitude: number; longitude: number };
@@ -14,10 +14,13 @@ export type LocationComposerOptions = {
   message?: DraftMessage | LocalMessage;
 };
 
-export type StaticLocationPreview = StaticLocationPayload;
+export type StaticLocationPreview = SharedLocation & {
+  message_id?: string;
+};
 
 export type LiveLocationPreview = Omit<LiveLocationPayload, 'end_at'> & {
   durationMs?: number;
+  message_id?: string;
 };
 
 export type LocationComposerState = {
@@ -59,7 +62,7 @@ export class LocationComposer {
     return this.state.getLatestValue().location;
   }
 
-  get validLocation(): StaticLocationPayload | LiveLocationPayload | null {
+  get validLocation(): SharedLocation | null {
     const { durationMs, ...location } = (this.location ?? {}) as LiveLocationPreview;
     if (
       !!location?.created_by_device_id &&
@@ -71,8 +74,9 @@ export class LocationComposer {
     ) {
       return {
         ...location,
-        end_at: durationMs && new Date(Date.now() + durationMs).toISOString(),
-      } as StaticLocationPayload | LiveLocationPayload;
+        end_at:
+          typeof durationMs === 'number' ? new Date(Date.now() + durationMs) : undefined,
+      };
     }
     return null;
   }

package/src/messageComposer/MessageComposerEffectHandlers.ts

@@ -34,6 +34,7 @@ const applyCommandActivationEffect: MessageComposerEffectHandler<
     suggestions: undefined,
     selection: { start: 0, end: 0 },
     text: '',
+    typing: {},
   });
   const attachmentsToCancel = composer.attachmentManager.attachments;
   composer.attachmentManager.initState();

package/src/messageComposer/attachmentIdentity.ts

@@ -1,4 +1,4 @@
-import type { Attachment, SharedLocationResponse } from '../types';
+import type { Attachment, SharedLocationResponseData } from '../types';
 import type {
   AudioAttachment,
   FileAttachment,
@@ -33,8 +33,10 @@ export const isFileAttachment = (
 ): attachment is FileAttachment =>
   attachment.type === 'file' ||
   !!(
-    attachment.mime_type &&
-    supportedVideoFormat.indexOf(attachment.mime_type) === -1 &&
+    (attachment as FileAttachment).custom?.mime_type &&
+    supportedVideoFormat.indexOf(
+      (attachment as FileAttachment).custom?.mime_type as string,
+    ) === -1 &&
     attachment.type !== 'video'
   );
 
@@ -76,7 +78,12 @@ export const isVideoAttachment = (
   supportedVideoFormat: string[] = [],
 ): attachment is VideoAttachment =>
   attachment.type === 'video' ||
-  !!(attachment.mime_type && supportedVideoFormat.indexOf(attachment.mime_type) !== -1);
+  !!(
+    (attachment as VideoAttachment).custom?.mime_type &&
+    supportedVideoFormat.indexOf(
+      (attachment as VideoAttachment).custom?.mime_type as string,
+    ) !== -1
+  );
 
 export const isLocalVideoAttachment = (
   attachment: Attachment | LocalAttachment,
@@ -92,12 +99,12 @@ export const isUploadedAttachment = (
   isVideoAttachment(attachment) ||
   isVoiceRecordingAttachment(attachment);
 
-export const isSharedLocationResponse = (
+export const isSharedLocationResponseData = (
   location: unknown,
-): location is SharedLocationResponse =>
-  !!(location as SharedLocationResponse).latitude &&
-  !!(location as SharedLocationResponse).longitude &&
-  !!(location as SharedLocationResponse).channel_cid;
+): location is SharedLocationResponseData =>
+  !!(location as SharedLocationResponseData).latitude &&
+  !!(location as SharedLocationResponseData).longitude &&
+  !!(location as SharedLocationResponseData).channel_cid;
 
 export const isGiphyAttachment = (
   attachment: Attachment,

package/src/messageComposer/attachmentManager.ts

@@ -129,14 +129,14 @@ export class AttachmentManager {
     this.composer.updateConfig({ attachments: { acceptedFiles } });
   }
 
-  /*
+  /**
   @deprecated attachments can be filtered using injecting pre-upload middleware
    */
   get fileUploadFilter() {
     return this.config.fileUploadFilter;
   }
 
-  /*
+  /**
   @deprecated attachments can be filtered using injecting pre-upload middleware
    */
   set fileUploadFilter(fileUploadFilter: AttachmentManagerConfig['fileUploadFilter']) {
@@ -426,8 +426,10 @@ export class AttachmentManager {
           });
 
     const localAttachment: LocalUploadAttachment = {
-      file_size: file.size,
-      mime_type: file.type,
+      custom: {
+        file_size: file.size,
+        mime_type: file.type,
+      },
       localMetadata: {
         file,
         id: generateUUIDv4(),
@@ -456,8 +458,12 @@ export class AttachmentManager {
       localAttachment.thumb_url = fileLike.thumb_url;
     }
 
-    if (isFileReference(fileLike) && fileLike.duration) {
-      localAttachment.duration = fileLike.duration;
+    if (
+      isFileReference(fileLike) &&
+      fileLike.duration &&
+      localAttachment.type === 'voiceRecording'
+    ) {
+      localAttachment.custom.duration = fileLike.duration;
     }
 
     return localAttachment;
@@ -559,8 +565,7 @@ export class AttachmentManager {
           mimeType: fileLike.type,
         });
 
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const { duration, ...result } = await this.channel[
+    const { duration: _duration, ...result } = await this.channel[
       isImageFile(fileLike) ? 'sendImage' : 'sendFile'
     ](file, undefined, undefined, undefined, axiosUploadConfig);
     return result;

package/src/messageComposer/configuration/types.ts

@@ -2,7 +2,7 @@ import type { LinkPreview } from '../linkPreviewsManager';
 import type { FileUploadFilter } from '../attachmentManager';
 import type { MessageComposer } from '../messageComposer';
 import type { FileLike, FileReference } from '../types';
-import type { CommandResponse, UserResponse } from '../../types';
+import type { Command, UserResponse } from '../../types';
 
 export type MinimumUploadRequestResult = { file: string; thumb_url?: string } & Partial<
   Record<string, unknown>
@@ -41,14 +41,14 @@ export type TextComposerConfig = {
 };
 
 export type CommandSendability = {
-  command: CommandResponse;
+  command: Command;
   ready: boolean;
   reason?: string & {};
   metadata?: Record<string, unknown>;
 };
 
 export type CommandSendValidationContext = {
-  command: CommandResponse;
+  command: Command;
   composer: MessageComposer;
   commandArgsText: string;
   mentionedUsersInText: UserResponse[];
@@ -80,17 +80,17 @@ export type AttachmentManagerConfig = {
   /** Function that allows to customize the upload request. */
   doUploadRequest?: UploadRequestFn;
   /**
-   * When true, the attachment manager sets `localMetadata.uploadProgress` and passes `options.onProgress`
-   * to `doUploadRequest` (built-in and custom). Set to false to disable progress tracking.
-   * @default true
+   * When `true`, the attachment manager sets `localMetadata.uploadProgress` and passes
+   * `options.onProgress` to `doUploadRequest` (built-in and custom). Set to `false` to disable
+   * progress tracking (defaults to `true`).
    */
   trackUploadProgress: boolean;
 };
 
 export type LinkPreviewsManagerConfig = {
-  /** Number of milliseconds to debounce firing the URL enrichment queries when typing. The default value is 1500(ms). */
+  /** Number of milliseconds to debounce firing the URL enrichment queries when typing (defaults to `1500`). */
   debounceURLEnrichmentMs: number;
-  /** Allows for toggling the URL enrichment and link previews in `MessageInput`. By default, the feature is disabled. */
+  /** Allows for toggling the URL enrichment and link previews in `MessageInput` (defaults to `false`). */
   enabled: boolean;
   /** Custom function to identify URLs in a string and request OG data */
   findURLFn: (text: string) => string[];
@@ -100,11 +100,11 @@ export type LinkPreviewsManagerConfig = {
 
 export type LocationComposerConfig = {
   /**
-   * Allows for toggling the location addition.
-   * By default, the feature is enabled but has to be enabled also on channel level config via shared_locations.
+   * Allows for toggling the location addition (defaults to `true`). The feature also has to be
+   * enabled at the channel-level config via `shared_locations`.
    */
   enabled: boolean;
-  /** Function that provides a stable id for a device from which the location is shared */
+  /** Function that provides a stable ID for the device from which the location is shared. */
   getDeviceId: () => string;
 };
 

package/src/messageComposer/linkPreviewsManager.ts

@@ -18,13 +18,13 @@ export interface ILinkPreviewsManager {
 }
 
 export enum LinkPreviewStatus {
-  /** Link preview has been dismissed using **/
+  /** Link preview has been dismissed using */
   DISMISSED = 'dismissed',
-  /** Link preview could not be loaded, the enrichment request has failed. **/
+  /** Link preview could not be loaded, the enrichment request has failed. */
   FAILED = 'failed',
-  /** Link preview has been successfully loaded. **/
+  /** Link preview has been successfully loaded. */
   LOADED = 'loaded',
-  /** The enrichment query is in progress for a given link. **/
+  /** The enrichment query is in progress for a given link. */
   LOADING = 'loading',
   /** The preview reference enrichment has not begun. Default status if not set. */
   PENDING = 'pending',
@@ -238,10 +238,9 @@ export class LinkPreviewsManager implements ILinkPreviewsManager {
     await Promise.all(
       newLinkPreviews.map(async (linkPreview) => {
         try {
-          // eslint-disable-next-line @typescript-eslint/no-unused-vars
-          const { duration, ...ogAttachment } = await this.client.enrichURL(
-            linkPreview.og_scrape_url,
-          );
+          const { duration: _duration, ...ogAttachment } = await this.client.getOG({
+            url: linkPreview.og_scrape_url,
+          });
           if (this.shouldDiscardEnrichQueries) return;
           // due to typing and text changes, the URL may not be anymore in the store
           if (this.previews.has(linkPreview.og_scrape_url)) {
@@ -302,6 +301,7 @@ export class LinkPreviewsManager implements ILinkPreviewsManager {
         ...finalPreview,
         og_scrape_url: url,
         status,
+        custom: {},
       }),
     });
   };
@@ -330,8 +330,7 @@ export class LinkPreviewsManager implements ILinkPreviewsManager {
     preview.status === LinkPreviewStatus.PENDING;
 
   static getPreviewData = (preview: LinkPreview) => {
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const { status, ...data } = preview;
+    const { status: _status, ...data } = preview;
     return data;
   };
 }

package/src/messageComposer/messageComposer.ts

@@ -13,21 +13,22 @@ import {
 } from './middleware';
 import type { Unsubscribe } from '../store';
 import { StateStore } from '../store';
-import { formatMessage, generateUUIDv4, isLocalMessage, unformatMessage } from '../utils';
+import { formatMessage, generateUUIDv4, isLocalMessage } from '../utils';
 import { mergeWith } from '../utils/mergeWith';
 import { Channel } from '../channel';
 import { Thread } from '../thread';
 import type {
-  ChannelAPIResponse,
-  CommandResponse,
+  Attachment,
+  ChannelStateResponseFields,
+  Command,
   DraftMessage,
   DraftResponse,
-  EventTypes,
+  EventType,
   LocalMessage,
-  LocalMessageBase,
   MessageResponse,
-  MessageResponseBase,
+  UserResponse,
 } from '../types';
+import { chatLoggerSystem } from '../logger';
 import { WithSubscriptions } from '../utils/WithSubscriptions';
 import type { StreamChat } from '../client';
 import type { CommandSendability, MessageComposerConfig } from './configuration/types';
@@ -83,13 +84,14 @@ export type MessageComposerSnapshot = {
 };
 
 export type LocalMessageWithLegacyThreadId = LocalMessage & { legacyThreadId?: string };
+// todo: remove LocalMessageWithLegacyThreadId
 export type CompositionContext = Channel | Thread | LocalMessageWithLegacyThreadId;
 
 export type MessageComposerState = {
   id: string;
   draftId: string | null;
   pollId: string | null;
-  quotedMessage: LocalMessageBase | null;
+  quotedMessage: LocalMessage | null;
   showReplyInChannel: boolean;
   /**
    * Baseline snapshot of the message being edited (if any).
@@ -161,14 +163,15 @@ const initState = (
     draftId,
     id,
     pollId: message.poll_id ?? null,
-    quotedMessage: quotedMessage
-      ? formatMessage(quotedMessage as MessageResponseBase)
-      : null,
+    quotedMessage: quotedMessage ? formatMessage(quotedMessage) : null,
     showReplyInChannel: false,
     editedMessage,
   };
 };
 
+const logger = chatLoggerSystem.getLogger('message-composer');
+const offlineDbLogger = chatLoggerSystem.getLogger('offline-db');
+
 export class MessageComposer extends WithSubscriptions {
   readonly channel: Channel;
   readonly state: StateStore<MessageComposerState>;
@@ -385,7 +388,7 @@ export class MessageComposer extends WithSubscriptions {
   }
 
   getCommandDisabledReason = (
-    command: CommandResponse,
+    command: Command,
   ): CommandSuggestionDisabledReason | undefined => {
     if (this.editedMessage) return 'editing';
 
@@ -399,11 +402,10 @@ export class MessageComposer extends WithSubscriptions {
     return undefined;
   };
 
-  isCommandDisabled = (command: CommandResponse) =>
-    !!this.getCommandDisabledReason(command);
+  isCommandDisabled = (command: Command) => !!this.getCommandDisabledReason(command);
 
   validateCommandSendability = (
-    command: CommandResponse,
+    command: Command,
     text = this.textComposer.text,
   ): CommandSendability => {
     const currentMentionedUsers = this.textComposer.mentionedUsers;
@@ -505,8 +507,8 @@ export class MessageComposer extends WithSubscriptions {
     this.state.next(initState(composition));
   };
 
-  initStateFromChannelResponse = (channelApiResponse: ChannelAPIResponse) => {
-    if (this.channel.cid !== channelApiResponse.channel.cid) {
+  initStateFromChannelResponse = (channelApiResponse: ChannelStateResponseFields) => {
+    if (this.channel.cid !== channelApiResponse.channel?.cid) {
       return;
     }
     if (channelApiResponse.draft) {
@@ -615,12 +617,12 @@ export class MessageComposer extends WithSubscriptions {
 
   private subscribeMessageUpdated = () => {
     // todo: test the impact of 'reaction.new', 'reaction.deleted', 'reaction.updated'
-    const eventTypes: EventTypes[] = [
+    const eventTypes = [
       'message.updated',
       'reaction.new',
       'reaction.deleted', // todo: do we need to subscribe to this especially when the whole state is overriden?
       'reaction.updated', // todo: do we need to subscribe to this especially when the whole state is overriden?
-    ];
+    ] satisfies EventType[];
 
     const unsubscribeFunctions = eventTypes.map(
       (eventType) =>
@@ -640,15 +642,16 @@ export class MessageComposer extends WithSubscriptions {
 
   private subscribeMessageComposerSetupStateChange = () => {
     let tearDown: (() => void) | null = null;
-    const unsubscribe = this.client._messageComposerSetupState.subscribeWithSelector(
-      ({ setupFunction: setup }) => ({
-        setup,
-      }),
-      ({ setup }) => {
-        tearDown?.();
-        tearDown = setup?.({ composer: this }) ?? null;
-      },
-    );
+    const unsubscribe =
+      this.client.instanceConfigurationService.MessageComposer.subscribeWithSelector(
+        ({ setupFunction: setup }) => ({
+          setup,
+        }),
+        ({ setup }) => {
+          tearDown?.();
+          tearDown = setup?.({ composer: this }) ?? null;
+        },
+      );
 
     return () => {
       tearDown?.();
@@ -864,20 +867,21 @@ export class MessageComposer extends WithSubscriptions {
           type: 'regular',
         },
         localMessage: {
-          attachments: [],
+          attachments: [] as Attachment[],
+          cid: this.channel.cid, // it is needed to match local paginator filters to be ingested into its state
           created_at, // only assigned to localMessage as this is used for optimistic update
-          deleted_at: null,
+          deleted_at: undefined,
           error: undefined,
           id: this.id,
-          mentioned_users: [],
+          mentioned_users: [] as UserResponse[],
           parent_id: this.threadId ?? undefined,
-          pinned_at: this.editedMessage?.pinned_at || null,
-          reaction_groups: null,
+          pinned_at: this.editedMessage?.pinned_at || undefined,
+          reaction_groups: undefined,
           status: this.editedMessage ? this.editedMessage.status : 'sending',
           text,
           type: 'regular',
           updated_at: created_at,
-        },
+        } as LocalMessage,
         sendOptions: {},
       },
     });
@@ -891,7 +895,12 @@ export class MessageComposer extends WithSubscriptions {
     const { state, status } = await this.draftCompositionMiddlewareExecutor.execute({
       eventName: 'compose',
       initialValue: {
-        draft: { id: this.id, parent_id: this.threadId ?? undefined, text: '' },
+        draft: {
+          id: this.id,
+          parent_id: this.threadId ?? undefined,
+          text: '',
+          custom: {},
+        },
       },
     });
     if (status === 'discard') return;
@@ -911,23 +920,20 @@ export class MessageComposer extends WithSubscriptions {
       try {
         const optimisticDraftResponse = {
           channel_cid: this.channel.cid,
-          created_at: new Date().toISOString(),
+          created_at: new Date(),
           message: draft as DraftMessage,
           parent_id: draft.parent_id,
-          quoted_message: this.quotedMessage
-            ? unformatMessage(this.quotedMessage)
-            : undefined,
+          quoted_message: this.quotedMessage ?? undefined,
         };
         await this.client.offlineDb.upsertDraft({ draft: optimisticDraftResponse });
       } catch (error) {
-        this.client.logger('error', `offlineDb:upsertDraft`, {
-          tags: ['channel', 'offlineDb'],
-          error,
-        });
+        offlineDbLogger
+          .withExtraTags('createDraft', this.channel.cid)
+          .error('Upserting the draft to the offline database failed.', { error });
       }
     }
     this.logDraftUpdateTimestamp();
-    await this.channel.createDraft(draft);
+    await this.channel.createDraft({ message: draft });
   };
 
   deleteDraft = async () => {
@@ -941,10 +947,9 @@ export class MessageComposer extends WithSubscriptions {
           parent_id: parentId,
         });
       } catch (error) {
-        this.client.logger('error', `offlineDb:deleteDraft`, {
-          tags: ['channel', 'offlineDb'],
-          error,
-        });
+        offlineDbLogger
+          .withExtraTags('deleteDraft', this.channel.cid)
+          .error('Deleting the draft from the offline database failed.', { error });
       }
     }
     this.logDraftUpdateTimestamp();
@@ -952,11 +957,11 @@ export class MessageComposer extends WithSubscriptions {
   };
 
   getDraft = async () => {
-    if (this.editedMessage || !this.config.drafts.enabled || !this.client.userID) return;
+    if (this.editedMessage || !this.config.drafts.enabled || !this.client.userId) return;
 
     const draftFromOfflineDB = await this.client.offlineDb?.getDraft({
       cid: this.channel.cid,
-      userId: this.client.userID,
+      userId: this.client.userId,
       parent_id: this.threadId ?? undefined,
     });
 
@@ -983,10 +988,9 @@ export class MessageComposer extends WithSubscriptions {
 
       this.initState({ composition: draft });
     } catch (error) {
-      this.client.logger('error', `messageComposer:getDraft`, {
-        tags: ['channel', 'messageComposer'],
-        error,
-      });
+      logger
+        .withExtraTags('getDraft', this.channel.cid)
+        .error('Retrieving the draft from the server failed.', { error });
     }
   };
 

package/src/messageComposer/middleware/messageComposer/attachments.ts

@@ -10,8 +10,7 @@ import type {
 } from './types';
 
 const localAttachmentToAttachment = (localAttachment: LocalAttachment) => {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  const { localMetadata, ...attachment } = localAttachment;
+  const { localMetadata: _localMetadata, ...attachment } = localAttachment;
   return attachment as Attachment;
 };
 

package/src/messageComposer/middleware/messageComposer/cleanData.ts

@@ -39,7 +39,7 @@ export const createCompositionDataCleanupMiddleware = (
           ...editedMessagePayloadToBeSent,
           ...state.message,
           ...common,
-        },
+        } as typeof state.message,
         sendOptions:
           composer.editedMessage && state.sendOptions?.skip_enrich_url
             ? { skip_enrich_url: state.sendOptions?.skip_enrich_url }

package/src/messageComposer/middleware/messageComposer/compositionValidation.ts

@@ -1,5 +1,5 @@
 import { textIsEmpty } from '../../textComposer';
-import type { CommandResponse } from '../../../types';
+import type { Command } from '../../../types';
 import { CommandSearchSource } from '../textComposer/commands';
 import {
   getCommandByName,
@@ -20,7 +20,7 @@ const getDisabledRawCommand = (
   composer: MessageComposer,
   searchSource: CommandSearchSource,
   text?: string,
-): CommandResponse | undefined => {
+): Command | undefined => {
   const rawCommand = getCommandByName(searchSource, getRawCommandName(text));
   if (rawCommand && composer.isCommandDisabled(rawCommand)) {
     return rawCommand;

package/src/messageComposer/middleware/messageComposer/messageComposerState.ts

@@ -5,7 +5,7 @@ import type {
   MessageDraftCompositionMiddleware,
 } from './types';
 import type { MessageComposer } from '../../messageComposer';
-import type { LocalMessage, LocalMessageBase } from '../../../types';
+import type { LocalMessage } from '../../../types';
 import type { MiddlewareHandlerParams } from '../../../middleware';
 
 export const createMessageComposerStateCompositionMiddleware = (
@@ -37,7 +37,7 @@ export const createMessageComposerStateCompositionMiddleware = (
         localMessage: {
           ...state.localMessage,
           ...payload,
-          quoted_message: (composer.quotedMessage as LocalMessageBase) ?? undefined,
+          quoted_message: composer.quotedMessage ?? undefined,
         },
         message: {
           ...state.message,

package/src/messageComposer/middleware/messageComposer/sharedLocation.ts

@@ -1,4 +1,5 @@
 import type { MiddlewareHandlerParams } from '../../../middleware';
+import type { SharedLocationResponseData as Gen_SharedLocationResponseData } from '../../../gen/models';
 import type { MessageComposer } from '../../messageComposer';
 import type {
   MessageComposerMiddlewareState,
@@ -18,7 +19,7 @@ export const createSharedLocationCompositionMiddleware = (
       const { locationComposer } = composer;
       const location = locationComposer.validLocation;
       if (!locationComposer || !location || !composer.client.user) return forward();
-      const timestamp = new Date().toISOString();
+      const timestamp = new Date();
 
       return next({
         ...state,
@@ -30,12 +31,12 @@ export const createSharedLocationCompositionMiddleware = (
             created_at: timestamp,
             updated_at: timestamp,
             user_id: composer.client.user.id,
-          },
+          } as Gen_SharedLocationResponseData,
         },
         message: {
           ...state.message,
           shared_location: location,
-        },
+        } as typeof state.message,
       });
     },
   },

package/src/messageComposer/middleware/messageComposer/textComposer.ts

@@ -1,5 +1,5 @@
 import type { MiddlewareHandlerParams } from '../../../middleware';
-import type { DraftMessage, LocalMessage, UserResponse } from '../../../types';
+import type { LocalMessage, MessageRequest, UserResponse } from '../../../types';
 import type { MessageComposer } from '../../messageComposer';
 import { mentionEntityToUserResponse } from '../textComposer/mentionUtils';
 import type { MentionEntity } from '../textComposer/types';
@@ -30,7 +30,7 @@ type BuildMentionCompositionMetadataParams = {
 };
 
 type DraftMentionPayload = Pick<
-  DraftMessage,
+  MessageRequest,
   | 'mentioned_channel'
   | 'mentioned_group_ids'
   | 'mentioned_here'

package/src/messageComposer/middleware/messageComposer/types.ts

@@ -1,15 +1,14 @@
 import type { Middleware, MiddlewareExecutionResult } from '../../../middleware';
 import type {
-  DraftMessagePayload,
   LocalMessage,
-  Message,
+  MessageRequest,
   SendMessageOptions,
   UpdatedMessage,
 } from '../../../types';
 import type { MessageComposer } from '../../messageComposer';
 
 export type MessageComposerMiddlewareState = {
-  message: Message | UpdatedMessage;
+  message: MessageRequest | UpdatedMessage;
   localMessage: LocalMessage;
   sendOptions: SendMessageOptions;
 };
@@ -22,7 +21,7 @@ export type MessageComposerMiddlewareExecutorOptions = {
 };
 
 export type MessageDraftComposerMiddlewareValueState = {
-  draft: DraftMessagePayload;
+  draft: MessageRequest;
 };
 
 export type MessageDraftComposerMiddlewareExecutorOptions = {