Browse Source

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

Fix performance regression from #6836
master
Eugen Rochko 6 years ago
committed by GitHub
parent
commit
9fe1619db9
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      app/serializers/activitypub/note_serializer.rb
  2. +1
    -1
      app/serializers/rest/status_serializer.rb

+ 1
- 1
app/serializers/activitypub/note_serializer.rb View File

@@ -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


+ 1
- 1
app/serializers/rest/status_serializer.rb View File

@@ -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


Loading…
Cancel
Save