Normalize idna domain before account unblock domain (#29530)

2024-03-11 18:28:08 +09:00
parent a7284690fc
commit 4a6ddbc9c0
2 changed files with 45 additions and 1 deletions
--- a/app/models/concerns/account/interactions.rb
+++ b/app/models/concerns/account/interactions.rb
@@ -178,7 +178,7 @@ module Account::Interactions
  end

  def unblock_domain!(other_domain)
-    block = domain_blocks.find_by(domain: other_domain)
+    block = domain_blocks.find_by(domain: normalized_domain(other_domain))
    block&.destroy
  end

@@ -300,4 +300,8 @@ module Account::Interactions
      domain_blocking_by_domain: Account.domain_blocking_map_by_domain(domains, id),
    })
  end
+
+  def normalized_domain(domain)
+    TagManager.instance.normalize_domain(domain)
+  end
 end