Fix backup archive including outgoing-only content warnings

2020-05-30 16:56:23 +02:00 · 2020-05-30 16:56:23 +02:00 · ddcd9fe9f0
parent 9e04b9d8df
commit ddcd9fe9f0
1 changed files with 2 additions and 2 deletions
--- a/app/serializers/activitypub/note_serializer.rb
+++ b/app/serializers/activitypub/note_serializer.rb
@ -35,11 +35,11 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
  end

  def summary
-    object.spoiler_text.presence || Setting.outgoing_spoilers.presence
+    object.spoiler_text.presence || (instance_options[:allow_local_only] ? nil : Setting.outgoing_spoilers.presence)
  end

  def sensitive
-    object.sensitive || Setting.outgoing_spoilers.present?
+    object.sensitive || (!instance_options[:allow_local_only] && Setting.outgoing_spoilers.present?)
  end

  def content