erik/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00
Code Issues Projects Releases Wiki Activity

Filter statuses that mention blocked users

Browse source
This commit is contained in:
Eugen Rochko 2016-11-25 12:35:21 +01:00
parent 543d06971e
commit e3ed212b85
2 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/lib/feed_manager.rb
View file

@ -68,30 +68,34 @@ class FeedManager
def filter_from_home?(status, receiver) def filter_from_home?(status, receiver)
should_filter = false should_filter = false
if status.reply? && !status.thread.account.nil? # Filter out if it's a reply 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.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 &&= !(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 should_filter &&= !(status.account_id == status.thread.account_id) # and it's not a self-reply
elsif status.reblog? # Filter out a reblog elsif status.reblog? # Filter out a reblog
should_filter = receiver.blocking?(status.reblog.account) # if I'm blocking the reblogged person should_filter = receiver.blocking?(status.reblog.account) # if I'm blocking the reblogged person
end end
should_filter ||= receiver.blocking?(status.mentions.map(&:account_id)) # or if it mentions someone I blocked
should_filter should_filter
end end
def filter_from_mentions?(status, receiver) def filter_from_mentions?(status, receiver)
should_filter = receiver.id == status.account_id # Filter if I'm mentioning myself 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.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 if status.reply? && !status.thread.account.nil? # or it's a reply
should_filter ||= receiver.blocking?(status.thread.account) # to a user I blocked should_filter ||= receiver.blocking?(status.thread.account) # to a user I blocked
end end
should_filter should_filter
end end
def filter_from_public?(status, receiver) 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? if status.reply? && !status.thread.account.nil?
should_filter ||= receiver.blocking?(status.thread.account) should_filter ||= receiver.blocking?(status.thread.account)

4
app/models/account.rb
View file

@ -66,12 +66,12 @@ class Account < ApplicationRecord
def unfollow!(other_account) def unfollow!(other_account)
follow = active_relationships.find_by(target_account: other_account) follow = active_relationships.find_by(target_account: other_account)
follow.destroy unless follow.nil? follow&.destroy
end end
def unblock!(other_account) def unblock!(other_account)
block = block_relationships.find_by(target_account: other_account) block = block_relationships.find_by(target_account: other_account)
block.destroy unless block.nil? block&.destroy
end end
def following?(other_account) def following?(other_account)