mastofe

commit: 5927b43c0fc74e66cd3a882b565ea70236559c02
parent: 871c0d251a6d27c4591785ae446738a8d6c553ab
Author: unarist <m.unarist@gmail.com>
Date:   Wed, 23 Aug 2017 03:00:49 +0900

Ignore empty response in ActivityPub::FetchRemoteStatusService (#4661)

* Ignore empty response in ActivityPub::FetchRemoteStatusService

This fixes `NoMethodError: undefined method `[]' for nil:NilClass` error.

* Check json.nil? in JsonLdHelper#supported_context?

Diffstat:
M
app/helpers/jsonld_helper.rb
2
+-
M
app/services/fetch_atom_service.rb
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/helpers/jsonld_helper.rb b/app/helpers/jsonld_helper.rb
@@ -14,7 +14,7 @@ module JsonLdHelper
   end
 
   def supported_context?(json)
-    equals_or_includes?(json['@context'], ActivityPub::TagManager::CONTEXT)
+    !json.nil? && equals_or_includes?(json['@context'], ActivityPub::TagManager::CONTEXT)
   end
 
   def fetch_resource(uri)
diff --git a/app/services/fetch_atom_service.rb b/app/services/fetch_atom_service.rb
@@ -82,7 +82,7 @@ class FetchAtomService < BaseService
 
   def supported_activity?(body)
     json = body_to_json(body)
-    return false if json.nil? || !supported_context?(json)
+    return false unless supported_context?(json)
     json['type'] == 'Person' ? json['inbox'].present? : true
   end
 end