diff options
author | beatrix <beatrix.bitrot@gmail.com> | 2017-07-20 11:24:32 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-20 11:24:32 -0400 |
commit | e7edb4d1eeba6c12a1c71271faa30d2bbf00d054 (patch) | |
tree | f373d05c4ea43bd335910f3603fab3d866a2486e /app/services/subscribe_service.rb | |
parent | d2352246920800e491466d84b0146feb4d1d791f (diff) | |
parent | 1fcdaafa6fbe6d746a096c33263d76e6819da46d (diff) |
Merge pull request #87 from tootsuite/master
merge upstream
Diffstat (limited to 'app/services/subscribe_service.rb')
-rw-r--r-- | app/services/subscribe_service.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/subscribe_service.rb b/app/services/subscribe_service.rb index f58067038..d3e41e691 100644 --- a/app/services/subscribe_service.rb +++ b/app/services/subscribe_service.rb @@ -2,6 +2,8 @@ class SubscribeService < BaseService def call(account) + return unless account.ostatus? + @account = account @account.secret = SecureRandom.hex @response = build_request.perform @@ -16,7 +18,7 @@ class SubscribeService < BaseService else # The response was either a 429 rate limit, or a 5xx error. # We need to retry at a later time. Fail loudly! - raise "Subscription attempt failed for #{@account.acct} (#{@account.hub_url}): HTTP #{@response.code}" + raise Mastodon::UnexpectedResponseError, @response end end |