From 60c449e1d77c6e11ced796a7e088038d80137de6 Mon Sep 17 00:00:00 2001
From: multiple creatures <dev@multiple-creature.party>
Date: Fri, 30 Aug 2019 20:29:42 -0500
Subject: make sure media attachments are not from a blocked account, CDN, or
 their subdomains

---
 app/workers/fetch_media_worker.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/workers/fetch_media_worker.rb')

diff --git a/app/workers/fetch_media_worker.rb b/app/workers/fetch_media_worker.rb
index 5dc8cc84b..8b17186a3 100644
--- a/app/workers/fetch_media_worker.rb
+++ b/app/workers/fetch_media_worker.rb
@@ -5,6 +5,7 @@ class FetchMediaWorker
 
   def perform(media_attachment_id, remote_url = nil)
     object = MediaAttachment.find(media_attachment_id.to_i)
+    return if object.blocked?
     if remote_url.nil?
       return if object.remote_url.nil?
     else
-- 
cgit