Filter statuses that mention blocked users
This commit is contained in:
parent
543d06971e
commit
e3ed212b85
|
@ -68,30 +68,34 @@ class FeedManager
|
|||
def filter_from_home?(status, receiver)
|
||||
should_filter = false
|
||||
|
||||
if status.reply? && !status.thread.account.nil? # Filter out if it's a reply
|
||||
should_filter = !receiver.following?(status.thread.account) # and I'm not following the person it's a reply to
|
||||
should_filter &&= !(receiver.id == status.thread.account_id) # and it's not a reply to me
|
||||
should_filter &&= !(status.account_id == status.thread.account_id) # and it's not a self-reply
|
||||
elsif status.reblog? # Filter out a reblog
|
||||
should_filter = receiver.blocking?(status.reblog.account) # if I'm blocking the reblogged person
|
||||
if status.reply? && !status.thread.account.nil? # Filter out if it's a reply
|
||||
should_filter = !receiver.following?(status.thread.account) # and I'm not following the person it's a reply to
|
||||
should_filter &&= !(receiver.id == status.thread.account_id) # and it's not a reply to me
|
||||
should_filter &&= !(status.account_id == status.thread.account_id) # and it's not a self-reply
|
||||
elsif status.reblog? # Filter out a reblog
|
||||
should_filter = receiver.blocking?(status.reblog.account) # if I'm blocking the reblogged person
|
||||
end
|
||||
|
||||
should_filter ||= receiver.blocking?(status.mentions.map(&:account_id)) # or if it mentions someone I blocked
|
||||
|
||||
should_filter
|
||||
end
|
||||
|
||||
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.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
|
||||
|
||||
if status.reply? && !status.thread.account.nil? # or it's a reply
|
||||
should_filter ||= receiver.blocking?(status.thread.account) # to a user 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
|
||||
end
|
||||
|
||||
should_filter
|
||||
end
|
||||
|
||||
def filter_from_public?(status, receiver)
|
||||
should_filter = receiver.blocking?(status.account)
|
||||
should_filter = receiver.blocking?(status.account)
|
||||
should_filter ||= receiver.blocking?(status.mentions.map(&:account_id))
|
||||
|
||||
if status.reply? && !status.thread.account.nil?
|
||||
should_filter ||= receiver.blocking?(status.thread.account)
|
||||
|
|
|
@ -66,12 +66,12 @@ class Account < ApplicationRecord
|
|||
|
||||
def unfollow!(other_account)
|
||||
follow = active_relationships.find_by(target_account: other_account)
|
||||
follow.destroy unless follow.nil?
|
||||
follow&.destroy
|
||||
end
|
||||
|
||||
def unblock!(other_account)
|
||||
block = block_relationships.find_by(target_account: other_account)
|
||||
block.destroy unless block.nil?
|
||||
block&.destroy
|
||||
end
|
||||
|
||||
def following?(other_account)
|
||||
|
|
Reference in a new issue