diff options
author | David Underwood <davefp@gmail.com> | 2018-04-01 17:55:42 -0400 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-04-01 23:55:42 +0200 |
commit | 123a343d116d3e83cbd04460cc7bd0b6f3d208c4 (patch) | |
tree | 7d834be5438d835fe90744e0ba011f585cf252b1 /app/lib/formatter.rb | |
parent | f464f98fd3b8ef33b3afa5acf09e829c046134de (diff) |
[WIP] Enable custom emoji on account pages and in the sidebar (#6124)
Federate custom emojis with accounts
Diffstat (limited to 'app/lib/formatter.rb')
-rw-r--r-- | app/lib/formatter.rb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb index 1df4ff8d4..f7e7a3c23 100644 --- a/app/lib/formatter.rb +++ b/app/lib/formatter.rb @@ -51,9 +51,14 @@ class Formatter strip_tags(text) end - def simplified_format(account) - return reformat(account.note).html_safe unless account.local? # rubocop:disable Rails/OutputSafety - linkify(account.note) + def simplified_format(account, **options) + html = if account.local? + linkify(account.note) + else + reformat(account.note) + end + html = encode_custom_emojis(html, CustomEmoji.from_text(account.note, account.domain)) if options[:custom_emojify] + html.html_safe # rubocop:disable Rails/OutputSafety end def sanitize(html, config) |