From ae630e0109430f9b401452d06361361be5b3a771 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 29 Jul 2024 16:27:12 -0400
Subject: [PATCH] Remove `WebfingerHelper` module & move usage inline

---
 app/helpers/webfinger_helper.rb                        | 7 -------
 app/models/remote_follow.rb                            | 3 +--
 app/services/activitypub/fetch_remote_actor_service.rb | 5 ++---
 app/services/resolve_account_service.rb                | 5 ++---
 4 files changed, 5 insertions(+), 15 deletions(-)
 delete mode 100644 app/helpers/webfinger_helper.rb

diff --git a/app/helpers/webfinger_helper.rb b/app/helpers/webfinger_helper.rb
deleted file mode 100644
index 482f4e19eab..00000000000
--- a/app/helpers/webfinger_helper.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-module WebfingerHelper
-  def webfinger!(uri)
-    Webfinger.new(uri).perform
-  end
-end
diff --git a/app/models/remote_follow.rb b/app/models/remote_follow.rb
index 10715ac97da..fa0586f57eb 100644
--- a/app/models/remote_follow.rb
+++ b/app/models/remote_follow.rb
@@ -3,7 +3,6 @@
 class RemoteFollow
   include ActiveModel::Validations
   include RoutingHelper
-  include WebfingerHelper
 
   attr_accessor :acct, :addressable_template
 
@@ -66,7 +65,7 @@ class RemoteFollow
   end
 
   def acct_resource
-    @acct_resource ||= webfinger!("acct:#{acct}")
+    @acct_resource ||= Webfinger.new("acct:#{acct}").perform
   rescue Webfinger::Error, HTTP::ConnectionError
     nil
   end
diff --git a/app/services/activitypub/fetch_remote_actor_service.rb b/app/services/activitypub/fetch_remote_actor_service.rb
index 2c372c2ec3f..560cf424e15 100644
--- a/app/services/activitypub/fetch_remote_actor_service.rb
+++ b/app/services/activitypub/fetch_remote_actor_service.rb
@@ -3,7 +3,6 @@
 class ActivityPub::FetchRemoteActorService < BaseService
   include JsonLdHelper
   include DomainControlHelper
-  include WebfingerHelper
 
   class Error < StandardError; end
 
@@ -45,7 +44,7 @@ class ActivityPub::FetchRemoteActorService < BaseService
   private
 
   def check_webfinger!
-    webfinger                            = webfinger!("acct:#{@username}@#{@domain}")
+    webfinger = Webfinger.new("acct:#{@username}@#{@domain}").perform
     confirmed_username, confirmed_domain = split_acct(webfinger.subject)
 
     if @username.casecmp(confirmed_username).zero? && @domain.casecmp(confirmed_domain).zero?
@@ -54,7 +53,7 @@ class ActivityPub::FetchRemoteActorService < BaseService
       return
     end
 
-    webfinger                            = webfinger!("acct:#{confirmed_username}@#{confirmed_domain}")
+    webfinger = Webfinger.new("acct:#{confirmed_username}@#{confirmed_domain}").perform
     @username, @domain                   = split_acct(webfinger.subject)
 
     raise Webfinger::RedirectError, "Too many webfinger redirects for URI #{@uri} (stopped at #{@username}@#{@domain})" unless confirmed_username.casecmp(@username).zero? && confirmed_domain.casecmp(@domain).zero?
diff --git a/app/services/resolve_account_service.rb b/app/services/resolve_account_service.rb
index 8a5863baba6..cd96b55c740 100644
--- a/app/services/resolve_account_service.rb
+++ b/app/services/resolve_account_service.rb
@@ -2,7 +2,6 @@
 
 class ResolveAccountService < BaseService
   include DomainControlHelper
-  include WebfingerHelper
   include Redisable
   include Lockable
 
@@ -81,7 +80,7 @@ class ResolveAccountService < BaseService
   end
 
   def process_webfinger!(uri)
-    @webfinger                           = webfinger!("acct:#{uri}")
+    @webfinger = Webfinger.new("acct:#{uri}").perform
     confirmed_username, confirmed_domain = split_acct(@webfinger.subject)
 
     if confirmed_username.casecmp(@username).zero? && confirmed_domain.casecmp(@domain).zero?
@@ -91,7 +90,7 @@ class ResolveAccountService < BaseService
     end
 
     # Account doesn't match, so it may have been redirected
-    @webfinger         = webfinger!("acct:#{confirmed_username}@#{confirmed_domain}")
+    @webfinger = Webfinger.new("acct:#{confirmed_username}@#{confirmed_domain}").perform
     @username, @domain = split_acct(@webfinger.subject)
 
     raise Webfinger::RedirectError, "Too many webfinger redirects for URI #{uri} (stopped at #{@username}@#{@domain})" unless confirmed_username.casecmp(@username).zero? && confirmed_domain.casecmp(@domain).zero?