diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-10 02:55:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-10 02:55:43 +0200 |
| commit | 3a38322a54f0eeb3eba037a4fd61a072bda44311 (patch) | |
| tree | 0e959825c95b3e0afd7fcfad2c7d435056b80c5a /app/services/pubsubhubbub | |
| parent | 29d8313b28ee5a0f6e18141028185e757035b547 (diff) | |
Add spec for Pubsubhubbub::DistributionWorker. PuSH-deliver public items (#2954)
to all subscribers. IDN-normalize callback URLs for subscriptions on insert.
Diffstat (limited to 'app/services/pubsubhubbub')
| -rw-r--r-- | app/services/pubsubhubbub/subscribe_service.rb | 8 | ||||
| -rw-r--r-- | app/services/pubsubhubbub/unsubscribe_service.rb | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/app/services/pubsubhubbub/subscribe_service.rb b/app/services/pubsubhubbub/subscribe_service.rb index 67d7f6598..eeb7ab258 100644 --- a/app/services/pubsubhubbub/subscribe_service.rb +++ b/app/services/pubsubhubbub/subscribe_service.rb @@ -6,9 +6,9 @@ class Pubsubhubbub::SubscribeService < BaseService attr_reader :account, :callback, :secret, :lease_seconds def call(account, callback, secret, lease_seconds) - @account = account - @callback = callback - @secret = secret + @account = account + @callback = Addressable::URI.parse(callback).normalize.to_s + @secret = secret @lease_seconds = lease_seconds process_subscribe @@ -52,7 +52,7 @@ class Pubsubhubbub::SubscribeService < BaseService end def blocked_domain? - DomainBlock.blocked? Addressable::URI.parse(callback).normalize.host + DomainBlock.blocked? Addressable::URI.parse(callback).host end def locate_subscription diff --git a/app/services/pubsubhubbub/unsubscribe_service.rb b/app/services/pubsubhubbub/unsubscribe_service.rb index 99fec8b14..646150f7b 100644 --- a/app/services/pubsubhubbub/unsubscribe_service.rb +++ b/app/services/pubsubhubbub/unsubscribe_service.rb @@ -1,11 +1,11 @@ # frozen_string_literal: true class Pubsubhubbub::UnsubscribeService < BaseService - attr_reader :account, :callback_url + attr_reader :account, :callback - def call(account, callback_url) - @account = account - @callback_url = callback_url + def call(account, callback) + @account = account + @callback = Addressable::URI.parse(callback).normalize.to_s process_unsubscribe end @@ -26,6 +26,6 @@ class Pubsubhubbub::UnsubscribeService < BaseService end def subscription - @_subscription ||= Subscription.find_by(account: account, callback_url: callback_url) + @_subscription ||= Subscription.find_by(account: account, callback_url: callback) end end |