tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prefer to_json in backup service (#38297)

Browse Source
This commit is contained in:
Matt Jankowski 2026-03-19 11:14:47 -04:00 committed by GitHub
parent b5b01bebf2
commit 49430b7eea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/services/backup_service.rb
View File

@ -29,7 +29,7 @@ class BackupService < BaseService
skeleton = serialize(collection_presenter(STREAM_OUTBOX, size: account.statuses.count), ActivityPub::CollectionSerializer) skeleton = serialize(collection_presenter(STREAM_OUTBOX, size: account.statuses.count), ActivityPub::CollectionSerializer)
skeleton[:@context] = full_context skeleton[:@context] = full_context
skeleton[:orderedItems] = [PLACEHOLDER] skeleton[:orderedItems] = [PLACEHOLDER]
skeleton = JSON.generate(skeleton) skeleton = skeleton.to_json
prepend, append = skeleton.split(PLACEHOLDER.to_json) prepend, append = skeleton.split(PLACEHOLDER.to_json)
file.write(prepend) file.write(prepend)
@ -48,7 +48,7 @@ class BackupService < BaseService
end end
end end
JSON.generate(item) item.to_json
end.join(',')) end.join(','))
GC.start GC.start
@ -121,10 +121,8 @@ class BackupService < BaseService
download_to_zip(zipfile, account.avatar, "avatar#{File.extname(account.avatar.path)}") if account.avatar.exists? download_to_zip(zipfile, account.avatar, "avatar#{File.extname(account.avatar.path)}") if account.avatar.exists?
download_to_zip(zipfile, account.header, "header#{File.extname(account.header.path)}") if account.header.exists? download_to_zip(zipfile, account.header, "header#{File.extname(account.header.path)}") if account.header.exists?
json = JSON.generate(actor)
zipfile.get_output_stream(STREAM_ACTOR) do |io| zipfile.get_output_stream(STREAM_ACTOR) do |io|
io.write(json) io.write(actor.to_json)
end end
end end
@ -133,7 +131,7 @@ class BackupService < BaseService
skeleton.delete(:totalItems) skeleton.delete(:totalItems)
skeleton[:orderedItems] = [PLACEHOLDER] skeleton[:orderedItems] = [PLACEHOLDER]
skeleton = JSON.generate(skeleton) skeleton = skeleton.to_json
prepend, append = skeleton.split(PLACEHOLDER.to_json) prepend, append = skeleton.split(PLACEHOLDER.to_json)
zipfile.get_output_stream(STREAM_LIKES) do |io| zipfile.get_output_stream(STREAM_LIKES) do |io|
@ -143,7 +141,7 @@ class BackupService < BaseService
io.write(',') unless batch.zero? io.write(',') unless batch.zero?
io.write(statuses.map do |status| io.write(statuses.map do |status|
JSON.generate(ActivityPub::TagManager.instance.uri_for(status)) ActivityPub::TagManager.instance.uri_for(status).to_json
end.join(',')) end.join(','))
GC.start GC.start
@ -161,7 +159,7 @@ class BackupService < BaseService
skeleton = serialize(collection_presenter(STREAM_BOOKMARKS), ActivityPub::CollectionSerializer) skeleton = serialize(collection_presenter(STREAM_BOOKMARKS), ActivityPub::CollectionSerializer)
skeleton.delete(:totalItems) skeleton.delete(:totalItems)
skeleton[:orderedItems] = [PLACEHOLDER] skeleton[:orderedItems] = [PLACEHOLDER]
skeleton = JSON.generate(skeleton) skeleton = skeleton.to_json
prepend, append = skeleton.split(PLACEHOLDER.to_json) prepend, append = skeleton.split(PLACEHOLDER.to_json)
zipfile.get_output_stream(STREAM_BOOKMARKS) do |io| zipfile.get_output_stream(STREAM_BOOKMARKS) do |io|
@ -171,7 +169,7 @@ class BackupService < BaseService
io.write(',') unless batch.zero? io.write(',') unless batch.zero?
io.write(statuses.map do |status| io.write(statuses.map do |status|
JSON.generate(ActivityPub::TagManager.instance.uri_for(status)) ActivityPub::TagManager.instance.uri_for(status).to_json
end.join(',')) end.join(','))
GC.start GC.start