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

hide mentions of muted accounts (in home col) (#190)

Browse Source 
* hide mentions of muted accounts (in home col)

also cleans up some old crap

* add test
This commit is contained in:
beatrix
2017-10-20 10:49:54 -04:00
committed by GitHub
parent b15dd05514
commit a7be86e875
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/lib/feed_manager.rb
View File

@@ -138,16 +138,11 @@ class FeedManager
end
def filter_from_home?(status, receiver_id)
# extremely violent filtering code BEGIN
#filter_string = 'e'
#reggie = Regexp.new(filter_string)
#return true if reggie === status.content || reggie === status.spoiler_text
# extremely violent filtering code END
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?)
check_for_mutes = [status.account_id]
check_for_mutes.concat(status.mentions.pluck(:account_id))
check_for_mutes.concat([status.reblog.account_id]) if status.reblog?
return true if Mute.where(account_id: receiver_id, target_account_id: check_for_mutes).any?