Merge remote-tracking branch 'glitchsoc/master' into gs-master

2018-05-08 09:43:33 -05:00
parent 7600067a30 919e2098cb
commit 143878d9da
46 changed files with 804 additions and 445 deletions
--- a/app/models/glitch/keyword_mute.rb
+++ b/app/models/glitch/keyword_mute.rb
@@ -70,7 +70,7 @@ class Glitch::KeywordMute < ApplicationRecord

    def make_regex_text
      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

      Regexp.union(kws).source