tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Strip HTML from keyword mute input. #234.

Browse Source
This commit is contained in:
David Yip
2017-12-03 17:28:30 -06:00
parent 3405ea6dd9
commit 29b5b46c87
2 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/lib/feed_manager.rb
View File

@@ -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)