about summary refs log tree commit diff
path: root/app/workers/pubsubhubbub/delivery_worker.rb
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-04-07 05:56:56 +0200
committerGitHub <noreply@github.com>2017-04-07 05:56:56 +0200
commit6d6a429af8fe4bd92ed497f401676353fdc603e0 (patch)
treeb8b1e8d88c01034b7c7ca9320ae4e9235e4b8b2a /app/workers/pubsubhubbub/delivery_worker.rb
parent31597fd37717db79edb69a64c97b1dca2f9a8a08 (diff)
Rewrite Atom generation from stream entries to use Ox instead of Nokogiri (#1124)
* Rewrite Atom generation from stream entries to use Ox instead of Nokogiri::Builder

StreamEntry is now limited to only statuses, which allows some optimization. Removed
extra queries on AccountsController#show. AtomSerializer instead of AtomBuilderHelper
used in AccountsController#show, StreamEntriesController#show, StreamEntryRenderer
and PubSubHubbub::DistributionWorker

PubSubHubbub::DistributionWorker moves n+1 DomainBlock query to PubSubHubbub::DeliveryWorker
instead.

All Salmon slaps that aren't based on StreamEntry still use AtomBuilderHelper and Nokogiri

* All Salmon slaps now use Ox instead of Nokogiri. No touch from status on account
Diffstat (limited to 'app/workers/pubsubhubbub/delivery_worker.rb')
-rw-r--r--app/workers/pubsubhubbub/delivery_worker.rb3
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