diff options
| author | Reverite <github@reverite.sh> | 2019-06-26 20:31:07 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-06-26 20:31:07 -0700 |
| commit | 3fa90982efda2109ddf90d81f5ed3449f8282642 (patch) | |
| tree | e5514f4c72c9ffb44059a2afb7fdf24d0348bbd4 /app/lib/ostatus/activity/creation.rb | |
| parent | 714940de498e93a8bf40dcda1835217df18741bf (diff) | |
| parent | 9ef25877dfda12cf31ec586294e4d4908f5be4f0 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/lib/ostatus/activity/creation.rb')
| -rw-r--r-- | app/lib/ostatus/activity/creation.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/lib/ostatus/activity/creation.rb b/app/lib/ostatus/activity/creation.rb index 3840c8fbf..60de712db 100644 --- a/app/lib/ostatus/activity/creation.rb +++ b/app/lib/ostatus/activity/creation.rb @@ -148,7 +148,7 @@ class OStatus::Activity::Creation < OStatus::Activity::Base end def save_media - do_not_download = DomainBlock.find_by(domain: @account.domain)&.reject_media? + do_not_download = DomainBlock.reject_media?(@account.domain) media_attachments = [] @xml.xpath('./xmlns:link[@rel="enclosure"]', xmlns: OStatus::TagManager::XMLNS).each do |link| @@ -176,7 +176,7 @@ class OStatus::Activity::Creation < OStatus::Activity::Base end def save_emojis(parent) - do_not_download = DomainBlock.find_by(domain: parent.account.domain)&.reject_media? + do_not_download = DomainBlock.reject_media?(parent.account.domain) return if do_not_download |