diff options
| author | Starfall <admin@plural.cafe> | 2020-05-31 12:56:29 -0500 |
|---|---|---|
| committer | Starfall <admin@plural.cafe> | 2020-05-31 12:56:29 -0500 |
| commit | 76f79dd29909d39f1d36ef48e6892223d59e29d7 (patch) | |
| tree | 8a5ace5fea5cf8a4c6f1c55e01db99a289c4b1e3 /app/serializers/activitypub/note_serializer.rb | |
| parent | 0167552bed46508efeed266853a1ee4437e12998 (diff) | |
| parent | ddcd9fe9f0e85b1db12ae584749e680146611f9a (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'app/serializers/activitypub/note_serializer.rb')
| -rw-r--r-- | app/serializers/activitypub/note_serializer.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb index dce506fa2..e2d2b6bec 100644 --- a/app/serializers/activitypub/note_serializer.rb +++ b/app/serializers/activitypub/note_serializer.rb @@ -35,7 +35,11 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer end def summary - object.spoiler_text.presence + object.spoiler_text.presence || (instance_options[:allow_local_only] ? nil : Setting.outgoing_spoilers.presence) + end + + def sensitive + object.sensitive || (!instance_options[:allow_local_only] && Setting.outgoing_spoilers.present?) end def content |