diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-04-01 20:24:50 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-04-01 20:24:50 -0500 |
| commit | eb39db7f93061c936fcb0bb24d5ba0c9a6186993 (patch) | |
| tree | e12b5f5c9fec1d698024c88cd9f3ea9fe5b249cd /app/services/activitypub/fetch_remote_key_service.rb | |
| parent | f0bb3ff53307aac7b9c64ec8a48d4ba1d2019513 (diff) | |
| parent | f890d2a766ae4c7fd8611dd4f3a15a13408f68c3 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json app/views/accounts/_header.html.haml
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 ce1048fee..41837d462 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? - @json['type'] == 'Person' + ActivityPub::FetchRemoteAccountService::SUPPORTED_TYPES.include?(@json['type']) end def public_key? @@ -55,6 +55,6 @@ class ActivityPub::FetchRemoteKeyService < BaseService end def confirmed_owner? - @owner['type'] == 'Person' && value_or_id(@owner['publicKey']) == @json['id'] + ActivityPub::FetchRemoteAccountService::SUPPORTED_TYPES.include?(@owner['type']) && value_or_id(@owner['publicKey']) == @json['id'] end end |