tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable custom emojis in profiles (notes, field values, display names) (#7374)

Browse Source 
Follow-up to #6124
This commit is contained in:
Eugen Rochko
2018-05-06 11:48:51 +02:00
committed by GitHub
parent bd10a7e480
commit 61a9018607
17 changed files with 43 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/lib/formatter.rb
View File

@ -67,9 +67,17 @@ class Formatter
html.html_safe # rubocop:disable Rails/OutputSafety
end
def format_field(account, str)
def format_display_name(account, **options)
html = encode(account.display_name.presence || account.username)
html = encode_custom_emojis(html, account.emojis) if options[:custom_emojify]
html.html_safe # rubocop:disable Rails/OutputSafety
end
def format_field(account, str, **options)
return reformat(str).html_safe unless account.local? # rubocop:disable Rails/OutputSafety
encode_and_link_urls(str, me: true).html_safe # rubocop:disable Rails/OutputSafety
html = encode_and_link_urls(str, me: true)
html = encode_custom_emojis(html, account.emojis) if options[:custom_emojify]
html.html_safe # rubocop:disable Rails/OutputSafety
end
def linkify(text)