about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorunarist <m.unarist@gmail.com>2017-09-17 18:54:23 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-09-17 11:54:23 +0200
commit1eab53ee1030542a5c4c56203a61eecae9768131 (patch)
treebae199a31161135be2f9a42b74dd15c88b98ed21 /app
parent7be3131240ba0371f028ccf1ca93dac87678b27d (diff)
Fix an error when actor json couldn't be fetched in ResolveRemoteAccountService (#4979)
* Fix an error when actor json couldn't be fetched in ResolveRemoteAccountService

* Add specs
Diffstat (limited to 'app')
-rw-r--r--app/services/resolve_remote_account_service.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/services/resolve_remote_account_service.rb b/app/services/resolve_remote_account_service.rb
index 7031c98f5..57c80fc82 100644
--- a/app/services/resolve_remote_account_service.rb
+++ b/app/services/resolve_remote_account_service.rb
@@ -80,6 +80,7 @@ class ResolveRemoteAccountService < BaseService
   def activitypub_ready?
     !@webfinger.link('self').nil? &&
       ['application/activity+json', 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'].include?(@webfinger.link('self').type) &&
+      !actor_json.nil? &&
       actor_json['inbox'].present?
   end