From 8bd0e6d52677dedad64d4f7c1be064988561d4ae Mon Sep 17 00:00:00 2001 From: multiple creatures Date: Fri, 21 Feb 2020 05:59:48 -0600 Subject: teach `FetchMediaWorker` the new upstream way of checking for blocked accounts --- app/workers/fetch_media_worker.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'app') diff --git a/app/workers/fetch_media_worker.rb b/app/workers/fetch_media_worker.rb index 3e5eafb66..416fbb0e2 100644 --- a/app/workers/fetch_media_worker.rb +++ b/app/workers/fetch_media_worker.rb @@ -7,8 +7,10 @@ class FetchMediaWorker def perform(media_attachment_id, remote_url: nil, force: false) object = MediaAttachment.find(media_attachment_id.to_i) - return if object.blocked? + + return if object&.account.nil? || DomainBlock.reject_media?(object.account.domain) return unless force || object.needs_redownload? + if remote_url.nil? return if object.remote_url.nil? else -- cgit