Skip to content

Commit d39d5c6

Browse files
Questionable changes
1 parent 4ce518c commit d39d5c6

2 files changed

Lines changed: 26 additions & 11 deletions

File tree

src/components/Channel/hooks/useEditMessageHandler.ts

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,40 @@
1-
import type { MessageRequest, StreamChat, UpdateMessageOptions } from 'stream-chat';
1+
import type {
2+
LocalMessage,
3+
MessageRequest,
4+
MessageResponse,
5+
StreamChat,
6+
UpdateMessageAPIResponse,
7+
UpdateMessageOptions,
8+
} from 'stream-chat';
29

310
import { useChatContext } from '../../../context/ChatContext';
411

512
type UpdateHandler = (
613
cid: string,
7-
updatedMessage: MessageRequest,
14+
updatedMessage: LocalMessage | MessageResponse,
815
options?: UpdateMessageOptions,
916
) => ReturnType<StreamChat['updateMessage']>;
1017

11-
export const useEditMessageHandler = (doUpdateMessageRequest?: UpdateHandler) => {
18+
export const useEditMessageHandler = (
19+
doUpdateMessageRequest?: UpdateHandler,
20+
): ((
21+
updatedMessage: LocalMessage | MessageResponse,
22+
options?: UpdateMessageOptions,
23+
) => Promise<UpdateMessageAPIResponse>) => {
1224
const { channel, client } = useChatContext('useEditMessageHandler');
1325

14-
return (updatedMessage: MessageRequest, options?: UpdateMessageOptions) => {
26+
return (
27+
updatedMessage: LocalMessage | MessageResponse,
28+
options?: UpdateMessageOptions,
29+
) => {
1530
if (doUpdateMessageRequest && channel) {
1631
return Promise.resolve(
1732
doUpdateMessageRequest(channel.cid, updatedMessage, options),
1833
);
1934
}
2035
return client.updateMessage({
21-
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
22-
id: updatedMessage.id!,
23-
message: updatedMessage,
36+
id: updatedMessage.id,
37+
message: updatedMessage as unknown as MessageRequest,
2438
...options,
2539
});
2640
};

src/components/MessageComposer/QuotedMessagePreview.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import {
2626
isVoiceRecordingAttachment,
2727
type LocalMessage,
2828
type MessageComposerState,
29+
type MessageResponse,
2930
type PollResponseData,
3031
type SharedLocationResponseData,
3132
type TranslationLanguages,
@@ -55,7 +56,7 @@ const messageComposerStateStoreSelector = (state: MessageComposerState) => ({
5556
});
5657

5758
export type QuotedMessagePreviewProps = {
58-
getQuotedMessageAuthor?: (message: LocalMessage) => string;
59+
getQuotedMessageAuthor?: (message: LocalMessage | MessageResponse) => string;
5960
renderText?: MessageContextValue['renderText'];
6061
};
6162

@@ -96,7 +97,7 @@ type GroupedAttachments = Record<AttachmentType, Attachment[]> & {
9697
total: number;
9798
};
9899

99-
const getGroupedAttachments = (quotedMessage: LocalMessage | null) => {
100+
const getGroupedAttachments = (quotedMessage: LocalMessage | MessageResponse | null) => {
100101
const groupedAttachments = {
101102
documents: [],
102103
giphies: [],
@@ -169,7 +170,7 @@ type PreviewType =
169170
| 'mixed';
170171

171172
const getAttachmentIconWithType = (
172-
quotedMessage: LocalMessage | null,
173+
quotedMessage: LocalMessage | MessageResponse | null,
173174
giphyVersionName: GiphyVersions,
174175
): {
175176
groupedAttachments: GroupedAttachments;
@@ -314,7 +315,7 @@ export const QuotedMessagePreview = ({
314315
};
315316

316317
type QuotedMessagePreviewUIProps = QuotedMessagePreviewProps & {
317-
quotedMessage: LocalMessage;
318+
quotedMessage: LocalMessage | MessageResponse;
318319
authorLabel?: ReactNode;
319320
className?: string;
320321
onClick?: MouseEventHandler<HTMLDivElement>;

0 commit comments

Comments
 (0)