nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Fix performance regression from #6836
This commit is contained in:
Eugen Rochko 2018-03-22 11:31:17 +01:00 committed by GitHub
parent da70aca28e
commit 9fe1619db9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/serializers/activitypub/note_serializer.rb
View File

@ -57,7 +57,7 @@ class ActivityPub::NoteSerializer < ActiveModel::Serializer
end end
def virtual_tags def virtual_tags
object.mentions.order(:id) + object.tags + object.emojis object.mentions.to_a.sort_by(&:id) + object.tags + object.emojis
end end
def atom_uri def atom_uri

2
app/serializers/rest/status_serializer.rb
View File

@ -87,7 +87,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
end end
def ordered_mentions def ordered_mentions
object.mentions.order(:id) object.mentions.to_a.sort_by(&:id)
end end
class ApplicationSerializer < ActiveModel::Serializer class ApplicationSerializer < ActiveModel::Serializer