From 57b893d505a6fd0a11b9e53261bc029adee2aa24 Mon Sep 17 00:00:00 2001 From: Claire Date: Sun, 27 Nov 2022 20:47:29 +0100 Subject: [PATCH] Fix spaces not being stripped in admin account search (#21324) Fixes #21058 Regression from #18641 --- app/models/account_filter.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/account_filter.rb b/app/models/account_filter.rb index e09ce4ec2..3a4ac0492 100644 --- a/app/models/account_filter.rb +++ b/app/models/account_filter.rb @@ -43,13 +43,13 @@ class AccountFilter when 'status' status_scope(value) when 'by_domain' - Account.where(domain: value.to_s) + Account.where(domain: value.to_s.strip) when 'username' - Account.matches_username(value.to_s) + Account.matches_username(value.to_s.strip) when 'display_name' - Account.matches_display_name(value.to_s) + Account.matches_display_name(value.to_s.strip) when 'email' - accounts_with_users.merge(User.matches_email(value.to_s)) + accounts_with_users.merge(User.matches_email(value.to_s.strip)) when 'ip' valid_ip?(value) ? accounts_with_users.merge(User.matches_ip(value).group('users.id, accounts.id')) : Account.none when 'invited_by'