Merge branch 'main' into paratest

MbinOrg · Jan 25, 2025 · a7524a5 · a7524a5
2 parents 7b1b290 + 00ef4a5
commit a7524a5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/MessageHandler/ActivityPub/Inbox/ActivityHandler.php b/src/MessageHandler/ActivityPub/Inbox/ActivityHandler.php
@@ -67,8 +67,10 @@ public function doWork(MessageInterface $message): void
         $payload = @json_decode($message->payload, true);
 
         if (null === $payload) {
-            $this->logger->warning('[ActivityHandler::doWork] Activity message from was empty: {json}, ignoring it', ['json' => json_encode($message->payload)]);
-            throw new UnrecoverableMessageHandlingException('activity message from was empty');
+            $this->logger->warning('[ActivityHandler::doWork] Activity message from was empty or invalid JSON. Truncated content: {content}, ignoring it', [
+                'content' => substr($message->payload ?? 'No payload provided', 0, 200),
+            ]);
+            throw new UnrecoverableMessageHandlingException('Activity message from was empty or invalid JSON');
         }
 
         if ($message->request && $message->headers) {
@@ -93,7 +95,7 @@ public function doWork(MessageInterface $message): void
 
         if (null === $payload['id']) {
             $this->logger->warning('[ActivityHandler::doWork] Activity message has no id field which is required: {json}', ['json' => json_encode($message->payload)]);
-            throw new UnrecoverableMessageHandlingException('activity message has no id field');
+            throw new UnrecoverableMessageHandlingException('Activity message has no id field');
         }
 
         $idHost = parse_url($payload['id'], PHP_URL_HOST);