Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions

Conflicts: app/models/glitch/keyword_mute.rb
2018-06-12 16:39:30 -05:00
parent 97d2df77aa 34f1fd2a62
commit e931cf656d
100 changed files with 477 additions and 486 deletions
--- a/app/models/glitch/keyword_mute.rb
+++ b/app/models/glitch/keyword_mute.rb
@@ -67,7 +67,7 @@ class Glitch::KeywordMute < ApplicationRecord

    def matches?(str, required_scope)
      ((required_scope & scope) == required_scope) && \
-        str =~ (whole_word ? boundary_regex_for_keyword : /#{keyword}/i)
+        str =~ (whole_word ? boundary_regex_for_keyword : /#{Regexp.escape(keyword)}/i)
    end
  end