mirror/whippy-edition
1
0
Fork 0
mirror of https://github.com/whippyshou/mastodon synced 2024-11-24 07:06:28 +09:00
Code

Fix errors when rendering RSS feeds (#18531)

Browse Source
This commit is contained in:
Eugen Rochko 2022-05-26 23:02:42 +02:00 committed by GitHub
parent 52f4e834f2
commit 0a1992430d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/formatting_helper.rb
View File

@ -23,7 +23,7 @@ module FormattingHelper
before_html = begin
if status.spoiler_text?
"<p><strong>#{I18n.t('rss.content_warning', locale: valid_locale_or_nil(status.language))}</strong> #{h(status.spoiler_text)}</p><hr />"
"<p><strong>#{I18n.t('rss.content_warning', locale: available_locale_or_nil(status.language) || I18n.default_locale)}</strong> #{h(status.spoiler_text)}</p><hr />"
else
''
end

4
app/helpers/languages_helper.rb
View File

@ -254,4 +254,8 @@ module LanguagesHelper
def valid_locale?(locale)
locale.present? && SUPPORTED_LOCALES.key?(locale.to_sym)
end
def available_locale_or_nil(locale_name)
locale_name.to_sym if locale_name.present? && I18n.available_locales.include?(locale_name.to_sym)
end
end

6
app/lib/rss/media_content.rb
View File

@ -26,4 +26,10 @@ class RSS::MediaContent < RSS::Element
description['type'] = 'plain'
end
end
def thumbnail(str)
append_element('media:thumbnail') do |thumbnail|
thumbnail['url'] = str
end
end
end