diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:09:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:09:55 -0400 |
| commit | 6efaee30b159313a72d0433d562d364ede2f513c (patch) | |
| tree | 18d62573ed68ce653879aa116729be1f37085ae1 /app/workers/pubsubhubbub/delivery_worker.rb | |
| parent | e5566ac6a6462c0a8a6c6c8f2a1171087bd662a4 (diff) | |
| parent | 698fe3686a8e9a76ae21660d7504a229564d4594 (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 |