diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-09-23 01:50:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-23 01:50:17 +0200 |
| commit | 9c8e602163811fc9a21c5ae78d53d46d7dbc8db7 (patch) | |
| tree | 2588674edc8940dae61cf94c7ff98ba10100fa80 | |
| parent | 846cd4e8381c891816cf814582304b534db4ee5f (diff) | |
Fix custom emojis not detected when used in content warning (#5049)
| -rw-r--r-- | app/lib/formatter.rb | 6 | ||||
| -rw-r--r-- | app/models/status.rb | 2 | ||||
| -rw-r--r-- | app/views/stream_entries/_detailed_status.html.haml | 2 | ||||
| -rw-r--r-- | app/views/stream_entries/_simple_status.html.haml | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb index 8d69cb948..42cd72990 100644 --- a/app/lib/formatter.rb +++ b/app/lib/formatter.rb @@ -63,6 +63,12 @@ class Formatter Sanitize.fragment(html, config) end + def format_spoiler(status) + html = encode(status.spoiler_text) + html = encode_custom_emojis(html, status.emojis) + html.html_safe # rubocop:disable Rails/OutputSafety + end + private def encode(html) diff --git a/app/models/status.rb b/app/models/status.rb index ca261a201..f11064cbd 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -132,7 +132,7 @@ class Status < ApplicationRecord end def emojis - CustomEmoji.from_text(text, account.domain) + CustomEmoji.from_text([spoiler_text, text].join(' '), account.domain) end after_create :store_uri, if: :local? diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml index 6860c6bf3..26e41a10d 100644 --- a/app/views/stream_entries/_detailed_status.html.haml +++ b/app/views/stream_entries/_detailed_status.html.haml @@ -15,7 +15,7 @@ .status__content.p-name.emojify< - if status.spoiler_text? %p{ style: 'margin-bottom: 0' }< - %span.p-summary> #{status.spoiler_text} + %span.p-summary> #{Formatter.instance.format_spoiler(status)} %a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more') .e-content{ lang: status.language, style: "display: #{status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status, custom_emojify: true) diff --git a/app/views/stream_entries/_simple_status.html.haml b/app/views/stream_entries/_simple_status.html.haml index c0ea11633..b594c9da6 100644 --- a/app/views/stream_entries/_simple_status.html.haml +++ b/app/views/stream_entries/_simple_status.html.haml @@ -16,7 +16,7 @@ .status__content.p-name.emojify< - if status.spoiler_text? %p{ style: 'margin-bottom: 0' }< - %span.p-summary> #{status.spoiler_text} + %span.p-summary> #{Formatter.instance.format_spoiler(status)} %a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more') .e-content{ lang: status.language, style: "display: #{status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status, custom_emojify: true) |