From fed4eaf5f3d1e774c96aaf7a86460e661a9dc0cf Mon Sep 17 00:00:00 2001 From: noellabo Date: Tue, 29 Oct 2019 21:39:21 +0900 Subject: [PATCH] Changed DistributionWorker to give federation priority over subscription --- app/services/fan_out_on_write_service.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb index 5ed19eb0a..4ab5c41b7 100644 --- a/app/services/fan_out_on_write_service.rb +++ b/app/services/fan_out_on_write_service.rb @@ -20,6 +20,11 @@ class FanOutOnWriteService < BaseService return if status.account.silenced? || !status.public_visibility? + if !status.reblog? && (!status.reply? || status.in_reply_to_account_id == status.account_id) + deliver_to_public(status) + deliver_to_media(status) if status.media_attachments.any? + end + deliver_to_domain_subscribers(status) deliver_to_subscribers(status) deliver_to_subscribers_lists(status) @@ -31,11 +36,6 @@ class FanOutOnWriteService < BaseService deliver_to_hashtags(status) deliver_to_hashtag_followers(status) deliver_to_keyword_subscribers(status) - - return if status.reply? && status.in_reply_to_account_id != status.account_id - - deliver_to_public(status) - deliver_to_media(status) if status.media_attachments.any? end private