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

Match keyword mute filter on hashtags. #208.

Browse Source 
It is reasonable to expect someone to enter #foo to mute hashtag #foo.
However, tags are recorded on statuses without the preceding #.
To adjust for this, we build a separate tag matcher and use
Tag::HASHTAG_RE to extract a hashtag from the hashtag syntax.
This commit is contained in:
David Yip
2017-11-15 17:26:29 -06:00
parent 431503bae2
commit cb4ef24ac9
3 changed files with 69 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/lib/feed_manager.rb
View File

@ -141,7 +141,7 @@ class FeedManager
return false if receiver_id == status.account_id
return true if status.reply? && (status.in_reply_to_id.nil? || status.in_reply_to_account_id.nil?)
return true if keyword_filter?(status, Glitch::KeywordMute.matcher_for(receiver_id))
return true if keyword_filter?(status, receiver_id)
check_for_mutes = [status.account_id]
check_for_mutes.concat(status.mentions.pluck(:account_id))
@ -170,17 +170,20 @@ class FeedManager
false
end
def keyword_filter?(status, matcher)
should_filter = matcher =~ status.text
should_filter ||= matcher =~ status.spoiler_text
should_filter ||= status.tags.find_each.any? { |t| matcher =~ t.name }
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 =~ status.text
should_filter ||= text_matcher =~ status.spoiler_text
should_filter ||= tag_matcher =~ status.tags
if status.reblog?
reblog = status.reblog
should_filter ||= matcher =~ reblog.text
should_filter ||= matcher =~ reblog.spoiler_text
should_filter ||= reblog.tags.find_each.any? { |t| matcher =~ t.name }
should_filter ||= text_matcher =~ reblog.text
should_filter ||= text_matcher =~ reblog.spoiler_text
should_filter ||= tag_matcher =~ status.tags
end
!!should_filter
@ -195,7 +198,7 @@ class FeedManager
should_filter = Block.where(account_id: receiver_id, target_account_id: check_for_blocks).any? # Filter if it's from someone I blocked, in reply to someone I blocked, or mentioning someone I blocked
should_filter ||= (status.account.silenced? && !Follow.where(account_id: receiver_id, target_account_id: status.account_id).exists?) # of if the account is silenced and I'm not following them
should_filter ||= keyword_filter?(status, Glitch::KeywordMute.matcher_for(receiver_id)) # or if the mention contains a muted keyword
should_filter ||= keyword_filter?(status, receiver_id) # or if the mention contains a muted keyword
should_filter
end