From 7e5e96739f077f3a3001ca334c0d41530b21f812 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 27 Feb 2026 11:38:34 -0500
Subject: [PATCH] Use consistent calling style for
 `TagManager#normalize_domain` (#35764)

---
 app/controllers/admin/domain_blocks_controller.rb          | 2 +-
 .../admin/instances/moderation_notes_controller.rb         | 7 +++++--
 app/controllers/admin/instances_controller.rb              | 7 +++++--
 app/controllers/api/v1/peers/search_controller.rb          | 6 +-----
 app/lib/tag_manager.rb                                     | 6 +++---
 app/models/concerns/domain_normalizable.rb                 | 2 +-
 app/services/report_service.rb                             | 2 +-
 7 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/app/controllers/admin/domain_blocks_controller.rb b/app/controllers/admin/domain_blocks_controller.rb
index 5e1074b224..fdc8e53f53 100644
--- a/app/controllers/admin/domain_blocks_controller.rb
+++ b/app/controllers/admin/domain_blocks_controller.rb
@@ -54,7 +54,7 @@ module Admin
       end
 
       # Allow transparently upgrading a domain block
-      if existing_domain_block.present? && existing_domain_block.domain == TagManager.instance.normalize_domain(@domain_block.domain.strip)
+      if existing_domain_block.present? && existing_domain_block.domain == TagManager.instance.normalize_domain(@domain_block.domain)
         @domain_block = existing_domain_block
         @domain_block.assign_attributes(resource_params)
       end
diff --git a/app/controllers/admin/instances/moderation_notes_controller.rb b/app/controllers/admin/instances/moderation_notes_controller.rb
index 635c097349..dd6c32bda5 100644
--- a/app/controllers/admin/instances/moderation_notes_controller.rb
+++ b/app/controllers/admin/instances/moderation_notes_controller.rb
@@ -34,8 +34,11 @@ class Admin::Instances::ModerationNotesController < Admin::BaseController
   end
 
   def set_instance
-    domain = params[:instance_id]&.strip
-    @instance = Instance.find_or_initialize_by(domain: TagManager.instance.normalize_domain(domain))
+    @instance = Instance.find_or_initialize_by(domain: normalized_domain)
+  end
+
+  def normalized_domain
+    TagManager.instance.normalize_domain(params[:instance_id])
   end
 
   def set_instance_note
diff --git a/app/controllers/admin/instances_controller.rb b/app/controllers/admin/instances_controller.rb
index 6ab4acab99..033d250a2e 100644
--- a/app/controllers/admin/instances_controller.rb
+++ b/app/controllers/admin/instances_controller.rb
@@ -55,8 +55,11 @@ module Admin
     private
 
     def set_instance
-      domain = params[:id]&.strip
-      @instance = Instance.find_or_initialize_by(domain: TagManager.instance.normalize_domain(domain))
+      @instance = Instance.find_or_initialize_by(domain: normalized_domain)
+    end
+
+    def normalized_domain
+      TagManager.instance.normalize_domain(params[:id])
     end
 
     def set_instances
diff --git a/app/controllers/api/v1/peers/search_controller.rb b/app/controllers/api/v1/peers/search_controller.rb
index d9c8232702..27b7503e9f 100644
--- a/app/controllers/api/v1/peers/search_controller.rb
+++ b/app/controllers/api/v1/peers/search_controller.rb
@@ -47,10 +47,6 @@ class Api::V1::Peers::SearchController < Api::BaseController
   end
 
   def normalized_domain
-    TagManager.instance.normalize_domain(query_value)
-  end
-
-  def query_value
-    params[:q].strip
+    TagManager.instance.normalize_domain(params[:q])
   end
 end
diff --git a/app/lib/tag_manager.rb b/app/lib/tag_manager.rb
index 5a6284cc5b..4b2f96da63 100644
--- a/app/lib/tag_manager.rb
+++ b/app/lib/tag_manager.rb
@@ -17,9 +17,9 @@ class TagManager
   def normalize_domain(domain)
     return if domain.nil?
 
-    uri = Addressable::URI.new
-    uri.host = domain.strip.delete_suffix('/')
-    uri.normalized_host
+    Addressable::URI.new.tap do |uri|
+      uri.host = domain.strip.delete_suffix('/')
+    end.normalized_host
   end
 
   def local_url?(url)
diff --git a/app/models/concerns/domain_normalizable.rb b/app/models/concerns/domain_normalizable.rb
index 76f91c5b64..6571a40c54 100644
--- a/app/models/concerns/domain_normalizable.rb
+++ b/app/models/concerns/domain_normalizable.rb
@@ -22,7 +22,7 @@ module DomainNormalizable
   private
 
   def normalize_domain
-    self.domain = TagManager.instance.normalize_domain(domain&.strip)
+    self.domain = TagManager.instance.normalize_domain(domain)
   rescue Addressable::URI::InvalidURIError
     errors.add(:domain, :invalid)
   end
diff --git a/app/services/report_service.rb b/app/services/report_service.rb
index 433cd9cb8c..a666450af0 100644
--- a/app/services/report_service.rb
+++ b/app/services/report_service.rb
@@ -77,7 +77,7 @@ class ReportService < BaseService
   end
 
   def forward_to_domains
-    @forward_to_domains ||= (@options[:forward_to_domains] || [@target_account.domain]).filter_map { |domain| TagManager.instance.normalize_domain(domain&.strip) }.uniq
+    @forward_to_domains ||= (@options[:forward_to_domains] || [@target_account.domain]).filter_map { |domain| TagManager.instance.normalize_domain(domain) }.uniq
   end
 
   def reported_status_ids