From bf3f0be37ea94009b6fdec361e2df56dac5d7403 Mon Sep 17 00:00:00 2001 From: Maxim Zaks Date: Tue, 2 Jul 2019 22:14:29 +0200 Subject: [PATCH] Don't show preview if remove_link_preview is set to true (#2939) * Don't show preview if remove_link_preview is set to true * remove white spaces --- app/components/post_body_additional_content/index.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/components/post_body_additional_content/index.js b/app/components/post_body_additional_content/index.js index 481b1b5ec..115ecb98a 100644 --- a/app/components/post_body_additional_content/index.js +++ b/app/components/post_body_additional_content/index.js @@ -49,8 +49,10 @@ function makeMapStateToProps() { // Link previews used to be an advanced settings until server version 4.4 when it was changed to be a display setting. // We are checking both here until we bump the server requirement for the mobile apps. - const previewsEnabled = getBool(state, Preferences.CATEGORY_ADVANCED_SETTINGS, `${ViewTypes.FEATURE_TOGGLE_PREFIX}${ViewTypes.EMBED_PREVIEW}`) || - getBool(state, Preferences.CATEGORY_DISPLAY_SETTINGS, Preferences.LINK_PREVIEW_DISPLAY, true); + const previewsEnabled = (getBool(state, Preferences.CATEGORY_ADVANCED_SETTINGS, `${ViewTypes.FEATURE_TOGGLE_PREFIX}${ViewTypes.EMBED_PREVIEW}`) || + getBool(state, Preferences.CATEGORY_DISPLAY_SETTINGS, Preferences.LINK_PREVIEW_DISPLAY, true)); + + const removeLinkPreview = ownProps.postProps.remove_link_preview === 'true'; let openGraphData = getOpenGraphMetadataForUrl(state, link); if (!openGraphData) { @@ -63,7 +65,7 @@ function makeMapStateToProps() { googleDeveloperKey: config.GoogleDeveloperKey, link, openGraphData, - showLinkPreviews: previewsEnabled && config.EnableLinkPreviews === 'true', + showLinkPreviews: previewsEnabled && config.EnableLinkPreviews === 'true' && !removeLinkPreview, theme: getTheme(state), }; };