From: Thibaut Girka <thib@sitedethib.com>
Date: Fri, 5 Jul 2019 19:34:03 +0000 (+0200)
Subject: Allow serializing local-only toots in backup service
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=e5f4d83e60305e2f502f18f507ad79d8fbccfe77;p=mastodon.git

Allow serializing local-only toots in backup service

Fixes #1153
---

diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb
index 7225b2319..61fa77852 100644
--- a/app/serializers/activitypub/note_serializer.rb
+++ b/app/serializers/activitypub/note_serializer.rb
@@ -25,7 +25,7 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
   attribute :closed, if: :poll_and_expired?
 
   def id
-    raise Mastodon::NotPermittedError, 'Local-only statuses should not be serialized' if object.local_only?
+    raise Mastodon::NotPermittedError, 'Local-only statuses should not be serialized' if object.local_only? && !instance_options[:allow_local_only]
     ActivityPub::TagManager.instance.uri_for(object)
   end
 
diff --git a/app/services/backup_service.rb b/app/services/backup_service.rb
index 5fcc98057..bd9e77223 100644
--- a/app/services/backup_service.rb
+++ b/app/services/backup_service.rb
@@ -149,7 +149,8 @@ class BackupService < BaseService
     ActiveModelSerializers::SerializableResource.new(
       object,
       serializer: serializer,
-      adapter: ActivityPub::Adapter
+      adapter: ActivityPub::Adapter,
+      allow_local_only: true,
     ).as_json
   end