From 4c0a85ef9bbb01f28e0ed776df5c989c87428edd Mon Sep 17 00:00:00 2001
From: Naoki Kosaka <n.k@mail.yukimochi.net>
Date: Wed, 8 Nov 2017 23:19:22 +0900
Subject: [PATCH] In remove_remote, exclude removed media attachments. (#5626)

---
 lib/tasks/mastodon.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index 5614ddf48f..4d519bf90e 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -81,7 +81,7 @@ namespace :mastodon do
     task remove_remote: :environment do
       time_ago = ENV.fetch('NUM_DAYS') { 7 }.to_i.days.ago
 
-      MediaAttachment.where.not(remote_url: '').where('created_at < ?', time_ago).find_each do |media|
+      MediaAttachment.where.not(remote_url: '').where.not(file_file_name: nil).where('created_at < ?', time_ago).find_each do |media|
         media.file.destroy
         media.save
       end
-- 
GitLab