diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-07-25 12:48:48 +0200 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2021-07-25 12:48:48 +0200 |
commit | b5e10d07ff756ab4f4101c8ee356caff92852e22 (patch) | |
tree | cb24b1ef19239abd226b17f305fd91daf19dc227 /app/services | |
parent | a2df067f9852f0db3140dd2c35539f4e74bdb6dc (diff) | |
parent | a8a7066e977cb0aa1988d340ef8b7c542f179b14 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/backup_service.rb | 4 | ||||
-rw-r--r-- | app/services/remove_status_service.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/services/backup_service.rb b/app/services/backup_service.rb index 749c84736..f07f407d8 100644 --- a/app/services/backup_service.rb +++ b/app/services/backup_service.rb @@ -168,7 +168,7 @@ class BackupService < BaseService io.write(buffer) end end - rescue Errno::ENOENT, Seahorse::Client::NetworkingError - Rails.logger.warn "Could not backup file #{filename}: file not found" + rescue Errno::ENOENT, Seahorse::Client::NetworkingError => e + Rails.logger.warn "Could not backup file #{filename}: #{e}" end end diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb index 20c17e6df..9259c69d9 100644 --- a/app/services/remove_status_service.rb +++ b/app/services/remove_status_service.rb @@ -104,7 +104,7 @@ class RemoveStatusService < BaseService # because once original status is gone, reblogs will disappear # without us being able to do all the fancy stuff - @status.reblogs.includes(:account).find_each do |reblog| + @status.reblogs.includes(:account).reorder(nil).find_each do |reblog| RemoveStatusService.new.call(reblog, original_removed: true) end end |