github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-01 01:14:29 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

REFACTOR: Simplify finding the opengraph image

Browse Source 
* removes deprecation warnings for "logo url"
* adds the "large icon" as fallback before the "apple touch icon"
This commit is contained in:
Gerhard Schlager
2019-01-31 20:44:20 +01:00
parent 3500acf2f6
commit ec7f418a22
2 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/helpers/application_helper.rb
View File

@ -212,18 +212,18 @@ module ApplicationHelper
opts ||= {}
opts[:url] ||= "#{Discourse.base_url_no_prefix}#{request.fullpath}"
twitter_summary_large_image_url =
SiteSetting.site_twitter_summary_large_image_url
if opts[:image].blank?
twitter_summary_large_image_url = SiteSetting.site_twitter_summary_large_image_url
opengraph_image_url = SiteSetting.opengraph_image_url
if twitter_summary_large_image_url.present?
opts[:twitter_summary_large_image] = twitter_summary_large_image_url
end
if opts[:image].blank? && (opengraph_image_url.present? || twitter_summary_large_image_url.present?)
opts[:twitter_summary_large_image] = twitter_summary_large_image_url if twitter_summary_large_image_url.present?
opts[:image] = opengraph_image_url.present? ? opengraph_image_url : twitter_summary_large_image_url
elsif opts[:image].blank? && SiteSetting.site_apple_touch_icon_url.present?
opts[:image] = SiteSetting.site_apple_touch_icon_url
elsif opts[:image].blank? && SiteSetting.logo_url.present?
opts[:image] = SiteSetting.logo_url
opts[:image] = SiteSetting.opengraph_image_url.presence ||
twitter_summary_large_image_url.presence ||
SiteSetting.site_large_icon_url.presence ||
SiteSetting.site_apple_touch_icon_url.presence ||
SiteSetting.site_logo_url.presence
end
# Use the correct scheme for opengraph/twitter image