diff options
| author | mayaeh <mayaeh@marimo-net.org> | 2018-08-30 01:35:09 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-08-29 18:35:09 +0200 |
| commit | cc26fd71acdcd0ef1c0992273a07d755af2b6108 (patch) | |
| tree | e6419ebea569edb5703f9b3100e6606ab5675537 /lib | |
| parent | 3b372c004111376ede55cd7152056253b7efcaf0 (diff) | |
Fix CLI interface for removing remote media (#8506)
* Fix that can't delete media files even if "tootctl media remove" execute when "--background" not attached. * Revert This reverts commit 5aa7e09645b27bae38a26030148b23e553ee2662. * Change to obtain and pass all columns when "--background" option is false.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mastodon/media_cli.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/mastodon/media_cli.rb b/lib/mastodon/media_cli.rb index ee28270da..12ddb6976 100644 --- a/lib/mastodon/media_cli.rb +++ b/lib/mastodon/media_cli.rb @@ -28,11 +28,13 @@ module Mastodon queued = 0 processed = 0 - MediaAttachment.where.not(remote_url: '').where.not(file_file_name: nil).where('created_at < ?', time_ago).select(:id).reorder(nil).find_in_batches do |media_attachments| - if options[:background] + if options[:background] + MediaAttachment.where.not(remote_url: '').where.not(file_file_name: nil).where('created_at < ?', time_ago).select(:id).reorder(nil).find_in_batches do |media_attachments| queued += media_attachments.size Maintenance::UncacheMediaWorker.push_bulk(media_attachments.map(&:id)) - else + end + else + MediaAttachment.where.not(remote_url: '').where.not(file_file_name: nil).where('created_at < ?', time_ago).reorder(nil).find_in_batches do |media_attachments| media_attachments.each do |m| Maintenance::UncacheMediaWorker.new.perform(m) say('.', :green, false) |