From bf60f2898d8c9dcf880bd14c187caf90b9549a2a Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 31 Jan 2017 22:34:33 +0100 Subject: Fix #529 - Make hashtag timelines show conversations, fix hashtag loading in the UI --- app/services/fan_out_on_write_service.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'app/services') diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb index fc2ad6794..4f387c6c2 100644 --- a/app/services/fan_out_on_write_service.rb +++ b/app/services/fan_out_on_write_service.rb @@ -8,9 +8,12 @@ class FanOutOnWriteService < BaseService deliver_to_followers(status) deliver_to_mentioned(status) - return if status.account.silenced? || !status.public_visibility? || status.reblog? || (status.reply? && status.in_reply_to_account_id != status.account_id) + return if status.account.silenced? || !status.public_visibility? || status.reblog? deliver_to_hashtags(status) + + return if status.reply? && status.in_reply_to_account_id != status.account_id + deliver_to_public(status) end -- cgit