From 59948a7b7e238d41fc281e03e6e637eab2bb8e5c Mon Sep 17 00:00:00 2001 From: Kevin Ansfield Date: Fri, 5 Feb 2021 09:24:26 +0000 Subject: [PATCH] Added site twitter/facebook and cover image fallbacks to social previews refs https://github.com/TryGhost/Ghost/commit/f3e0949c730b1c59aff952b7cdcd297d40188678 - Ghost has been updated to use the additional fallbacks, we should reflect this in the Admin social previews too --- ghost/admin/app/components/gh-post-settings-menu.js | 4 ++-- ghost/admin/app/components/modal-post-preview/social.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ghost/admin/app/components/gh-post-settings-menu.js b/ghost/admin/app/components/gh-post-settings-menu.js index faa8f16e91..2edb9877ff 100644 --- a/ghost/admin/app/components/gh-post-settings-menu.js +++ b/ghost/admin/app/components/gh-post-settings-menu.js @@ -41,10 +41,10 @@ export default Component.extend(SettingsMenuMixin, { slugValue: boundOneWay('post.slug'), facebookDescription: or('ogDescriptionScratch', 'customExcerptScratch', 'seoDescription', 'post.excerpt', 'settings.description', ''), - facebookImage: or('post.ogImage', 'post.featureImage'), + facebookImage: or('post.ogImage', 'post.featureImage', 'settings.ogImage', 'settings.coverImage'), facebookTitle: or('ogTitleScratch', 'seoTitle'), twitterDescription: or('twitterDescriptionScratch', 'customExcerptScratch', 'seoDescription', 'post.excerpt', 'settings.description', ''), - twitterImage: or('post.twitterImage', 'post.featureImage'), + twitterImage: or('post.twitterImage', 'post.featureImage', 'settings.twitterImage', 'settings.coverImage'), twitterTitle: or('twitterTitleScratch', 'seoTitle'), showVisibilityInput: or('session.user.isOwner', 'session.user.isAdmin', 'session.user.isEditor'), diff --git a/ghost/admin/app/components/modal-post-preview/social.js b/ghost/admin/app/components/modal-post-preview/social.js index 57937261cd..23d3a240f8 100644 --- a/ghost/admin/app/components/modal-post-preview/social.js +++ b/ghost/admin/app/components/modal-post-preview/social.js @@ -55,7 +55,7 @@ export default class ModalPostPreviewSocialComponent extends Component { } get facebookImage() { - return this.args.post.ogImage || this.args.post.featureImage; + return this.args.post.ogImage || this.args.post.featureImage || this.settings.get('ogImage') || this.settings.get('coverImage'); } // Twitter @@ -69,6 +69,6 @@ export default class ModalPostPreviewSocialComponent extends Component { } get twitterImage() { - return this.args.post.twitterImage || this.args.post.featureImage; + return this.args.post.twitterImage || this.args.post.featureImage || this.settings.get('twitterImage') || this.settings.get('coverImage'); } }