summaryrefslogtreecommitdiffstats
path: root/app/lib
diff options
context:
space:
mode:
Diffstat (limited to 'app/lib')
-rw-r--r--app/lib/entity_cache.rb2
-rw-r--r--app/lib/inline_renderer.rb4
2 files changed, 5 insertions, 1 deletions
diff --git a/app/lib/entity_cache.rb b/app/lib/entity_cache.rb
index 8fff544a054..35a3773d2d8 100644
--- a/app/lib/entity_cache.rb
+++ b/app/lib/entity_cache.rb
@@ -8,7 +8,7 @@ class EntityCache
MAX_EXPIRATION = 7.days.freeze
def mention(username, domain)
- Rails.cache.fetch(to_key(:mention, username, domain), expires_in: MAX_EXPIRATION) { Account.select(:username, :domain, :url).find_remote(username, domain) }
+ Rails.cache.fetch(to_key(:mention, username, domain), expires_in: MAX_EXPIRATION) { Account.select(:id, :username, :domain, :url).find_remote(username, domain) }
end
def emoji(shortcodes, domain)
diff --git a/app/lib/inline_renderer.rb b/app/lib/inline_renderer.rb
index 761a8822dfb..27e334a4de6 100644
--- a/app/lib/inline_renderer.rb
+++ b/app/lib/inline_renderer.rb
@@ -15,6 +15,10 @@ class InlineRenderer
serializer = REST::NotificationSerializer
when :conversation
serializer = REST::ConversationSerializer
+ when :announcement
+ serializer = REST::AnnouncementSerializer
+ when :reaction
+ serializer = REST::ReactionSerializer
else
return
end