me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove duplicate code for handling muted users

Browse source 
The mute check was indeed streamlined in c5fa8041c2
and we somehow kept some of the old code when merging.
This commit is contained in:
Thibaut Girka 2018-07-05 19:32:50 +02:00 committed by ThibG
parent 98c0128d3b
commit 6016b5d57b
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/lib/feed_manager.rb
View file

@ -155,12 +155,6 @@ class FeedManager
return true if status.reply? && (status.in_reply_to_id.nil? || status.in_reply_to_account_id.nil?) return true if status.reply? && (status.in_reply_to_id.nil? || status.in_reply_to_account_id.nil?)
return true if keyword_filter_from_home?(status, receiver_id) return true if keyword_filter_from_home?(status, receiver_id)
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?
check_for_blocks = status.mentions.pluck(:account_id) check_for_blocks = status.mentions.pluck(:account_id)
check_for_blocks.concat([status.account_id]) check_for_blocks.concat([status.account_id])
check_for_blocks.concat([status.reblog.account_id]) if status.reblog? check_for_blocks.concat([status.reblog.account_id]) if status.reblog?