diff options
author | David Yip <yipdw@member.fsf.org> | 2017-12-03 21:40:28 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-02-10 02:40:27 -0600 |
commit | d263e3bc2de720f4e6749cf4a8f2074427b65d07 (patch) | |
tree | eed34e77c2b8a84f822768e6d38718cd039da2b3 /app/models/glitch/filter_helper.rb | |
parent | 29b5b46c87979f49e2d1c4e574429ac649ff2bdf (diff) |
Fill out some examples for Glitch::FilterHelper. #234.
Also add HTML entity decoding to Glitch::FilterHelper, which is needed to e.g. match "<" to the tag-stripped version of "<p><3</p>" or "<p><3</p>".
Diffstat (limited to 'app/models/glitch/filter_helper.rb')
-rw-r--r-- | app/models/glitch/filter_helper.rb | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/app/models/glitch/filter_helper.rb b/app/models/glitch/filter_helper.rb index 0dfd69526..11be877c1 100644 --- a/app/models/glitch/filter_helper.rb +++ b/app/models/glitch/filter_helper.rb @@ -1,12 +1,16 @@ +require 'htmlentities' + class Glitch::FilterHelper include ActionView::Helpers::SanitizeHelper attr_reader :text_matcher attr_reader :tag_matcher + attr_reader :entity_decoder def initialize(receiver_id) - @text_matcher = Glitch::KeywordMute.text_matcher_for(receiver_id) - @tag_matcher = Glitch::KeywordMute.tag_matcher_for(receiver_id) + @text_matcher = Glitch::KeywordMute.text_matcher_for(receiver_id) + @tag_matcher = Glitch::KeywordMute.tag_matcher_for(receiver_id) + @entity_decoder = HTMLEntities.new end def matches?(status) @@ -16,8 +20,12 @@ class Glitch::FilterHelper private def matchers_match?(status) - text_matcher.matches?(strip_tags(status.text)) || - text_matcher.matches?(strip_tags(status.spoiler_text)) || + text_matcher.matches?(prepare_text(status.text)) || + text_matcher.matches?(prepare_text(status.spoiler_text)) || tag_matcher.matches?(status.tags) end + + def prepare_text(text) + entity_decoder.decode(strip_tags(text)) + end end |