mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-27 11:53:41 +01:00
Replace =~ with #matches?. #208.
=~ made sense when we were passing it through to a regex, but we're no longer doing that: TagMatcher looks at individual tags and returns a value that *looks* like what you get out of #=~ but really isn't that meaningful. Probably a good idea to not subvert convention like this and instead use a name with guessable intent.
This commit is contained in:
parent
8fc54890e5
commit
08652baab0
3 changed files with 25 additions and 25 deletions
|
@ -174,19 +174,19 @@ class FeedManager
|
||||||
text_matcher = Glitch::KeywordMute.text_matcher_for(receiver_id)
|
text_matcher = Glitch::KeywordMute.text_matcher_for(receiver_id)
|
||||||
tag_matcher = Glitch::KeywordMute.tag_matcher_for(receiver_id)
|
tag_matcher = Glitch::KeywordMute.tag_matcher_for(receiver_id)
|
||||||
|
|
||||||
should_filter = text_matcher =~ status.text
|
should_filter = text_matcher.matches?(status.text)
|
||||||
should_filter ||= text_matcher =~ status.spoiler_text
|
should_filter ||= text_matcher.matches?(status.spoiler_text)
|
||||||
should_filter ||= tag_matcher =~ status.tags
|
should_filter ||= tag_matcher.matches?(status.tags)
|
||||||
|
|
||||||
if status.reblog?
|
if status.reblog?
|
||||||
reblog = status.reblog
|
reblog = status.reblog
|
||||||
|
|
||||||
should_filter ||= text_matcher =~ reblog.text
|
should_filter ||= text_matcher.matches?(reblog.text)
|
||||||
should_filter ||= text_matcher =~ reblog.spoiler_text
|
should_filter ||= text_matcher.matches?(reblog.spoiler_text)
|
||||||
should_filter ||= tag_matcher =~ status.tags
|
should_filter ||= tag_matcher.matches?(status.tags)
|
||||||
end
|
end
|
||||||
|
|
||||||
!!should_filter
|
should_filter
|
||||||
end
|
end
|
||||||
|
|
||||||
def filter_from_mentions?(status, receiver_id)
|
def filter_from_mentions?(status, receiver_id)
|
||||||
|
|
|
@ -62,8 +62,8 @@ class Glitch::KeywordMute < ApplicationRecord
|
||||||
format('keyword_mutes:regex:text:%s', account_id)
|
format('keyword_mutes:regex:text:%s', account_id)
|
||||||
end
|
end
|
||||||
|
|
||||||
def =~(str)
|
def matches?(str)
|
||||||
regex =~ str
|
!!(regex =~ str)
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
@ -82,8 +82,8 @@ class Glitch::KeywordMute < ApplicationRecord
|
||||||
format('keyword_mutes:regex:tag:%s', account_id)
|
format('keyword_mutes:regex:tag:%s', account_id)
|
||||||
end
|
end
|
||||||
|
|
||||||
def =~(tags)
|
def matches?(tags)
|
||||||
tags.pluck(:name).detect { |n| regex =~ n }
|
tags.pluck(:name).any? { |n| regex =~ n }
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
|
@ -13,7 +13,7 @@ RSpec.describe Glitch::KeywordMute, type: :model do
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'does not match' do
|
it 'does not match' do
|
||||||
expect(matcher =~ 'This is a hot take').to be_falsy
|
expect(matcher.matches?('This is a hot take')).to be_falsy
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -21,75 +21,75 @@ RSpec.describe Glitch::KeywordMute, type: :model do
|
||||||
it 'does not match keywords set by a different account' do
|
it 'does not match keywords set by a different account' do
|
||||||
Glitch::KeywordMute.create!(account: bob, keyword: 'take')
|
Glitch::KeywordMute.create!(account: bob, keyword: 'take')
|
||||||
|
|
||||||
expect(matcher =~ 'This is a hot take').to be_falsy
|
expect(matcher.matches?('This is a hot take')).to be_falsy
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'does not match if no keywords match the status text' do
|
it 'does not match if no keywords match the status text' do
|
||||||
Glitch::KeywordMute.create!(account: alice, keyword: 'cold')
|
Glitch::KeywordMute.create!(account: alice, keyword: 'cold')
|
||||||
|
|
||||||
expect(matcher =~ 'This is a hot take').to be_falsy
|
expect(matcher.matches?('This is a hot take')).to be_falsy
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'considers word boundaries when matching' do
|
it 'considers word boundaries when matching' do
|
||||||
Glitch::KeywordMute.create!(account: alice, keyword: 'bob', whole_word: true)
|
Glitch::KeywordMute.create!(account: alice, keyword: 'bob', whole_word: true)
|
||||||
|
|
||||||
expect(matcher =~ 'bobcats').to be_falsy
|
expect(matcher.matches?('bobcats')).to be_falsy
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'matches substrings if whole_word is false' do
|
it 'matches substrings if whole_word is false' do
|
||||||
Glitch::KeywordMute.create!(account: alice, keyword: 'take', whole_word: false)
|
Glitch::KeywordMute.create!(account: alice, keyword: 'take', whole_word: false)
|
||||||
|
|
||||||
expect(matcher =~ 'This is a shiitake mushroom').to be_truthy
|
expect(matcher.matches?('This is a shiitake mushroom')).to be_truthy
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'matches keywords at the beginning of the text' do
|
it 'matches keywords at the beginning of the text' do
|
||||||
Glitch::KeywordMute.create!(account: alice, keyword: 'take')
|
Glitch::KeywordMute.create!(account: alice, keyword: 'take')
|
||||||
|
|
||||||
expect(matcher =~ 'Take this').to be_truthy
|
expect(matcher.matches?('Take this')).to be_truthy
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'matches keywords at the end of the text' do
|
it 'matches keywords at the end of the text' do
|
||||||
Glitch::KeywordMute.create!(account: alice, keyword: 'take')
|
Glitch::KeywordMute.create!(account: alice, keyword: 'take')
|
||||||
|
|
||||||
expect(matcher =~ 'This is a hot take').to be_truthy
|
expect(matcher.matches?('This is a hot take')).to be_truthy
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'matches if at least one keyword case-insensitively matches the text' do
|
it 'matches if at least one keyword case-insensitively matches the text' do
|
||||||
Glitch::KeywordMute.create!(account: alice, keyword: 'hot')
|
Glitch::KeywordMute.create!(account: alice, keyword: 'hot')
|
||||||
|
|
||||||
expect(matcher =~ 'This is a HOT take').to be_truthy
|
expect(matcher.matches?('This is a HOT take')).to be_truthy
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'maintains case-insensitivity when combining keywords into a single matcher' do
|
it 'maintains case-insensitivity when combining keywords into a single matcher' do
|
||||||
Glitch::KeywordMute.create!(account: alice, keyword: 'hot')
|
Glitch::KeywordMute.create!(account: alice, keyword: 'hot')
|
||||||
Glitch::KeywordMute.create!(account: alice, keyword: 'cold')
|
Glitch::KeywordMute.create!(account: alice, keyword: 'cold')
|
||||||
|
|
||||||
expect(matcher =~ 'This is a HOT take').to be_truthy
|
expect(matcher.matches?('This is a HOT take')).to be_truthy
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'matches keywords surrounded by non-alphanumeric ornamentation' do
|
it 'matches keywords surrounded by non-alphanumeric ornamentation' do
|
||||||
Glitch::KeywordMute.create!(account: alice, keyword: 'hot')
|
Glitch::KeywordMute.create!(account: alice, keyword: 'hot')
|
||||||
|
|
||||||
expect(matcher =~ '(hot take)').to be_truthy
|
expect(matcher.matches?('(hot take)')).to be_truthy
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'escapes metacharacters in keywords' do
|
it 'escapes metacharacters in keywords' do
|
||||||
Glitch::KeywordMute.create!(account: alice, keyword: '(hot take)')
|
Glitch::KeywordMute.create!(account: alice, keyword: '(hot take)')
|
||||||
|
|
||||||
expect(matcher =~ '(hot take)').to be_truthy
|
expect(matcher.matches?('(hot take)')).to be_truthy
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'uses case-folding rules appropriate for more than just English' do
|
it 'uses case-folding rules appropriate for more than just English' do
|
||||||
Glitch::KeywordMute.create!(account: alice, keyword: 'großeltern')
|
Glitch::KeywordMute.create!(account: alice, keyword: 'großeltern')
|
||||||
|
|
||||||
expect(matcher =~ 'besuch der grosseltern').to be_truthy
|
expect(matcher.matches?('besuch der grosseltern')).to be_truthy
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'matches keywords that are composed of multiple words' do
|
it 'matches keywords that are composed of multiple words' do
|
||||||
Glitch::KeywordMute.create!(account: alice, keyword: 'a shiitake')
|
Glitch::KeywordMute.create!(account: alice, keyword: 'a shiitake')
|
||||||
|
|
||||||
expect(matcher =~ 'This is a shiitake').to be_truthy
|
expect(matcher.matches?('This is a shiitake')).to be_truthy
|
||||||
expect(matcher =~ 'This is shiitake').to_not be_truthy
|
expect(matcher.matches?('This is shiitake')).to_not be_truthy
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue