From caeca95f389dc65b0c1719fece7f119f164aa401 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 8 Dec 2019 15:37:12 +0100 Subject: port tootsuite#12568 to monsterfork: Add `tootctl media remove-orphans` --- app/models/media_attachment.rb | 7 ------- 1 file changed, 7 deletions(-) (limited to 'app/models') diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb index 36282d010..d4fd7eeb8 100644 --- a/app/models/media_attachment.rb +++ b/app/models/media_attachment.rb @@ -183,13 +183,6 @@ class MediaAttachment < ApplicationRecord audio? || video? end - def blocked? - domains = Set[self.account.domain] - domains.add(remote_url.scan(/[\w\-]+\.[\w\-]+(?:\.[\w\-]+)*/).first) if remote_url.present? - blocks = DomainBlock.suspend.or(DomainBlock.where(reject_media: true)) - domains.any? { |domain| blocks.where(domain: domain).or(blocks.where('domain LIKE ?', "%.#{domain}")).exists? } - end - def variant?(other_file_name) return true if file_file_name == other_file_name -- cgit