diff options
| author | Surinna Curtis <ekiru.0@gmail.com> | 2018-05-02 05:40:24 -0500 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-05-02 12:40:24 +0200 |
| commit | dc786c0cf4467ade8db7d8b17e09f16923bfc1e8 (patch) | |
| tree | 955931c945e9137b4883571cfd2d23bec1d59397 /app/services/activitypub/fetch_remote_key_service.rb | |
| parent | 86efccce2a874d16aa783d989ff4824bcfac40b5 (diff) | |
Support Actors/Statuses with multiple types (#7305)
* Add equals_or_includes_any? helper in JsonLdHelper * Support arrays in JSON-LD type fields for actors/tags/objects. * Spec for resolving accounts with extension types * Style tweaks for codeclimate
Diffstat (limited to 'app/services/activitypub/fetch_remote_key_service.rb')
| -rw-r--r-- | app/services/activitypub/fetch_remote_key_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/activitypub/fetch_remote_key_service.rb b/app/services/activitypub/fetch_remote_key_service.rb index 41837d462..505baccd4 100644 --- a/app/services/activitypub/fetch_remote_key_service.rb +++ b/app/services/activitypub/fetch_remote_key_service.rb @@ -43,7 +43,7 @@ class ActivityPub::FetchRemoteKeyService < BaseService end def person? - ActivityPub::FetchRemoteAccountService::SUPPORTED_TYPES.include?(@json['type']) + equals_or_includes_any?(@json['type'], ActivityPub::FetchRemoteAccountService::SUPPORTED_TYPES) end def public_key? @@ -55,6 +55,6 @@ class ActivityPub::FetchRemoteKeyService < BaseService end def confirmed_owner? - ActivityPub::FetchRemoteAccountService::SUPPORTED_TYPES.include?(@owner['type']) && value_or_id(@owner['publicKey']) == @json['id'] + equals_or_includes_any?(@owner['type'], ActivityPub::FetchRemoteAccountService::SUPPORTED_TYPES) && value_or_id(@owner['publicKey']) == @json['id'] end end |