Browse Source

Escape metacharacters in non-whole-word keyword mutes. Fixes #533.

Also addresses #463.
closed-social-glitch-2
David Yip 6 years ago
parent
commit
a640c322c1
No known key found for this signature in database GPG Key ID: 7DA0036508FCC0CC
2 changed files with 8 additions and 2 deletions
  1. +1
    -1
      app/models/glitch/keyword_mute.rb
  2. +7
    -1
      spec/models/glitch/keyword_mute_spec.rb

+ 1
- 1
app/models/glitch/keyword_mute.rb View File

@ -50,7 +50,7 @@ class Glitch::KeywordMute < ApplicationRecord
end
def matches?(str)
str =~ (whole_word ? boundary_regex_for_keyword : /#{keyword}/i)
str =~ (whole_word ? boundary_regex_for_keyword : /#{Regexp.escape(keyword)}/i)
end
end

+ 7
- 1
spec/models/glitch/keyword_mute_spec.rb View File

@ -79,12 +79,18 @@ RSpec.describe Glitch::KeywordMute, type: :model do
expect(matcher.matches?('(hot take)')).to be_truthy
end
it 'escapes metacharacters in keywords' do
it 'escapes metacharacters in whole-word keywords' do
Glitch::KeywordMute.create!(account: alice, keyword: '(hot take)')
expect(matcher.matches?('(hot take)')).to be_truthy
end
it 'escapes metacharacters in non-whole-word keywords' do
Glitch::KeywordMute.create!(account: alice, keyword: '(-', whole_word: false)
expect(matcher.matches?('bad (-)')).to be_truthy
end
it 'uses case-folding rules appropriate for more than just English' do
Glitch::KeywordMute.create!(account: alice, keyword: 'großeltern')

Loading…
Cancel
Save