Fix #529 - Make hashtag timelines show conversations, fix hashtag loading in the UI

2017-01-31 22:34:33 +01:00
parent 8ef79d8dc9
commit bf60f2898d
6 changed files with 14 additions and 8 deletions
--- a/app/models/status.rb
+++ b/app/models/status.rb
@ -119,7 +119,6 @@ class Status < ApplicationRecord
      query = tag.statuses
                 .joins('LEFT OUTER JOIN accounts ON statuses.account_id = accounts.id')
                 .where(visibility: :public)
-                 .where('(statuses.in_reply_to_id IS NULL OR statuses.in_reply_to_account_id = statuses.account_id)')
                 .where('statuses.reblog_of_id IS NULL')

      account.nil? ? filter_timeline_default(query) : filter_timeline_default(filter_timeline(query, account))