From d89f004a2a7d56d460ae8b9bdbcca74f8e9e86f9 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 4 Sep 2021 04:51:20 +0000
Subject: [PATCH] Issue 10651: Improved logging

---
 src/Worker/Delivery.php | 4 ++--
 src/Worker/Notifier.php | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index 55a0cf96d0..8961b3f13d 100644
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -32,7 +32,6 @@ use Friendica\Protocol\Email;
 use Friendica\Protocol\Activity;
 use Friendica\Util\Network;
 use Friendica\Core\Worker;
-use Friendica\Model\Conversation;
 use Friendica\Model\FContact;
 use Friendica\Model\Item;
 use Friendica\Protocol\Relay;
@@ -210,7 +209,8 @@ class Delivery
 		// Also transmit via Diaspora if this is a direct answer to a Diaspora comment.
 		// This is done since the uri wouldn't match (Diaspora doesn't transmit it)
 		// Also transmit relayed posts from Diaspora contacts via Diaspora.
-		if (!empty($parent) && !empty($thr_parent) && in_array(Protocol::DIASPORA, [$parent['network'], $thr_parent['network'], $target_item['network']])) {
+		if (($contact['network'] != Protocol::DIASPORA) && in_array(Protocol::DIASPORA, [$parent['network'] ?? '', $thr_parent['network'] ?? '', $target_item['network']])) {
+			Logger::info('Enforcing the Diaspora protocol', ['id' => $contact['id'], 'network' => $contact['network'], 'parent' => $parent['network'], 'thread-parent' => $thr_parent['network'], 'post' => $target_item['network']]);
 			$contact['network'] = Protocol::DIASPORA;
 		}
 
diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index ef2d898397..a53eefa7d1 100644
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -179,7 +179,7 @@ class Notifier
 				$thr_parent = $parent;
 			}
 
-			Logger::log('GUID: ' . $target_item["guid"] . ': Parent is ' . $parent['network'] . '. Thread parent is ' . $thr_parent['network'], Logger::DEBUG);
+			Logger::info('Got post', ['guid' => $target_item['guid'], 'uri-id' => $target_item['uri-id'], 'network' => $target_item['network'], 'parent-network' => $parent['network'], 'thread-parent-network' => $thr_parent['network']]);
 
 			if (!self::isRemovalActivity($cmd, $owner, Protocol::ACTIVITYPUB)) {
 				$apdelivery = self::activityPubDelivery($cmd, $target_item, $parent, $thr_parent, $a->getQueueValue('priority'), $a->getQueueValue('created'), $owner);
@@ -732,21 +732,25 @@ class Notifier
 	{
 		// Don't deliver via AP when the starting post isn't from a federated network
 		if (!in_array($parent['network'], Protocol::FEDERATED)) {
+			Logger::info('Parent network is no federated network, so no AP delivery', ['network' => $parent['network']]);
 			return ['count' => 0, 'contacts' => []];
 		}
 
 		// Don't deliver via AP when the starting post is delivered via Diaspora
 		if ($parent['network'] == Protocol::DIASPORA) {
+			Logger::info('Parent network is Diaspora, so no AP delivery');
 			return ['count' => 0, 'contacts' => []];
 		}
 
 		// Also don't deliver when the direct thread parent was delivered via Diaspora
 		if ($thr_parent['network'] == Protocol::DIASPORA) {
+			Logger::info('Threat parent network is Diaspora, so no AP delivery');
 			return ['count' => 0, 'contacts' => []];
 		}
 
 		// Posts from Diaspora contacts are transmitted via Diaspora
 		if ($target_item['network'] == Protocol::DIASPORA) {
+			Logger::info('Post network is Diaspora, so no AP delivery');
 			return ['count' => 0, 'contacts' => []];
 		}