diff options
| author | pluralcafe-docker <git@plural.cafe> | 2018-10-30 05:54:55 +0000 |
|---|---|---|
| committer | pluralcafe-docker <git@plural.cafe> | 2018-10-30 05:54:55 +0000 |
| commit | 431c09bfbe07715a2a88846864179a419d72ab59 (patch) | |
| tree | 8b7772f64ea23cdf5e55dda9f92ff57a41adf3a4 /app/serializers/activitypub | |
| parent | 7c96ee7815c216d6ac3b748d7dd6959376d3914e (diff) | |
| parent | 7ec3f6022d5c991bb584c481a29c416e9f1c5438 (diff) | |
Merge branch 'glitch'
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 82b7ffe95..c9d23e25f 100644 --- a/app/serializers/activitypub/note_serializer.rb +++ b/app/serializers/activitypub/note_serializer.rb @@ -68,7 +68,7 @@ class ActivityPub::NoteSerializer < ActiveModel::Serializer end def virtual_tags - object.mentions.to_a.sort_by(&:id) + object.tags + object.emojis + object.active_mentions.to_a.sort_by(&:id) + object.tags + object.emojis end def atom_uri |