alex
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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?
signup-info-prompt
unarist 2017-08-23 03:00:49 +09:00 committed by Eugen Rochko
parent 871c0d251a
commit 5927b43c0f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/jsonld_helper.rb
View File

@ -14,7 +14,7 @@ module JsonLdHelper
end end
def supported_context?(json) def supported_context?(json)
equals_or_includes?(json['@context'], ActivityPub::TagManager::CONTEXT) !json.nil? && equals_or_includes?(json['@context'], ActivityPub::TagManager::CONTEXT)
end end
def fetch_resource(uri) def fetch_resource(uri)

2
app/services/fetch_atom_service.rb
View File

@ -82,7 +82,7 @@ class FetchAtomService < BaseService
def supported_activity?(body) def supported_activity?(body)
json = body_to_json(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 json['type'] == 'Person' ? json['inbox'].present? : true
end end
end end