diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:35:45 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 22:35:45 -0400 |
commit | c945f29e96d537a827b95b3efb035ec8084576a1 (patch) | |
tree | dac7e26c482f0a69e00f031e771e58858e64b054 /app/workers/pubsubhubbub/delivery_worker.rb | |
parent | c62696bc467133869f6b1d39b923135b0e64900f (diff) | |
parent | 0d4d42dce6e7b0856469317da9e039ec5dc431b1 (diff) |
Merge branch 'master' into patch-1
Diffstat (limited to 'app/workers/pubsubhubbub/delivery_worker.rb')
-rw-r--r-- | app/workers/pubsubhubbub/delivery_worker.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/workers/pubsubhubbub/delivery_worker.rb b/app/workers/pubsubhubbub/delivery_worker.rb index 466def3a8..8412be4b7 100644 --- a/app/workers/pubsubhubbub/delivery_worker.rb +++ b/app/workers/pubsubhubbub/delivery_worker.rb @@ -13,6 +13,9 @@ class Pubsubhubbub::DeliveryWorker def perform(subscription_id, payload) subscription = Subscription.find(subscription_id) headers = {} + host = Addressable::URI.parse(subscription.callback_url).host + + return if DomainBlock.blocked?(host) headers['User-Agent'] = 'Mastodon/PubSubHubbub' headers['Link'] = LinkHeader.new([[api_push_url, [%w(rel hub)]], [account_url(subscription.account, format: :atom), [%w(rel self)]]]).to_s |