diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-12-19 13:52:54 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-12-19 13:52:54 +0100 |
commit | ab5ff638f2968e3f434e504c7caab370bf71c9c0 (patch) | |
tree | 172f2c2fc8192688b960dd2bd42ea126ad9245fb /app/services/backup_service.rb | |
parent | 66ab1f83b0d342341181e0c88da83c966391fc0c (diff) | |
parent | 902c6bed5aab12c2e97af3452f122247777226af (diff) |
Merge branch 'master' into glitch-soc/master
Conflicts: - `config/locales/en.yml` No real conflict, upstream added a translatable string “too close” to one specific to glitch-soc - `lib/mastodon/statuses_cli.rb` Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses - `package.json` No real conflict, additional dependency in glitch-soc
Diffstat (limited to 'app/services/backup_service.rb')
-rw-r--r-- | app/services/backup_service.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/backup_service.rb b/app/services/backup_service.rb index cc9fb1f4e..0b57b6d0c 100644 --- a/app/services/backup_service.rb +++ b/app/services/backup_service.rb @@ -3,6 +3,8 @@ require 'rubygems/package' class BackupService < BaseService + include Payloadable + attr_reader :account, :backup, :collection def call(backup) @@ -20,7 +22,7 @@ class BackupService < BaseService account.statuses.with_includes.reorder(nil).find_in_batches do |statuses| statuses.each do |status| - item = serialize(status, ActivityPub::ActivitySerializer) + item = serialize_payload(status, ActivityPub::ActivitySerializer, signer: @account) item.delete(:'@context') unless item[:type] == 'Announce' || item[:object][:attachment].blank? |