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_account_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_account_service.rb')
-rw-r--r-- | app/services/activitypub/fetch_remote_account_service.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/activitypub/fetch_remote_account_service.rb b/app/services/activitypub/fetch_remote_account_service.rb index d6ba625a9..5024853ca 100644 --- a/app/services/activitypub/fetch_remote_account_service.rb +++ b/app/services/activitypub/fetch_remote_account_service.rb @@ -3,6 +3,8 @@ class ActivityPub::FetchRemoteAccountService < BaseService include JsonLdHelper + SUPPORTED_TYPES = %w(Application Group Organization Person Service).freeze + # Should be called when uri has already been checked for locality # Does a WebFinger roundtrip on each call def call(uri, id: true, prefetched_body: nil) @@ -54,6 +56,6 @@ class ActivityPub::FetchRemoteAccountService < BaseService end def expected_type? - @json['type'] == 'Person' + SUPPORTED_TYPES.include?(@json['type']) end end |