alex
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #458 from monsterpit-daggertooth/glitch-fix-escape-metachars-in-mutes 

Escape regex metachars in keyword mutes
signup-info-prompt
beatrix 2018-05-06 11:32:22 -04:00 committed by GitHub
parent 35a1a3171f b25278180a
commit e56639258a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/glitch/keyword_mute.rb
View File

@ -70,7 +70,7 @@ class Glitch::KeywordMute < ApplicationRecord
def make_regex_text def make_regex_text
kws = keywords.map! do |whole_word, keyword| kws = keywords.map! do |whole_word, keyword|
whole_word ? boundary_regex_for_keyword(keyword) : /(?i:#{keyword})/ whole_word ? boundary_regex_for_keyword(keyword) : /(?i:#{Regexp.escape(keyword)})/
end end
Regexp.union(kws).source Regexp.union(kws).source