From: Jeong Arm <kjwonmail@gmail.com>
Date: Thu, 28 Oct 2021 17:30:44 +0000 (+0900)
Subject: Skip blocked domains media on tootctl media refresh (#16914)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=884c60002e3a6f6ee3814d3f3634738bda607dc3;p=mastodon.git

Skip blocked domains media on tootctl media refresh (#16914)
---

diff --git a/lib/mastodon/media_cli.rb b/lib/mastodon/media_cli.rb
index 59c118500..36ca71844 100644
--- a/lib/mastodon/media_cli.rb
+++ b/lib/mastodon/media_cli.rb
@@ -230,6 +230,7 @@ module Mastodon
 
       processed, aggregate = parallelize_with_progress(scope) do |media_attachment|
         next if media_attachment.remote_url.blank? || (!options[:force] && media_attachment.file_file_name.present?)
+        next if DomainBlock.reject_media?(media_attachment.account.domain)
 
         unless options[:dry_run]
           media_attachment.reset_file!