From: mayaeh <mayaeh@marimo-net.org>
Date: Wed, 29 Aug 2018 16:35:09 +0000 (+0900)
Subject: Fix CLI interface for removing remote media (#8506)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=cc26fd71acdcd0ef1c0992273a07d755af2b6108;p=mastodon.git

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.
---

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)