diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-31 22:34:33 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-31 22:35:38 +0100 |
| commit | bf60f2898d8c9dcf880bd14c187caf90b9549a2a (patch) | |
| tree | 75a887258dc5e8247cd22091f1631a43efa1597c /app/services | |
| parent | 8ef79d8dc9de33975bd793587020a259ef020276 (diff) | |
Fix #529 - Make hashtag timelines show conversations, fix hashtag loading in the UI
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/fan_out_on_write_service.rb | 5 |
1 files changed, 4 insertions, 1 deletions
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 |