Fix #323 - self-replies to appear in public timelines again

1 files changed, 3 insertions, 2 deletions

diff --git a/app/models/status.rb b/app/models/status.rb
index 1a37ea86f..1e70101a3 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -105,7 +105,7 @@ class Status < ApplicationRecord
       query = joins('LEFT OUTER JOIN accounts ON statuses.account_id = accounts.id')
               .where(visibility: :public)
               .where('accounts.silenced = FALSE')
-              .where('statuses.in_reply_to_id IS NULL')
+              .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')
       query = filter_timeline(query, account) unless account.nil?
       query
@@ -116,7 +116,7 @@ class Status < ApplicationRecord
                  .joins('LEFT OUTER JOIN accounts ON statuses.account_id = accounts.id')
                  .where(visibility: :public)
                  .where('accounts.silenced = FALSE')
-                 .where('statuses.in_reply_to_id IS NULL')
+                 .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')
       query = filter_timeline(query, account) unless account.nil?
       query
@@ -141,5 +141,6 @@ class Status < ApplicationRecord
 
   before_validation do
     text.strip!
+    self.in_reply_to_account_id = thread.account_id if reply?
   end
 end