Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix #65 - Options to block notifications from people you don't follow/who don't follow you

Browse source
This commit is contained in:
Eugen Rochko 2016-11-25 13:13:16 +01:00
parent e3ed212b85
commit 71401659b8
8 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/lib/feed_manager.rb
View file

@ -84,7 +84,7 @@ class FeedManager
def filter_from_mentions?(status, receiver)
should_filter = receiver.id == status.account_id # Filter if I'm mentioning myself
should_filter ||= receiver.blocking?(status.account) # or it's from someone I blocked
should_filter ||= receiver.blocking?(status.mentions.map(&:account_id)) # or if it mentions someone I blocked
should_filter ||= receiver.blocking?(status.mentions.includes(:account).map(&:account)) # or if it mentions someone I blocked
if status.reply? && !status.thread.account.nil? # or it's a reply
should_filter ||= receiver.blocking?(status.thread.account) # to a user I blocked
@ -95,7 +95,7 @@ class FeedManager
def filter_from_public?(status, receiver)
should_filter = receiver.blocking?(status.account)
should_filter ||= receiver.blocking?(status.mentions.map(&:account_id))
should_filter ||= receiver.blocking?(status.mentions.includes(:account).map(&:account))
if status.reply? && !status.thread.account.nil?
should_filter ||= receiver.blocking?(status.thread.account)