From 07a067b6c88b9915aff347a4c75cdd58486dea3f Mon Sep 17 00:00:00 2001 From: Mattermost Build Date: Wed, 15 Jul 2020 21:37:11 +0200 Subject: [PATCH] Automated cherry pick of #4571 (#4573) * Handle invalid YouTube links * Fallback to default thumbnail Co-authored-by: Elias Nahum --- .../post_body_additional_content.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/components/post_body_additional_content/post_body_additional_content.js b/app/components/post_body_additional_content/post_body_additional_content.js index 6143bbe0c..e104b4306 100644 --- a/app/components/post_body_additional_content/post_body_additional_content.js +++ b/app/components/post_body_additional_content/post_body_additional_content.js @@ -391,7 +391,16 @@ export default class PostBodyAdditionalContent extends ImageViewPort { getViewPortWidth(this.props.isReplyPost, this.hasPermanentSidebar()), ); - const imgUrl = Object.keys(this.props.metadata.images)[0] || `https://i.ytimg.com/vi/${videoId}/hqdefault.jpg`; + let imgUrl; + if (this.props.metadata?.images) { + imgUrl = Object.keys(this.props.metadata.images)[0]; + } + + if (!imgUrl) { + // Fallback to default YouTube thumbnail if available + imgUrl = `https://i.ytimg.com/vi/${videoId}/hqdefault.jpg`; + } + return (