Fix some notices / reduce the number of warnings

diff --git a/src/Protocol/ATProtocol/Processor.php b/src/Protocol/ATProtocol/Processor.php
index 737112ec4c040f45f309f7b1af1e7a2fa37aa400..852d21919db35bf6b1dc6ac4536a7345a48c0d5a 100755 (executable)
--- a/src/Protocol/ATProtocol/Processor.php
+++ b/src/Protocol/ATProtocol/Processor.php
@@ -176,7 +176,7 @@ class Processor
                        if ($id) {
                                $this->logger->info('Post inserted', ['id' => $id, 'guid' => $item['guid']]);
                        } elseif (Post::exists(['uid' => $uid, 'uri-id' => $item['uri-id']])) {
-                               $this->logger->warning('Post was found', ['guid' => $item['guid'], 'uri' => $item['uri']]);
+                               $this->logger->notice('Post was found', ['guid' => $item['guid'], 'uri' => $item['uri']]);
                        } else {
                                $this->logger->warning('Post was not inserted', ['guid' => $item['guid'], 'uri' => $item['uri']]);
                        }
@@ -206,7 +206,7 @@ class Processor
                        if ($id) {
                                $this->logger->info('Repost inserted', ['id' => $id]);
                        } elseif (Post::exists(['uid' => $uid, 'uri-id' => $item['uri-id']])) {
-                               $this->logger->warning('Repost was found', ['uri' => $item['uri']]);
+                               $this->logger->notice('Repost was found', ['uri' => $item['uri']]);
                        } else {
                                $this->logger->warning('Repost was not inserted', ['uri' => $item['uri']]);
                        }
@@ -235,7 +235,7 @@ class Processor
                        if ($id) {
                                $this->logger->info('Like inserted', ['id' => $id]);
                        } elseif (Post::exists(['uid' => $uid, 'uri-id' => $item['uri-id']])) {
-                               $this->logger->warning('Like was found', ['uri' => $item['uri']]);
+                               $this->logger->notice('Like was found', ['uri' => $item['uri']]);
                        } else {
                                $this->logger->warning('Like was not inserted', ['uri' => $item['uri']]);
                        }
@@ -315,7 +315,7 @@ class Processor
                if ($id) {
                        $this->logger->info('Fetched post inserted', ['id' => $id, 'guid' => $item['guid']]);
                } elseif (Post::exists(['uid' => $uid, 'uri-id' => $item['uri-id']])) {
-                       $this->logger->warning('Fetched post was found', ['guid' => $item['guid'], 'uri' => $item['uri']]);
+                       $this->logger->notice('Fetched post was found', ['guid' => $item['guid'], 'uri' => $item['uri']]);
                } else {
                        $this->logger->warning('Fetched post was not inserted', ['guid' => $item['guid'], 'uri' => $item['uri']]);
                }

diff --git a/src/Protocol/ActivityPub/Delivery.php b/src/Protocol/ActivityPub/Delivery.php
index 7a7d484b8d03505186435b58b6a5a1df20e057f5..d49e31de25a62c320d005c2897fa6a882595ce53 100644 (file)
--- a/src/Protocol/ActivityPub/Delivery.php
+++ b/src/Protocol/ActivityPub/Delivery.php
@@ -161,7 +161,7 @@ class Delivery
 
                                        }
 
-                                       Logger::notice('Delivery failed', ['retcode' => $response->getReturnCode(), 'serverfailure' => $serverfail, 'drop' => $drop, 'runtime' => round($runtime, 3), 'uri-id' => $uri_id, 'uid' => $uid, 'item_id' => $item_id, 'cmd' => $cmd, 'inbox' => $inbox]);
+                                       Logger::notice('Delivery failed', ['retcode' => $response->getReturnCode() ?? 0, 'serverfailure' => $serverfail, 'drop' => $drop, 'runtime' => round($runtime, 3), 'uri-id' => $uri_id, 'uid' => $uid, 'item_id' => $item_id, 'cmd' => $cmd, 'inbox' => $inbox]);
                                }
                                if ($uri_id) {
                                        if ($success) {

diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php
index 1ee5c0920e0e27cb9b9d508c6aac75d85eb9595f..74f6e4baca8c919259216683bfa3f001b6712829 100644 (file)
--- a/src/Util/JsonLD.php
+++ b/src/Util/JsonLD.php
@@ -127,7 +127,6 @@ class JsonLD
                                $messages[] = $currentException->getMessage();
                        } while ($currentException = $currentException->getPrevious());
 
-                       Logger::warning('JsonLD normalize error');
                        Logger::notice('JsonLD normalize error', ['messages' => $messages]);
                        Logger::info('JsonLD normalize error', ['trace' => $e->getTraceAsString()]);
                        Logger::debug('JsonLD normalize error', ['jsonobj' => $jsonobj]);

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index 438c0e5e77d7d94a68657a06dae9e08ffa18010d..e32df571064e1a45efe0be73875840cbc299d675 100644 (file)
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -451,6 +451,10 @@ class Notifier
                        }
 
                        $cdata = Contact::getPublicAndUserContactID($contact['id'], $sender_uid);
+                       if (empty($cdata)) {
+                               Logger::info('No contact entry found', ['id' => $contact['id'], 'uid' => $sender_uid]);
+                               continue;
+                       }
                        if (in_array($cdata['public'] ?: $contact['id'], $ap_contacts)) {
                                Logger::info('The public contact is already delivered via AP, so skip delivery via legacy DFRN/Diaspora', ['batch' => $in_batch, 'target' => $post_uriid, 'uid' => $sender_uid, 'contact' => $contact['url']]);
                                continue;
@@ -637,8 +641,8 @@ class Notifier
        private static function activityPubDelivery($cmd, array $target_item, array $parent, array $thr_parent, int $priority, string $created, array $recipients): array
        {
                // 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']]);
+               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' => []];
                }