mirror of https://github.com/mastodon/mastodon.git
Do not re-query mentions from serializers (#6858)
Fix performance regression from #6836pull/6325/head
parent
da70aca28e
commit
9fe1619db9
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue