diff options
| author | multiple creatures <dev@multiple-creature.party> | 2020-02-21 04:07:54 -0600 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2020-02-21 04:07:54 -0600 |
| commit | ec4ee47e07516b6bb15ff1bf52660dbd6f64a298 (patch) | |
| tree | 741f94ade3592e76ddfe2a998c95b812b0b1c8fe | |
| parent | caeca95f389dc65b0c1719fece7f119f164aa401 (diff) | |
use upstream check for reject media in media proxy
| -rw-r--r-- | app/controllers/media_proxy_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/media_proxy_controller.rb b/app/controllers/media_proxy_controller.rb index e6d29992e..69666b1a5 100644 --- a/app/controllers/media_proxy_controller.rb +++ b/app/controllers/media_proxy_controller.rb @@ -12,7 +12,7 @@ class MediaProxyController < ApplicationController RedisLock.acquire(lock_options) do |lock| if lock.acquired? @media_attachment = MediaAttachment.remote.find(params[:id]) - redownload! if !@media_attachment.blocked? && @media_attachment.needs_redownload? + redownload! if @media_attachment.needs_redownload? && !reject_media? else raise Mastodon::RaceConditionError end |