diff options
| author | ThibG <thib@sitedethib.com> | 2019-06-25 22:43:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-25 22:43:33 +0200 |
| commit | ed10ae2693e83ac7fbac7273b2cf2ca424aca0c4 (patch) | |
| tree | a9bc878edcd521969d50fcc54fcc30f7b2ca54b5 /app/lib/ostatus/activity | |
| parent | 38d28824475056766c97385b66f4e04a5123e3a2 (diff) | |
| parent | 81bf43cfdd0d31ee4564a1399ce7fbe07eb04bb3 (diff) | |
Merge pull request #1138 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/ostatus/activity')
| -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 |