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

2 files changed, 4 insertions, 7 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
diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb
index ea9588bec..fc2ad6794 100644
--- a/app/services/fan_out_on_write_service.rb
+++ b/app/services/fan_out_on_write_service.rb
@@ -8,7 +8,7 @@ class FanOutOnWriteService < BaseService
     deliver_to_followers(status)
     deliver_to_mentioned(status)
 
-    return if status.account.silenced? || !status.public_visibility?
+    return if status.account.silenced? || !status.public_visibility? || status.reblog? || (status.reply? && status.in_reply_to_account_id != status.account_id)
 
     deliver_to_hashtags(status)
     deliver_to_public(status)
@@ -41,8 +41,6 @@ class FanOutOnWriteService < BaseService
   end
 
   def deliver_to_hashtags(status)
-    return if status.reblog? || status.reply?
-
     Rails.logger.debug "Delivering status #{status.id} to hashtags"
     status.tags.find_each do |tag|
       FeedManager.instance.broadcast("hashtag:#{tag.name}", type: 'update', id: status.id)
@@ -50,8 +48,6 @@ class FanOutOnWriteService < BaseService
   end
 
   def deliver_to_public(status)
-    return if status.reblog? || status.reply?
-
     Rails.logger.debug "Delivering status #{status.id} to public timeline"
     FeedManager.instance.broadcast(:public, type: 'update', id: status.id)
   end