diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-23 10:17:18 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-23 10:17:18 +0000 |
| commit | 03b2f701e755b2dcc013619d8e234fdec315c418 (patch) | |
| tree | ab2bb62e747d568e88d4208f2c57f8a67f3a8a1a /app/serializers/activitypub | |
| parent | 9c3e4bdead953fb67fde32f5ef5db39ed2974362 (diff) | |
| parent | ecdc5957a34b7f7a7a342c631690802d79d13f37 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/serializers/activitypub')
| -rw-r--r-- | app/serializers/activitypub/note_serializer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb index abaf29047..ddafb540d 100644 --- 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 |