diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-11-06 00:33:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-06 00:33:55 +0100 |
| commit | a25839340e93b1e93b7b99b0f65fa7da7d62bad2 (patch) | |
| tree | a329d65c115e752c3be5c262ebf96f69cd13861a /lib | |
| parent | e0f39626973fd9f5cce2d4cd3b166fb47e9c9059 (diff) | |
| parent | 4bb6b1a1e788abac7d1745e0f4eb72ad4d4ec110 (diff) | |
Merge pull request #1628 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mastodon/media_cli.rb | 1 |
1 files changed, 1 insertions, 0 deletions
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! |