Discard misattributed remote statuses, improve timelines filter

2016-11-10 00:15:49 +01:00
parent 17903c6dae
commit aabf884c5f
3 changed files with 15 additions and 4 deletions
--- a/app/models/status.rb
+++ b/app/models/status.rb
@ -121,6 +121,7 @@ class Status < ApplicationRecord

    def filter_timeline(query, account)
      blocked = Block.where(account: account).pluck(:target_account_id)
+      return query if blocked.empty?

      query
        .joins('LEFT OUTER JOIN statuses AS parents ON statuses.in_reply_to_id = parents.id')