From a771fc04328789f336ceb14cac7d46c186a3fb25 Mon Sep 17 00:00:00 2001 From: AudreyKj <38159391+AudreyKj@users.noreply.github.com> Date: Fri, 4 Jun 2021 14:09:32 +0200 Subject: [PATCH] [#1913] fixed last message for image from google (#1918) --- .../render/SourceMessagePreview.tsx | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/lib/typescript/render/SourceMessagePreview.tsx b/lib/typescript/render/SourceMessagePreview.tsx index 4161f1e804..4a33ba23fc 100644 --- a/lib/typescript/render/SourceMessagePreview.tsx +++ b/lib/typescript/render/SourceMessagePreview.tsx @@ -18,6 +18,16 @@ const FormattedMessage = ({message}: FormattedMessageProps) => { return
; }; +const isImageFromGoogleSource = (messageText: string) => { + if (!messageText) return false; + + return ( + messageText.includes('https://storage.googleapis.com') && + messageText.toLowerCase().includes('x-goog-algorithm') && + messageText.toLowerCase().includes('x-goog-credential') + ); +}; + export const SourceMessagePreview = (props: SourceMessagePreviewProps) => { const {conversation} = props; @@ -43,7 +53,11 @@ export const SourceMessagePreview = (props: SourceMessagePreviewProps) => { return text; } } - if (lastMessageContent.text || lastMessageContent.message?.text) { + + if ( + (lastMessageContent.text || lastMessageContent.message?.text) && + !isImageFromGoogleSource(lastMessageContent.message?.text) + ) { return ; } else if (lastMessageContent.suggestionResponse) { return <>{conversation.lastMessage.content.suggestionResponse.text}; @@ -54,7 +68,10 @@ export const SourceMessagePreview = (props: SourceMessagePreviewProps) => { const lastMessageContent = conversation.lastMessage.content; if (!lastMessageContent.attachment) { - if (lastMessageContent.message?.attachments?.[0].type === 'image') { + if ( + lastMessageContent.message?.attachments?.[0].type === 'image' || + isImageFromGoogleSource(lastMessageContent.message?.text) + ) { return ; } else if (lastMessageContent.message?.attachments?.[0].type === 'video') { return ;