hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix custom emojis not detected when used in content warning (#5049)

signup-info-prompt
Eugen Rochko 2017-09-23 01:50:17 +02:00 committed by GitHub
parent 846cd4e838
commit 9c8e602163
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/lib/formatter.rb
View File

@ -63,6 +63,12 @@ class Formatter
Sanitize.fragment(html, config) Sanitize.fragment(html, config)
end 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 private
def encode(html) def encode(html)

2
app/models/status.rb
View File

@ -132,7 +132,7 @@ class Status < ApplicationRecord
end end
def emojis def emojis
CustomEmoji.from_text(text, account.domain) CustomEmoji.from_text([spoiler_text, text].join(' '), account.domain)
end end
after_create :store_uri, if: :local? after_create :store_uri, if: :local?

2
app/views/stream_entries/_detailed_status.html.haml
View File

@ -15,7 +15,7 @@
.status__content.p-name.emojify< .status__content.p-name.emojify<
- if status.spoiler_text? - if status.spoiler_text?
%p{ style: 'margin-bottom: 0' }< %p{ style: 'margin-bottom: 0' }<
%span.p-summary> #{status.spoiler_text}&nbsp; %span.p-summary> #{Formatter.instance.format_spoiler(status)}&nbsp;
%a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more') %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) .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)

2
app/views/stream_entries/_simple_status.html.haml
View File

@ -16,7 +16,7 @@
.status__content.p-name.emojify< .status__content.p-name.emojify<
- if status.spoiler_text? - if status.spoiler_text?
%p{ style: 'margin-bottom: 0' }< %p{ style: 'margin-bottom: 0' }<
%span.p-summary> #{status.spoiler_text}&nbsp; %span.p-summary> #{Formatter.instance.format_spoiler(status)}&nbsp;
%a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more') %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) .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)