From 2335af9bf26e646b042c6564f5ce046b889840d1 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 24 May 2025 19:09:49 +0000 Subject: [PATCH] Fix some warnings --- src/Protocol/ATProtocol/Actor.php | 8 +++++--- src/Protocol/ATProtocol/Jetstream.php | 8 ++++++-- src/Protocol/ActivityPub/Receiver.php | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/Protocol/ATProtocol/Actor.php b/src/Protocol/ATProtocol/Actor.php index db310813b3..38da819dfc 100755 --- a/src/Protocol/ATProtocol/Actor.php +++ b/src/Protocol/ATProtocol/Actor.php @@ -145,9 +145,11 @@ class Actor $fields['gsid'] = GServer::getRealID($fields['baseurl'], true); } - foreach ($directory->verificationMethod as $method) { - if (!empty($method->publicKeyMultibase)) { - $fields['pubkey'] = $method->publicKeyMultibase; + if (!empty($directory->verificationMethod)) { + foreach ($directory->verificationMethod as $method) { + if (!empty($method->publicKeyMultibase)) { + $fields['pubkey'] = $method->publicKeyMultibase; + } } } } diff --git a/src/Protocol/ATProtocol/Jetstream.php b/src/Protocol/ATProtocol/Jetstream.php index cb37fabeec..8051e47126 100755 --- a/src/Protocol/ATProtocol/Jetstream.php +++ b/src/Protocol/ATProtocol/Jetstream.php @@ -105,8 +105,12 @@ class Jetstream $last_timeout = time(); while (true) { try { - $message = $this->client->receive(); - $data = json_decode($message); + $message = @$this->client->receive(); + if (empty($message)) { + $this->logger->notice('Empty message received'); + break; + } + $data = json_decode($message); if (is_object($data)) { $timestamp = $data->time_us; $this->route($data); diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php index 76f4d31d3d..c217d491ca 100644 --- a/src/Protocol/ActivityPub/Receiver.php +++ b/src/Protocol/ActivityPub/Receiver.php @@ -2065,7 +2065,7 @@ class Receiver } foreach ($object_data['tags'] as $tag) { - if (HTTPSignature::isValidContentType($tag['mediaType'] ?? '', $tag['href'])) { + if (HTTPSignature::isValidContentType($tag['mediaType'] ?? '', $tag['href'] ?? '')) { $object_data['quote-url'] = $tag['href']; } }