gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-07-15 08:48:15 +00:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Fix duplicate @context attribute in user export (#30653)
Some checks failed
Ruby Linting / lint (push) Has been cancelled
Details
Test one step migrations / pre_job (push) Has been cancelled
Details
Test two step migrations / pre_job (push) Has been cancelled
Details
Ruby Testing / build (production) (push) Has been cancelled
Details
Ruby Testing / build (test) (push) Has been cancelled
Details
Test one step migrations / test (14-alpine) (push) Has been cancelled
Details
Test one step migrations / test (15-alpine) (push) Has been cancelled
Details
Test two step migrations / test (14-alpine) (push) Has been cancelled
Details
Test two step migrations / test (15-alpine) (push) Has been cancelled
Details
Ruby Testing / test (1, .ruby-version) (push) Has been cancelled
Details
Ruby Testing / test (1, 3.0) (push) Has been cancelled
Details
Ruby Testing / test (1, 3.1) (push) Has been cancelled
Details
Ruby Testing / test (2, .ruby-version) (push) Has been cancelled
Details
Ruby Testing / test (2, 3.0) (push) Has been cancelled
Details
Ruby Testing / test (2, 3.1) (push) Has been cancelled
Details
Ruby Testing / test (3, .ruby-version) (push) Has been cancelled
Details
Ruby Testing / test (3, 3.0) (push) Has been cancelled
Details
Ruby Testing / test (3, 3.1) (push) Has been cancelled
Details
Ruby Testing / test (4, .ruby-version) (push) Has been cancelled
Details
Ruby Testing / test (4, 3.0) (push) Has been cancelled
Details
Ruby Testing / test (4, 3.1) (push) Has been cancelled
Details
Ruby Testing / End to End testing (.ruby-version) (push) Has been cancelled
Details
Ruby Testing / End to End testing (3.0) (push) Has been cancelled
Details
Ruby Testing / End to End testing (3.1) (push) Has been cancelled
Details
Ruby Testing / Testing search (.ruby-version) (push) Has been cancelled
Details
Ruby Testing / Testing search (3.0) (push) Has been cancelled
Details
Ruby Testing / Testing search (3.1) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Claire 2024-06-12 09:28:28 +02:00
parent 520b2086af
commit 19ed22dc58
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/services/backup_service.rb
View File

@ -19,8 +19,8 @@ class BackupService < BaseService
def build_outbox_json!(file)
skeleton = serialize(collection_presenter, ActivityPub::CollectionSerializer)
skeleton[:@context] = full_context
skeleton[:orderedItems] = ['!PLACEHOLDER!']
skeleton['@context'] = full_context
skeleton['orderedItems'] = ['!PLACEHOLDER!']
skeleton = Oj.dump(skeleton)
prepend, append = skeleton.split('"!PLACEHOLDER!"')
add_comma = false

10
spec/services/backup_service_spec.rb
View File

@ -55,9 +55,11 @@ RSpec.describe BackupService, type: :service do
end
def expect_outbox_export
json = export_json(:outbox)
body = export_json_raw(:outbox)
json = Oj.load(body)
aggregate_failures do
expect(body.scan('@context').count).to eq 1
expect(json['@context']).to_not be_nil
expect(json['type']).to eq 'OrderedCollection'
expect(json['totalItems']).to eq 2
@ -85,8 +87,12 @@ RSpec.describe BackupService, type: :service do
end
end
def export_json_raw(type)
read_zip_file(backup, "#{type}.json")
end
def export_json(type)
Oj.load(read_zip_file(backup, "#{type}.json"))
Oj.load(export_json_raw(type))
end
def include_create_item(status)