diff options
| author | ThibG <thib@sitedethib.com> | 2018-10-24 11:28:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-24 11:28:25 +0200 |
| commit | 0e8de56a22aee089da8aa1c64bab941bc5911e5d (patch) | |
| tree | ac3f4100e27a9341c32c15e07661af841c547ec0 /app/serializers/activitypub | |
| parent | 4739e0f090a04235669ef81fa432ae90bb62f4c4 (diff) | |
| parent | ed8d06212f439b9fe2f170a6f43d6be6d586ff80 (diff) | |
Merge pull request #792 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 |