From b10608299e374d5ea6607c4969c2bc1269729724 Mon Sep 17 00:00:00 2001 From: beatrix-bitrot Date: Thu, 19 Oct 2017 21:38:41 +0000 Subject: [PATCH] hide mentions of muted accounts (in home col) also cleans up some old crap --- app/lib/feed_manager.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index 39d3333dae..ca15745cb1 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -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?