From 390bfec6da74218e2ebd4eea16dff586b25177d9 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 1 Sep 2017 21:26:01 +0200
Subject: [PATCH] Avoid sending some ActivityPub payloads if the receiver will
get them through distribution (#4739)
---
app/services/process_mentions_service.rb | 2 +-
app/services/reblog_service.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb
index f123bf8697..dc386c9e72 100644
--- a/app/services/process_mentions_service.rb
+++ b/app/services/process_mentions_service.rb
@@ -41,7 +41,7 @@ class ProcessMentionsService < BaseService
NotifyService.new.call(mentioned_account, mention)
elsif mentioned_account.ostatus? && (Rails.configuration.x.use_ostatus_privacy || !status.stream_entry.hidden?)
NotificationWorker.perform_async(stream_entry_to_xml(status.stream_entry), status.account_id, mentioned_account.id)
- elsif mentioned_account.activitypub?
+ elsif mentioned_account.activitypub? && !mentioned_account.following?(status.account)
ActivityPub::DeliveryWorker.perform_async(build_json(mention.status), mention.status.account_id, mentioned_account.inbox_url)
end
end
diff --git a/app/services/reblog_service.rb b/app/services/reblog_service.rb
index 5ed16c64b8..3c4e5847f3 100644
--- a/app/services/reblog_service.rb
+++ b/app/services/reblog_service.rb
@@ -36,7 +36,7 @@ class ReblogService < BaseService
NotifyService.new.call(reblogged_status.account, reblog)
elsif reblogged_status.account.ostatus?
NotificationWorker.perform_async(stream_entry_to_xml(reblog.stream_entry), reblog.account_id, reblogged_status.account_id)
- elsif reblogged_status.account.activitypub?
+ elsif reblogged_status.account.activitypub? && !reblogged_status.account.following?(reblog.account)
ActivityPub::DeliveryWorker.perform_async(build_json(reblog), reblog.account_id, reblogged_status.account.inbox_url)
end
end
--
GitLab