From: Michael <heluecht@pirati.ca>
Date: Sat, 12 Mar 2022 07:48:31 +0000 (+0000)
Subject: Further improved logging
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=56cd98b38bace314c1b38661edf8b26d1345a2d1;p=friendica.git

Further improved logging
---

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index db7eadac95..0fb7394579 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -1776,7 +1776,7 @@ class DFRN
 	{
 		if (DBA::exists('contact', ["`nurl` = ? AND `uid` != ? AND `rel` IN (?, ?)",
 			Strings::normaliseLink($item["author-link"]), 0, Contact::FRIEND, Contact::SHARING])) {
-			Logger::debug('Author has got followers - accepted', ['uri' => $item['uri'], 'author' => $item["author-link"]]);
+			Logger::debug('Author has got followers - accepted', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri'], 'author' => $item["author-link"]]);
 			return true;
 		}
 
@@ -1792,7 +1792,7 @@ class DFRN
 
 		$tags = array_column(Tag::getByURIId($item['uri-id'], [Tag::HASHTAG]), 'name');
 		if (Relay::isSolicitedPost($tags, $item['body'], $item['author-id'], $item['uri'], Protocol::DFRN)) {
-			Logger::debug('Post is accepted because of the relay settings', ['uri' => $item['uri'], 'author' => $item["author-link"]]);
+			Logger::debug('Post is accepted because of the relay settings', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri'], 'author' => $item["author-link"]]);
 			return true;
 		} else {
 			return false;
diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 7ca01f9966..ad4ed65f6a 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -2616,31 +2616,30 @@ class Diaspora
 	/**
 	 * Checks if an incoming message is wanted
 	 *
-	 * @param string $url
-	 * @param integer $uriid
+	 * @param array  $item
 	 * @param string $author
 	 * @param string $body
 	 * @param int    $direction Indicates if the message had been fetched or pushed
 	 *
 	 * @return boolean Is the message wanted?
 	 */
-	private static function isSolicitedMessage(string $url, int $uriid, string $author, string $body, int $direction)
+	private static function isSolicitedMessage(array $item, string $author, string $body, int $direction)
 	{
 		$contact = Contact::getByURL($author);
 		if (DBA::exists('contact', ["`nurl` = ? AND `uid` != ? AND `rel` IN (?, ?)",
 			$contact['nurl'], 0, Contact::FRIEND, Contact::SHARING])) {
-			Logger::debug('Author has got followers - accepted', ['url' => $url, 'author' => $author]);
+			Logger::debug('Author has got followers - accepted', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri'], 'author' => $author]);
 			return true;
 		}
 
 		if ($direction == self::FORCED_FETCH) {
-			Logger::debug('Post is a forced fetch - accepted', ['url' => $url, 'author' => $author]);
+			Logger::debug('Post is a forced fetch - accepted', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri'], 'author' => $author]);
 			return true;
 		}
 
-		$tags = array_column(Tag::getByURIId($uriid, [Tag::HASHTAG]), 'name');
-		if (Relay::isSolicitedPost($tags, $body, $contact['id'], $url, Protocol::DIASPORA)) {
-			Logger::debug('Post is accepted because of the relay settings', ['url' => $url, 'author' => $author]);
+		$tags = array_column(Tag::getByURIId($item['uri-id'], [Tag::HASHTAG]), 'name');
+		if (Relay::isSolicitedPost($tags, $body, $contact['id'], $item['uri'], Protocol::DIASPORA)) {
+			Logger::debug('Post is accepted because of the relay settings', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri'], 'author' => $author]);
 			return true;
 		} else {
 			return false;
@@ -2771,7 +2770,7 @@ class Diaspora
 		self::storeMentions($datarray['uri-id'], $text);
 		Tag::storeRawTagsFromBody($datarray['uri-id'], $datarray["body"]);
 
-		if (!self::isSolicitedMessage($datarray["uri"], $datarray['uri-id'], $author, $body, $direction)) {
+		if (!self::isSolicitedMessage($datarray, $author, $body, $direction)) {
 			DBA::delete('item-uri', ['uri' => $datarray['uri']]);
 			return false;
 		}