treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Allow serializing local-only toots in backup service 

Fixes #1153
lolsob-rspec
Thibaut Girka 2019-07-05 21:34:03 +02:00 committed by ThibG
parent 1181f84c79
commit 017b0ea6ff
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/serializers/activitypub/note_serializer.rb
View File

@ -25,7 +25,7 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
attribute :closed, if: :poll_and_expired? attribute :closed, if: :poll_and_expired?
def id 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) ActivityPub::TagManager.instance.uri_for(object)
end end

3
app/services/backup_service.rb
View File

@ -149,7 +149,8 @@ class BackupService < BaseService
ActiveModelSerializers::SerializableResource.new( ActiveModelSerializers::SerializableResource.new(
object, object,
serializer: serializer, serializer: serializer,
adapter: ActivityPub::Adapter adapter: ActivityPub::Adapter,
allow_local_only: true,
).as_json ).as_json
end end