Skip to content

Commit

Permalink
Revert "Include replies to list owner and replies to list members in …
Browse files Browse the repository at this point in the history
…list statuses (mastodon#9324)"

This reverts commit 466e3d7.
  • Loading branch information
TheInventrix committed Dec 29, 2018
1 parent 6960cc5 commit 0aa17cd
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions app/lib/feed_manager.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,7 @@ def unpush_from_home(account, status)
end

def push_to_list(list, status)
if status.reply? && status.in_reply_to_account_id != status.account_id
should_filter = status.in_reply_to_account_id != list.account_id
should_filter &&= !ListAccount.where(list_id: list.id, account_id: status.in_reply_to_account_id).exists?
return false if should_filter
end
return false if status.reply? && status.in_reply_to_account_id != status.account_id
return false unless add_to_feed(:list, list.id, status)
trim(:list, list.id)
PushUpdateWorker.perform_async(list.account_id, status.id, "timeline:list:#{list.id}") if push_update_required?("timeline:list:#{list.id}")
Expand Down

0 comments on commit 0aa17cd

Please sign in to comment.