zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 9 Releases Wiki Activity

Filter statuses that mention blocked users

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

4
app/lib/feed_manager.rb
View File

@ -76,12 +76,15 @@ class FeedManager
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.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
@ -92,6 +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))
if status.reply? && !status.thread.account.nil?
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)
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)