diff options
author | Starfall <admin@plural.cafe> | 2020-05-15 18:30:58 -0500 |
---|---|---|
committer | Starfall <admin@plural.cafe> | 2020-05-15 18:30:58 -0500 |
commit | 3f6370500cd8bf04fab9c9d8f3099271126a3097 (patch) | |
tree | 7215e9562c06435f9e6464fee2aa0185dd108a34 /app/services/activitypub/fetch_remote_account_service.rb | |
parent | ca3af6c5b00be851e2ced9112429cfc1baa79529 (diff) | |
parent | b7e178d2e4102bdaa1ea41dfd8ed50093cf3f60a (diff) |
Update to Mastodon 3.1.4 / Merge branch 'glitch'
Diffstat (limited to 'app/services/activitypub/fetch_remote_account_service.rb')
-rw-r--r-- | app/services/activitypub/fetch_remote_account_service.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/services/activitypub/fetch_remote_account_service.rb b/app/services/activitypub/fetch_remote_account_service.rb index d65c8f951..83fbf6d07 100644 --- a/app/services/activitypub/fetch_remote_account_service.rb +++ b/app/services/activitypub/fetch_remote_account_service.rb @@ -3,6 +3,7 @@ class ActivityPub::FetchRemoteAccountService < BaseService include JsonLdHelper include DomainControlHelper + include WebfingerHelper SUPPORTED_TYPES = %w(Application Group Organization Person Service).freeze @@ -35,12 +36,12 @@ class ActivityPub::FetchRemoteAccountService < BaseService private def verified_webfinger? - webfinger = Goldfinger.finger("acct:#{@username}@#{@domain}") + webfinger = webfinger!("acct:#{@username}@#{@domain}") confirmed_username, confirmed_domain = split_acct(webfinger.subject) return webfinger.link('self')&.href == @uri if @username.casecmp(confirmed_username).zero? && @domain.casecmp(confirmed_domain).zero? - webfinger = Goldfinger.finger("acct:#{confirmed_username}@#{confirmed_domain}") + webfinger = webfinger!("acct:#{confirmed_username}@#{confirmed_domain}") @username, @domain = split_acct(webfinger.subject) self_reference = webfinger.link('self') |