diff options
| author | pluralcafe-docker <docker@plural.cafe> | 2018-08-22 08:26:56 +0000 |
|---|---|---|
| committer | pluralcafe-docker <docker@plural.cafe> | 2018-08-22 08:26:56 +0000 |
| commit | a4935a8e24dcfa865fb330693d8ec90beca1aa98 (patch) | |
| tree | 9fc0be073bc2ed5bf4231d850106f214fdeb020e /app/services/backup_service.rb | |
| parent | c339d49d82b3fd2873831029d9c92b3fbf1236e3 (diff) | |
| parent | 37965ac8d9773ae79f6b8dd6fcd353894d2194ca (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'app/services/backup_service.rb')
| -rw-r--r-- | app/services/backup_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/backup_service.rb b/app/services/backup_service.rb index 8492c1117..da7db6462 100644 --- a/app/services/backup_service.rb +++ b/app/services/backup_service.rb @@ -18,7 +18,7 @@ class BackupService < BaseService def build_json! @collection = serialize(collection_presenter, ActivityPub::CollectionSerializer) - account.statuses.with_includes.find_in_batches do |statuses| + account.statuses.with_includes.reorder(nil).find_in_batches do |statuses| statuses.each do |status| item = serialize(status, ActivityPub::ActivitySerializer) item.delete(:'@context') @@ -60,7 +60,7 @@ class BackupService < BaseService end def dump_media_attachments!(tar) - MediaAttachment.attached.where(account: account).find_in_batches do |media_attachments| + MediaAttachment.attached.where(account: account).reorder(nil).find_in_batches do |media_attachments| media_attachments.each do |m| download_to_tar(tar, m.file, m.file.path) end |