From: Thibaut Girka <thib@sitedethib.com>
Date: Sat, 30 May 2020 14:56:23 +0000 (+0200)
Subject: Fix backup archive including outgoing-only content warnings
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=ddcd9fe9f0e85b1db12ae584749e680146611f9a;p=mastodon.git

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 96e94d797..e2d2b6bec 100644
--- 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