From 83c6d7237408c658107c9bef68acfe29770b8860 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
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 5e12c035f4..77b11a80df 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)
return if status.reblog?
@@ -28,11 +33,6 @@ class FanOutOnWriteService < BaseService
deliver_to_hashtag_followers(status)
deliver_to_subscribers(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
--
GitLab