ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix subtle home feed filtering bug

rebase/4.0.0rc2
Eugen 2016-09-27 10:52:37 +02:00 committed by GitHub
parent 7e14eefc81
commit 3f75f52285
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/lib/feed_manager.rb
View File

@ -9,9 +9,10 @@ class FeedManager
"feed:#{type}:#{id}" "feed:#{type}:#{id}"
end end
# Filter status out of the home feed if it is a reply to someone the user doesn't follow
def filter_status?(status, follower) def filter_status?(status, follower)
replied_to_user = status.reply? ? status.thread.account : nil replied_to_user = status.reply? ? status.thread.account : nil
(status.reply? && !(follower.id = replied_to_user.id || follower.following?(replied_to_user))) (status.reply? && !(follower.id == replied_to_user.id || replied_to_user.id == status.account_id || follower.following?(replied_to_user)))
end end
def push(timeline_type, account, status) def push(timeline_type, account, status)