asonix/mastodon
1
1
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Change moderation search an account using the username with @ (#24242)

Browse source
This commit is contained in:
Heitor de Melo Cardozo 2023-04-17 09:16:36 -03:00 committed by GitHub
parent ab740f464a
commit bc75e62ca6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/account_filter.rb
View file

@ -55,7 +55,7 @@ class AccountFilter
when 'by_domain'
Account.where(domain: value.to_s.strip)
when 'username'
Account.matches_username(value.to_s.strip)
Account.matches_username(value.to_s.strip.delete_prefix('@'))
when 'display_name'
Account.matches_display_name(value.to_s.strip)
when 'email'

19
spec/models/account_filter_spec.rb
View file

@ -44,4 +44,23 @@ describe AccountFilter do
expect(filter.results).to match_array [remote_account_one]
end
end
describe 'with username' do
let!(:local_account) { Fabricate(:account, domain: nil, username: 'validUserName') }
it 'works with @ at the beginning of the username' do
filter = described_class.new(username: '@validUserName')
expect(filter.results).to match_array [local_account]
end
it 'does not work with more than one @ at the beginning of the username' do
filter = described_class.new(username: '@@validUserName')
expect(filter.results).to_not match_array [local_account]
end
it 'does not work with @ outside the beginning of the username' do
filter = described_class.new(username: 'validUserName@')
expect(filter.results).to_not match_array [local_account]
end
end
end