techhub/mastodon
2
0
Fork 0
Code Activity

Fix allow with approval option not working on username blocks (#35655)

Browse Source
This commit is contained in:
Eugen Rochko
2025-08-04 15:10:19 +02:00
committed by GitHub
parent c8ec649830
commit d8397040d7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/username_block.rb
View File

@@ -43,7 +43,7 @@ class UsernameBlock < ApplicationRecord
def self.matches?(str, allow_with_approval: false)
normalized_str = str.downcase.gsub(Regexp.union(HOMOGLYPHS.keys), HOMOGLYPHS)
where(allow_with_approval: allow_with_approval).matches_exactly(normalized_str).or(matches_partially(normalized_str)).any?
matches_exactly(normalized_str).or(matches_partially(normalized_str)).where(allow_with_approval: allow_with_approval).any?
end
def to_log_human_identifier