mirror of
https://github.com/glitch-soc/mastodon.git
synced 2026-03-29 03:00:33 +02:00
Use consistent calling style for TagManager#normalize_domain (#35764)
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user