diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2018-04-27 01:38:10 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-27 01:38:10 +0200 |
commit | a872392cd958167d5d9dd3fef613415cc9068774 (patch) | |
tree | b062e9d8c7e87c29c74fb5416f3f60f39a172301 /app/lib/formatter.rb | |
parent | 63553c6b5c927950a45c5acb5af32af0dacee8c9 (diff) |
Add entity cache (#7271)
* Add entity cache Use a caching layer for mentions and custom emojis that are dynamically extracted from text. Reduce duplicate text extractions * Fix code style issue
Diffstat (limited to 'app/lib/formatter.rb')
-rw-r--r-- | app/lib/formatter.rb | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb index 4124f1660..050c651ee 100644 --- a/app/lib/formatter.rb +++ b/app/lib/formatter.rb @@ -52,12 +52,8 @@ class Formatter end 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 = account.local? ? linkify(account.note) : reformat(account.note) + html = encode_custom_emojis(html, account.emojis) if options[:custom_emojify] html.html_safe # rubocop:disable Rails/OutputSafety end @@ -211,7 +207,7 @@ class Formatter username, domain = acct.split('@') domain = nil if TagManager.instance.local_domain?(domain) - account = Account.find_remote(username, domain) + account = EntityCache.instance.mention(username, domain) account ? mention_html(account) : "@#{acct}" end |