Reviews

RocketChat · Jun 17, 2024 · 8468f30 · 8468f30
1 parent 2a2f4a4
commit 8468f30
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 26 deletions.
diff --git a/apps/meteor/client/components/message/variants/room/RoomMessageContent.tsx b/apps/meteor/client/components/message/variants/room/RoomMessageContent.tsx
@@ -1,5 +1,5 @@
-import type { IMessage, MessageAttachment, MessageQuoteAttachment } from '@rocket.chat/core-typings';
-import { isDiscussionMessage, isThreadMainMessage, isE2EEMessage } from '@rocket.chat/core-typings';
+import type { IMessage } from '@rocket.chat/core-typings';
+import { isDiscussionMessage, isThreadMainMessage, isE2EEMessage, isQuoteAttachment } from '@rocket.chat/core-typings';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { useSetting, useTranslation, useUserId } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
@@ -44,10 +44,6 @@ const RoomMessageContent = ({ message, unread, all, mention, searchText }: RoomM
 
 	const normalizedMessage = useNormalizedMessage(message);
 
-	function isQuoteAttachment(attachment: MessageAttachment): attachment is MessageQuoteAttachment {
-		return !!(attachment as MessageQuoteAttachment).author_name;
-	}
-
 	const quotes = normalizedMessage?.attachments?.filter(isQuoteAttachment) || [];
 
 	const attachments = normalizedMessage?.attachments?.filter((attachment) => !isQuoteAttachment(attachment)) || [];
@@ -70,7 +66,7 @@ const RoomMessageContent = ({ message, unread, all, mention, searchText }: RoomM
 				</>
 			)}
 
-			{!!attachments && <Attachments id={message.files?.[0]._id} attachments={attachments} />}
+			{!!attachments && <Attachments id={message.files?.[0]?._id} attachments={attachments} />}
 
 			{normalizedMessage.blocks && (
 				<UiKitMessageBlock rid={normalizedMessage.rid} mid={normalizedMessage._id} blocks={normalizedMessage.blocks} />

diff --git a/apps/meteor/client/components/message/variants/thread/ThreadMessageContent.tsx b/apps/meteor/client/components/message/variants/thread/ThreadMessageContent.tsx
@@ -1,5 +1,5 @@
-import type { IThreadMainMessage, IThreadMessage, MessageAttachment, MessageQuoteAttachment } from '@rocket.chat/core-typings';
-import { isE2EEMessage } from '@rocket.chat/core-typings';
+import type { IThreadMainMessage, IThreadMessage } from '@rocket.chat/core-typings';
+import { isE2EEMessage, isQuoteAttachment } from '@rocket.chat/core-typings';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { useSetting, useUserId, useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
@@ -37,10 +37,6 @@ const ThreadMessageContent = ({ message }: ThreadMessageContentProps): ReactElem
 
 	const normalizedMessage = useNormalizedMessage(message);
 
-	function isQuoteAttachment(attachment: MessageAttachment): attachment is MessageQuoteAttachment {
-		return !!(attachment as MessageQuoteAttachment).author_name;
-	}
-
 	const quotes = normalizedMessage?.attachments?.filter(isQuoteAttachment) || [];
 
 	const attachments = normalizedMessage?.attachments?.filter((attachment) => !isQuoteAttachment(attachment)) || [];
@@ -62,7 +58,7 @@ const ThreadMessageContent = ({ message }: ThreadMessageContentProps): ReactElem
 				<UiKitMessageBlock rid={normalizedMessage.rid} mid={normalizedMessage._id} blocks={normalizedMessage.blocks} />
 			)}
 
-			{!!attachments && <Attachments id={message.files?.[0]._id} attachments={attachments} />}
+			{!!attachments && <Attachments id={message.files?.[0]?._id} attachments={attachments} />}
 
 			{oembedEnabled && !!normalizedMessage.urls?.length && <UrlPreviews urls={normalizedMessage.urls} />}
 

diff --git a/apps/meteor/client/views/admin/moderation/helpers/ContextMessage.tsx b/apps/meteor/client/views/admin/moderation/helpers/ContextMessage.tsx
@@ -1,5 +1,5 @@
-import type { IMessage, MessageQuoteAttachment, MessageReport, MessageAttachment } from '@rocket.chat/core-typings';
-import { isE2EEMessage } from '@rocket.chat/core-typings';
+import type { IMessage, MessageReport, MessageAttachment } from '@rocket.chat/core-typings';
+import { isE2EEMessage, isQuoteAttachment } from '@rocket.chat/core-typings';
 import { Message, MessageName, MessageToolbarItem, MessageToolbarWrapper, MessageUsername } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
 import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
@@ -47,10 +47,6 @@ const ContextMessage = ({
 
 	const displayName = useUserDisplayName({ name, username });
 
-	function isQuoteAttachment(attachment: MessageAttachment): attachment is MessageQuoteAttachment {
-		return !!(attachment as MessageQuoteAttachment).author_name;
-	}
-
 	const quotes = message?.attachments?.filter(isQuoteAttachment) || [];
 
 	const attachments = message?.attachments?.filter((attachment: MessageAttachment) => !isQuoteAttachment(attachment)) || [];
@@ -85,7 +81,7 @@ const ContextMessage = ({
 							message.msg
 						)}
 
-						{!!attachments && <Attachments id={message.files?.[0]._id} attachments={attachments} />}
+						{!!attachments && <Attachments id={message.files?.[0]?._id} attachments={attachments} />}
 						{message.blocks && <UiKitMessageBlock rid={message.rid} mid={message._id} blocks={message.blocks} />}
 					</Message.Body>
 					<ReportReasonCollapsible>

diff --git a/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessage.tsx b/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessage.tsx
@@ -1,4 +1,4 @@
-import type { IMessage, MessageAttachment, MessageQuoteAttachment } from '@rocket.chat/core-typings';
+import { isQuoteAttachment, type IMessage, type MessageAttachment } from '@rocket.chat/core-typings';
 import {
 	Message as MessageTemplate,
 	MessageLeftContainer,
@@ -43,10 +43,6 @@ const ContactHistoryMessage: FC<{
 	const format = useFormatDate();
 	const formatTime = useFormatTime();
 
-	function isQuoteAttachment(attachment: MessageAttachment): attachment is MessageQuoteAttachment {
-		return !!(attachment as MessageQuoteAttachment).author_name;
-	}
-
 	const quotes = message?.attachments?.filter(isQuoteAttachment) || [];
 
 	const attachments = message?.attachments?.filter((attachment: MessageAttachment) => !isQuoteAttachment(attachment)) || [];