Merge pull request #87 from tootsuite/master

merge upstream

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