Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Handle hashtags in spoiler_texts (partial fix for #699) (#2683)

Browse source 
* 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
This commit is contained in:
R Tucker 2017-05-09 22:47:25 -04:00 • committed by Eugen Rochko
parent 3a38322a54
commit e2491680e6
4 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/lib/formatter.rb
View file

@ -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)