mastofe

commit: 9fe1619db94e3267b263633ecd4d05a840064215
parent: da70aca28eaa68f21c450c8f7b6ecb6168d29941
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Thu, 22 Mar 2018 11:31:17 +0100

Do not re-query mentions from serializers (#6858)

Fix performance regression from #6836
Diffstat:
M
app/serializers/activitypub/note_serializer.rb
2
+-
M
app/serializers/rest/status_serializer.rb
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb
@@ -57,7 +57,7 @@ class ActivityPub::NoteSerializer < ActiveModel::Serializer
   end
 
   def virtual_tags
-    object.mentions.order(:id) + object.tags + object.emojis
+    object.mentions.to_a.sort_by(&:id) + object.tags + object.emojis
   end
 
   def atom_uri
diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
@@ -87,7 +87,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
   end
 
   def ordered_mentions
-    object.mentions.order(:id)
+    object.mentions.to_a.sort_by(&:id)
   end
 
   class ApplicationSerializer < ActiveModel::Serializer