Refactor monkey-patching of Goldfinger (#12561)

2020-05-10 11:41:43 +02:00
parent 4a2ea2e51b
commit 4b766f9846
6 changed files with 40 additions and 20 deletions
--- a/app/services/resolve_account_service.rb
+++ b/app/services/resolve_account_service.rb
@ -3,6 +3,7 @@
 class ResolveAccountService < BaseService
  include JsonLdHelper
  include DomainControlHelper
+  include WebfingerHelper

  class WebfingerRedirectError < StandardError; end

@ -76,7 +77,7 @@ class ResolveAccountService < BaseService
  end

  def process_webfinger!(uri, redirected = false)
-    @webfinger                           = Goldfinger.finger("acct:#{uri}")
+    @webfinger                           = webfinger!("acct:#{uri}")
    confirmed_username, confirmed_domain = @webfinger.subject.gsub(/\Aacct:/, '').split('@')

    if confirmed_username.casecmp(@username).zero? && confirmed_domain.casecmp(@domain).zero?