diff options
| author | Erwan Leboucher <erwanleboucher@gmail.com> | 2017-04-07 12:43:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 12:43:56 +0200 |
| commit | 0c4e9fdda051d0322608c9abdaa158529c8feacd (patch) | |
| tree | db5e8aae085529913e4567c0a81a00c1d2b22356 /app/workers/pubsubhubbub/delivery_worker.rb | |
| parent | a0f1f9c6649f44183b9c1525433c1c6e7f052492 (diff) | |
| parent | 624a9a7136159d460228a0c2f5df18a9ead3b7f2 (diff) | |
Merge branch 'master' into patch-4
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 |