diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 21:48:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 21:48:19 -0400 |
| commit | 5dfc9854f1612bc7e55524175170fd40c7dbe21a (patch) | |
| tree | cb96d7cd349ebdc93104ec05886d8256467cdaf7 /app/workers/pubsubhubbub/delivery_worker.rb | |
| parent | 9cf0b5b2557a6e26542a39c3fb31f46a15073662 (diff) | |
| parent | b300bb3b4e45d7e52a5a0f2db3c9ed383fc4ebbb (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 |