OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity

Fix errors preventing UnsubscribeService from working (#4866)

pull/4871/head v1.6.0rc4
Eugen Rochko 2017-09-09 17:36:27 +02:00 committed by GitHub
parent 6867681c7c
commit 90712d4293
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/services/unsubscribe_service.rb
View File

@ -4,16 +4,19 @@ class UnsubscribeService < BaseService
def call(account) def call(account)
return if account.hub_url.blank? return if account.hub_url.blank?
@account = account @account = account
@response = build_request.perform
Rails.logger.debug "PuSH unsubscribe for #{@account.acct} failed: #{@response.status}" unless @response.status.success? begin
@response = build_request.perform
Rails.logger.debug "PuSH unsubscribe for #{@account.acct} failed: #{@response.status}" unless @response.status.success?
rescue HTTP::Error, OpenSSL::SSL::SSLError => e
Rails.logger.debug "PuSH unsubscribe for #{@account.acct} failed: #{e}"
end
@account.secret = '' @account.secret = ''
@account.subscription_expires_at = nil @account.subscription_expires_at = nil
@account.save! @account.save!
rescue HTTP::Error, OpenSSL::SSL::SSLError
Rails.logger.debug "PuSH subscription request for #{@account.acct} could not be made due to HTTP or SSL error"
end end
private private

2
spec/services/unsubscribe_service_spec.rb
View File

@ -26,7 +26,7 @@ RSpec.describe UnsubscribeService do
stub_request(:post, 'http://hub.example.com/').to_raise(HTTP::Error) stub_request(:post, 'http://hub.example.com/').to_raise(HTTP::Error)
subject.call(account) subject.call(account)
expect(logger).to have_received(:debug).with(/PuSH subscription request for bob@example.com could not be made due to HTTP or SSL error/) expect(logger).to have_received(:debug).with(/unsubscribe for bob@example.com failed/)
end end
def stub_logger def stub_logger