Fix backup archive including outgoing-only content warnings

diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb
index 96e94d7972b8c6dd3142cf7d3e67454c5809f6d2..e2d2b6bec3f99fdb64c706225959abaae1bcb5ac 100644 (file)
--- 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