diff options
| author | R Tucker <github@ryantucker.us> | 2017-05-09 22:47:25 -0400 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-10 04:47:25 +0200 |
| commit | e2491680e696d2c285a798ec4c66b26d2748df66 (patch) | |
| tree | 1c5438c06d4917b7c2e49fa64dc5e8bbf696496b | |
| parent | 3a38322a54f0eeb3eba037a4fd61a072bda44311 (diff) | |
Handle hashtags in spoiler_texts (partial fix for #699) (#2683)
* services: scan spoiler_text for hashtags (#699) * views: link hashtags from spoiler_texts This covers linking hashtags from within the spoiler text on the server-generated pages. * services: fix string concat going into hashtag RE Cleaner Ruby syntax, may handle immutable strings better
| -rw-r--r-- | app/lib/formatter.rb | 11 | ||||
| -rw-r--r-- | app/services/process_hashtags_service.rb | 3 | ||||
| -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, 15 insertions, 3 deletions
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb index 0f2989a81..7b5b8bab4 100644 --- a/app/lib/formatter.rb +++ b/app/lib/formatter.rb @@ -25,6 +25,17 @@ class Formatter sanitize(html, Sanitize::Config::MASTODON_STRICT).html_safe # rubocop:disable Rails/OutputSafety end + def format_spoiler(status) + return reformat(status.spoiler_text) unless status.local? + + html = status.spoiler_text + html = encode(html) + html = html.delete("\n") + html = link_hashtags(html) + + html.html_safe # rubocop:disable Rails/OutputSafety + end + def plaintext(status) return status.text if status.local? strip_tags(status.text) diff --git a/app/services/process_hashtags_service.rb b/app/services/process_hashtags_service.rb index 617a38159..eab033d50 100644 --- a/app/services/process_hashtags_service.rb +++ b/app/services/process_hashtags_service.rb @@ -2,7 +2,8 @@ class ProcessHashtagsService < BaseService def call(status, tags = []) - tags = status.text.scan(Tag::HASHTAG_RE).map(&:first) if status.local? + text = [status.text, status.spoiler_text].reject(&:empty?).join(' ') + tags = text.scan(Tag::HASHTAG_RE).map(&:first) if status.local? tags.map { |str| str.mb_chars.downcase }.uniq(&:to_s).each do |tag| status.tags << Tag.where(name: tag).first_or_initialize(name: tag) diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml index d22afb082..4cf94c83c 100644 --- a/app/views/stream_entries/_detailed_status.html.haml +++ b/app/views/stream_entries/_detailed_status.html.haml @@ -10,7 +10,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.content) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status) diff --git a/app/views/stream_entries/_simple_status.html.haml b/app/views/stream_entries/_simple_status.html.haml index 3fa347f74..583bb24f3 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.content) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status) |