From ec4ee47e07516b6bb15ff1bf52660dbd6f64a298 Mon Sep 17 00:00:00 2001
From: multiple creatures <dev@multiple-creature.party>
Date: Fri, 21 Feb 2020 04:07:54 -0600
Subject: use upstream check for reject media in media proxy

---
 app/controllers/media_proxy_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

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