Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Adding a block model and filter mentions from blocked users (fix #60)

Browse source
This commit is contained in:
Eugen Rochko 2016-10-03 17:11:54 +02:00
parent a488b05726
commit 9d59d7b463
11 changed files with 55 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/lib/feed_manager.rb
View file

@ -40,13 +40,13 @@ class FeedManager
end
# Filter status out of the home feed if it is a reply to someone the user doesn't follow
def filter_from_home?(status, follower)
def filter_from_home?(status, receiver)
replied_to_user = status.reply? ? status.thread.account : nil
(status.reply? && !(follower.id == replied_to_user.id || replied_to_user.id == status.account_id || follower.following?(replied_to_user)))
(status.reply? && !(receiver.id == replied_to_user.id || replied_to_user.id == status.account_id || receiver.following?(replied_to_user)))
end
def filter_from_mentions?(status, follower)
false
def filter_from_mentions?(status, receiver)
receiver.blocking?(status.account) || (status.reblog? && receiver.blocking?(status.reblog.account))
end
def inline_render(target_account, status)