From 29b5b46c87979f49e2d1c4e574429ac649ff2bdf Mon Sep 17 00:00:00 2001 From: David Yip Date: Sun, 3 Dec 2017 17:28:30 -0600 Subject: [PATCH] Strip HTML from keyword mute input. #234. --- app/lib/feed_manager.rb | 17 +---------------- app/models/glitch/filter_helper.rb | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 16 deletions(-) create mode 100644 app/models/glitch/filter_helper.rb diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index fe5ebfc36f..7507b37d24 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -178,22 +178,7 @@ class FeedManager end def keyword_filter?(status, receiver_id) - text_matcher = Glitch::KeywordMute.text_matcher_for(receiver_id) - tag_matcher = Glitch::KeywordMute.tag_matcher_for(receiver_id) - - should_filter = text_matcher.matches?(status.text) - should_filter ||= text_matcher.matches?(status.spoiler_text) - should_filter ||= tag_matcher.matches?(status.tags) - - if status.reblog? - reblog = status.reblog - - should_filter ||= text_matcher.matches?(reblog.text) - should_filter ||= text_matcher.matches?(reblog.spoiler_text) - should_filter ||= tag_matcher.matches?(status.tags) - end - - should_filter + Glitch::FilterHelper.new(receiver_id).matches?(status) end def filter_from_mentions?(status, receiver_id) diff --git a/app/models/glitch/filter_helper.rb b/app/models/glitch/filter_helper.rb new file mode 100644 index 0000000000..0dfd695265 --- /dev/null +++ b/app/models/glitch/filter_helper.rb @@ -0,0 +1,23 @@ +class Glitch::FilterHelper + include ActionView::Helpers::SanitizeHelper + + attr_reader :text_matcher + attr_reader :tag_matcher + + def initialize(receiver_id) + @text_matcher = Glitch::KeywordMute.text_matcher_for(receiver_id) + @tag_matcher = Glitch::KeywordMute.tag_matcher_for(receiver_id) + end + + def matches?(status) + matchers_match?(status) || (status.reblog? && matchers_match?(status.reblog)) + end + + private + + def matchers_match?(status) + text_matcher.matches?(strip_tags(status.text)) || + text_matcher.matches?(strip_tags(status.spoiler_text)) || + tag_matcher.matches?(status.tags) + end +end