From 07339cf4906c93c2a79f395a8fb3104c852b1fa9 Mon Sep 17 00:00:00 2001 From: Fire Demon Date: Mon, 10 Aug 2020 18:10:06 -0500 Subject: [Timelines] Replace Federated timetime with public local reblogs when in local mode --- app/services/fan_out_on_write_service.rb | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (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 3f845ecd4..08963cf5e 100644 --- a/app/services/fan_out_on_write_service.rb +++ b/app/services/fan_out_on_write_service.rb @@ -23,14 +23,16 @@ class FanOutOnWriteService < BaseService deliver_to_lists(status) end - return if status.account.silenced? || !status.public_visibility? - return if status.reblog? && !Setting.show_reblogs_in_public_timelines + return if status.account.silenced? + + deliver_to_public(status.reblog) if status.local? && status.reblog? && status.reblog.public_visibility? && !status.reblog.account.silenced? + + return if status.reblog? || !status.public_visibility? deliver_to_hashtags(status) return if status.reply? && status.in_reply_to_account_id != status.account_id && !Setting.show_replies_in_public_timelines - deliver_to_public(status) deliver_to_media(status) if status.media_attachments.any? end @@ -85,8 +87,13 @@ class FanOutOnWriteService < BaseService end def deliver_to_public(status) + key = "timeline:public:#{status.id}" + return if Redis.current.get(key) + Rails.logger.debug "Delivering status #{status.id} to public timeline" + Redis.current.set(key, true, ex: 6.hours) + Redis.current.publish('timeline:public', @payload) if status.local? Redis.current.publish('timeline:public:local', @payload) @@ -109,7 +116,7 @@ class FanOutOnWriteService < BaseService def deliver_to_direct_timelines(status) Rails.logger.debug "Delivering status #{status.id} to direct timelines" - FeedInsertWorker.push_bulk(status.mentions.includes(:account).map(&:account).select { |mentioned_account| mentioned_account.local? }) do |account| + FeedInsertWorker.push_bulk(status.mentions.includes(:account).map(&:account).select(&:local?)) do |account| [status.id, account.id, :direct] end end -- cgit