diff options
| author | Fire Demon <firedemon@creature.cafe> | 2020-11-12 17:42:53 -0600 |
|---|---|---|
| committer | Fire Demon <firedemon@creature.cafe> | 2020-11-14 17:39:08 -0600 |
| commit | f60e0b62f4e5300645f235983e5b75bcf16b370d (patch) | |
| tree | 0c437e6600b7a8bdf806d63fa76ce751bbe66d58 /app/serializers/activitypub/note_serializer.rb | |
| parent | ec3abd7c87116ad2df5b1da5701afe68a7f74844 (diff) | |
| parent | 265b26489a9214a6c98a4dfa88f08ce490211ebc (diff) | |
Merge remote-tracking branch 'upstream/master' into merge-glitch
Diffstat (limited to 'app/serializers/activitypub/note_serializer.rb')
| -rw-r--r-- | app/serializers/activitypub/note_serializer.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb index b973f69ec..0b2ab0cfd 100644 --- a/app/serializers/activitypub/note_serializer.rb +++ b/app/serializers/activitypub/note_serializer.rb @@ -137,6 +137,10 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer ActivityPub::TagManager.instance.cc(object, target_domain: instance_options[:target_domain]) end + def sensitive + object.account.sensitized? || object.sensitive + end + def virtual_tags object.active_mentions.to_a.sort_by(&:id) + object.tags + object.emojis end |