From 9d788512021c653f561797fca2cc8448b22d68be Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 5 Feb 2026 17:02:13 +1030 Subject: [PATCH 1/4] fix --- app/Jobs/Federation/DeliverCommentLikeActivity.php | 2 +- app/Jobs/Federation/DeliverCommentReplyLikeActivity.php | 2 +- app/Jobs/Federation/DeliverCreateCommentActivity.php | 2 +- app/Jobs/Federation/DeliverCreateCommentReplyActivity.php | 2 +- app/Jobs/Federation/DeliverCreateVideoActivity.php | 2 +- app/Jobs/Federation/DeliverDeleteCommentActivity.php | 2 +- app/Jobs/Federation/DeliverDeleteCommentReplyActivity.php | 2 +- app/Jobs/Federation/DeliverDeleteVideoActivity.php | 2 +- app/Jobs/Federation/DeliverFollowRequest.php | 2 +- app/Jobs/Federation/DeliverRejectActivity.php | 2 +- app/Jobs/Federation/DeliverUndoCommentLikeActivity.php | 2 +- app/Jobs/Federation/DeliverUndoCommentReplyLikeActivity.php | 2 +- app/Jobs/Federation/DeliverUndoFollowActivity.php | 2 +- app/Jobs/Federation/DeliverUndoFollowRequestActivity.php | 2 +- app/Jobs/Federation/DeliverUndoVideoLikeActivity.php | 2 +- app/Jobs/Federation/DeliverUpdateVideoActivity.php | 2 +- app/Services/DeliveryService.php | 2 +- app/Services/RelayService.php | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/Jobs/Federation/DeliverCommentLikeActivity.php b/app/Jobs/Federation/DeliverCommentLikeActivity.php index a30593a2a..efa6b0c9b 100644 --- a/app/Jobs/Federation/DeliverCommentLikeActivity.php +++ b/app/Jobs/Federation/DeliverCommentLikeActivity.php @@ -98,7 +98,7 @@ public function handle(): void $privateKey, $headers, 'POST', - $parsedUrl['path'] ?? '/', + ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverCommentReplyLikeActivity.php b/app/Jobs/Federation/DeliverCommentReplyLikeActivity.php index 3176e8e4b..6c35e8311 100644 --- a/app/Jobs/Federation/DeliverCommentReplyLikeActivity.php +++ b/app/Jobs/Federation/DeliverCommentReplyLikeActivity.php @@ -98,7 +98,7 @@ public function handle(): void $privateKey, $headers, 'POST', - $parsedUrl['path'] ?? '/', + ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverCreateCommentActivity.php b/app/Jobs/Federation/DeliverCreateCommentActivity.php index 5f7082645..601b91559 100644 --- a/app/Jobs/Federation/DeliverCreateCommentActivity.php +++ b/app/Jobs/Federation/DeliverCreateCommentActivity.php @@ -101,7 +101,7 @@ public function handle(): void $privateKey, $headers, 'POST', - $parsedUrl['path'] ?? '/', + ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverCreateCommentReplyActivity.php b/app/Jobs/Federation/DeliverCreateCommentReplyActivity.php index fa38c9d80..2ffeee9e1 100644 --- a/app/Jobs/Federation/DeliverCreateCommentReplyActivity.php +++ b/app/Jobs/Federation/DeliverCreateCommentReplyActivity.php @@ -101,7 +101,7 @@ public function handle(): void $privateKey, $headers, 'POST', - $parsedUrl['path'] ?? '/', + ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverCreateVideoActivity.php b/app/Jobs/Federation/DeliverCreateVideoActivity.php index b6a8ac4a4..0dff021cb 100644 --- a/app/Jobs/Federation/DeliverCreateVideoActivity.php +++ b/app/Jobs/Federation/DeliverCreateVideoActivity.php @@ -105,7 +105,7 @@ public function handle(): void $privateKey, $headers, 'POST', - $parsedUrl['path'] ?? '/', + ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverDeleteCommentActivity.php b/app/Jobs/Federation/DeliverDeleteCommentActivity.php index 0ba88307c..b438bf496 100644 --- a/app/Jobs/Federation/DeliverDeleteCommentActivity.php +++ b/app/Jobs/Federation/DeliverDeleteCommentActivity.php @@ -103,7 +103,7 @@ public function handle(): void $privateKey, $headers, 'POST', - $parsedUrl['path'] ?? '/', + ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverDeleteCommentReplyActivity.php b/app/Jobs/Federation/DeliverDeleteCommentReplyActivity.php index 2616ac7e0..c7234cee9 100644 --- a/app/Jobs/Federation/DeliverDeleteCommentReplyActivity.php +++ b/app/Jobs/Federation/DeliverDeleteCommentReplyActivity.php @@ -103,7 +103,7 @@ public function handle(): void $privateKey, $headers, 'POST', - $parsedUrl['path'] ?? '/', + ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverDeleteVideoActivity.php b/app/Jobs/Federation/DeliverDeleteVideoActivity.php index 6c88cd6b6..8a2c360fe 100644 --- a/app/Jobs/Federation/DeliverDeleteVideoActivity.php +++ b/app/Jobs/Federation/DeliverDeleteVideoActivity.php @@ -103,7 +103,7 @@ public function handle(): void $privateKey, $headers, 'POST', - $parsedUrl['path'] ?? '/', + ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverFollowRequest.php b/app/Jobs/Federation/DeliverFollowRequest.php index 0cb74bf32..956f96bcf 100644 --- a/app/Jobs/Federation/DeliverFollowRequest.php +++ b/app/Jobs/Federation/DeliverFollowRequest.php @@ -79,7 +79,7 @@ public function handle(): void $privateKey, $headers, 'POST', - $parsedUrl['path'] ?? '/', + ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverRejectActivity.php b/app/Jobs/Federation/DeliverRejectActivity.php index 7d6783a5d..aeaf51f35 100644 --- a/app/Jobs/Federation/DeliverRejectActivity.php +++ b/app/Jobs/Federation/DeliverRejectActivity.php @@ -82,7 +82,7 @@ public function handle(): void $privateKey, $headers, 'POST', - $parsedUrl['path'] ?? '/', + ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverUndoCommentLikeActivity.php b/app/Jobs/Federation/DeliverUndoCommentLikeActivity.php index 1b139bd2d..0a44020b8 100644 --- a/app/Jobs/Federation/DeliverUndoCommentLikeActivity.php +++ b/app/Jobs/Federation/DeliverUndoCommentLikeActivity.php @@ -96,7 +96,7 @@ public function handle(): void $privateKey, $headers, 'POST', - $parsedUrl['path'] ?? '/', + ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverUndoCommentReplyLikeActivity.php b/app/Jobs/Federation/DeliverUndoCommentReplyLikeActivity.php index c0f9eb177..2746e7dcf 100644 --- a/app/Jobs/Federation/DeliverUndoCommentReplyLikeActivity.php +++ b/app/Jobs/Federation/DeliverUndoCommentReplyLikeActivity.php @@ -96,7 +96,7 @@ public function handle(): void $privateKey, $headers, 'POST', - $parsedUrl['path'] ?? '/', + ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverUndoFollowActivity.php b/app/Jobs/Federation/DeliverUndoFollowActivity.php index abc631d12..ee3239969 100644 --- a/app/Jobs/Federation/DeliverUndoFollowActivity.php +++ b/app/Jobs/Federation/DeliverUndoFollowActivity.php @@ -91,7 +91,7 @@ public function handle(): void $privateKey, $headers, 'POST', - $parsedUrl['path'] ?? '/', + ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverUndoFollowRequestActivity.php b/app/Jobs/Federation/DeliverUndoFollowRequestActivity.php index bf02d708a..93f45be87 100644 --- a/app/Jobs/Federation/DeliverUndoFollowRequestActivity.php +++ b/app/Jobs/Federation/DeliverUndoFollowRequestActivity.php @@ -79,7 +79,7 @@ public function handle(): void $privateKey, $headers, 'POST', - $parsedUrl['path'] ?? '/', + ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverUndoVideoLikeActivity.php b/app/Jobs/Federation/DeliverUndoVideoLikeActivity.php index 9ac929a15..1f5edd9d2 100644 --- a/app/Jobs/Federation/DeliverUndoVideoLikeActivity.php +++ b/app/Jobs/Federation/DeliverUndoVideoLikeActivity.php @@ -100,7 +100,7 @@ public function handle(): void $privateKey, $headers, 'POST', - $parsedUrl['path'] ?? '/', + ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverUpdateVideoActivity.php b/app/Jobs/Federation/DeliverUpdateVideoActivity.php index f2be6deb5..cda29a854 100644 --- a/app/Jobs/Federation/DeliverUpdateVideoActivity.php +++ b/app/Jobs/Federation/DeliverUpdateVideoActivity.php @@ -101,7 +101,7 @@ public function handle(): void $privateKey, $headers, 'POST', - $parsedUrl['path'] ?? '/', + ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), json_encode($activity) ); diff --git a/app/Services/DeliveryService.php b/app/Services/DeliveryService.php index 022711457..ee101471f 100644 --- a/app/Services/DeliveryService.php +++ b/app/Services/DeliveryService.php @@ -45,7 +45,7 @@ public function deliverToInbox($actor, $target, $activity) $privateKey, $headers, 'POST', - $parsedUrl['path'] ?? '/', + ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), $body ); diff --git a/app/Services/RelayService.php b/app/Services/RelayService.php index 6784508a2..f93198e5b 100644 --- a/app/Services/RelayService.php +++ b/app/Services/RelayService.php @@ -200,7 +200,7 @@ protected function deliverActivity(Profile $actor, string $inboxUrl, array $acti $privateKey, $headers, 'POST', - $parsedUrl['path'] ?? '/', + ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), $body ); From 814f79cd5177d57eacaebfda8b2c6c1e4c2277c2 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 5 Feb 2026 17:44:34 +1030 Subject: [PATCH 2/4] pint --- app/Jobs/Federation/DeliverCommentLikeActivity.php | 2 +- app/Jobs/Federation/DeliverCommentReplyLikeActivity.php | 2 +- app/Jobs/Federation/DeliverCreateCommentActivity.php | 2 +- app/Jobs/Federation/DeliverCreateCommentReplyActivity.php | 2 +- app/Jobs/Federation/DeliverCreateVideoActivity.php | 2 +- app/Jobs/Federation/DeliverDeleteCommentActivity.php | 2 +- app/Jobs/Federation/DeliverDeleteCommentReplyActivity.php | 2 +- app/Jobs/Federation/DeliverDeleteVideoActivity.php | 2 +- app/Jobs/Federation/DeliverFollowRequest.php | 2 +- app/Jobs/Federation/DeliverRejectActivity.php | 2 +- app/Jobs/Federation/DeliverUndoCommentLikeActivity.php | 2 +- app/Jobs/Federation/DeliverUndoCommentReplyLikeActivity.php | 2 +- app/Jobs/Federation/DeliverUndoFollowActivity.php | 2 +- app/Jobs/Federation/DeliverUndoFollowRequestActivity.php | 2 +- app/Jobs/Federation/DeliverUndoVideoLikeActivity.php | 2 +- app/Jobs/Federation/DeliverUpdateVideoActivity.php | 2 +- app/Services/DeliveryService.php | 2 +- app/Services/RelayService.php | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/Jobs/Federation/DeliverCommentLikeActivity.php b/app/Jobs/Federation/DeliverCommentLikeActivity.php index efa6b0c9b..fc568b534 100644 --- a/app/Jobs/Federation/DeliverCommentLikeActivity.php +++ b/app/Jobs/Federation/DeliverCommentLikeActivity.php @@ -98,7 +98,7 @@ public function handle(): void $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), + ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverCommentReplyLikeActivity.php b/app/Jobs/Federation/DeliverCommentReplyLikeActivity.php index 6c35e8311..ea6d6e2d1 100644 --- a/app/Jobs/Federation/DeliverCommentReplyLikeActivity.php +++ b/app/Jobs/Federation/DeliverCommentReplyLikeActivity.php @@ -98,7 +98,7 @@ public function handle(): void $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), + ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverCreateCommentActivity.php b/app/Jobs/Federation/DeliverCreateCommentActivity.php index 601b91559..68ef4d116 100644 --- a/app/Jobs/Federation/DeliverCreateCommentActivity.php +++ b/app/Jobs/Federation/DeliverCreateCommentActivity.php @@ -101,7 +101,7 @@ public function handle(): void $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), + ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverCreateCommentReplyActivity.php b/app/Jobs/Federation/DeliverCreateCommentReplyActivity.php index 2ffeee9e1..e083ad07f 100644 --- a/app/Jobs/Federation/DeliverCreateCommentReplyActivity.php +++ b/app/Jobs/Federation/DeliverCreateCommentReplyActivity.php @@ -101,7 +101,7 @@ public function handle(): void $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), + ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverCreateVideoActivity.php b/app/Jobs/Federation/DeliverCreateVideoActivity.php index 0dff021cb..a64230c31 100644 --- a/app/Jobs/Federation/DeliverCreateVideoActivity.php +++ b/app/Jobs/Federation/DeliverCreateVideoActivity.php @@ -105,7 +105,7 @@ public function handle(): void $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), + ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverDeleteCommentActivity.php b/app/Jobs/Federation/DeliverDeleteCommentActivity.php index b438bf496..9853054e1 100644 --- a/app/Jobs/Federation/DeliverDeleteCommentActivity.php +++ b/app/Jobs/Federation/DeliverDeleteCommentActivity.php @@ -103,7 +103,7 @@ public function handle(): void $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), + ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverDeleteCommentReplyActivity.php b/app/Jobs/Federation/DeliverDeleteCommentReplyActivity.php index c7234cee9..94317caea 100644 --- a/app/Jobs/Federation/DeliverDeleteCommentReplyActivity.php +++ b/app/Jobs/Federation/DeliverDeleteCommentReplyActivity.php @@ -103,7 +103,7 @@ public function handle(): void $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), + ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverDeleteVideoActivity.php b/app/Jobs/Federation/DeliverDeleteVideoActivity.php index 8a2c360fe..386a46c68 100644 --- a/app/Jobs/Federation/DeliverDeleteVideoActivity.php +++ b/app/Jobs/Federation/DeliverDeleteVideoActivity.php @@ -103,7 +103,7 @@ public function handle(): void $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), + ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverFollowRequest.php b/app/Jobs/Federation/DeliverFollowRequest.php index 956f96bcf..643e8e985 100644 --- a/app/Jobs/Federation/DeliverFollowRequest.php +++ b/app/Jobs/Federation/DeliverFollowRequest.php @@ -79,7 +79,7 @@ public function handle(): void $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), + ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverRejectActivity.php b/app/Jobs/Federation/DeliverRejectActivity.php index aeaf51f35..a25430ba6 100644 --- a/app/Jobs/Federation/DeliverRejectActivity.php +++ b/app/Jobs/Federation/DeliverRejectActivity.php @@ -82,7 +82,7 @@ public function handle(): void $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), + ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverUndoCommentLikeActivity.php b/app/Jobs/Federation/DeliverUndoCommentLikeActivity.php index 0a44020b8..d1e1eb45e 100644 --- a/app/Jobs/Federation/DeliverUndoCommentLikeActivity.php +++ b/app/Jobs/Federation/DeliverUndoCommentLikeActivity.php @@ -96,7 +96,7 @@ public function handle(): void $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), + ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverUndoCommentReplyLikeActivity.php b/app/Jobs/Federation/DeliverUndoCommentReplyLikeActivity.php index 2746e7dcf..c54dca3c9 100644 --- a/app/Jobs/Federation/DeliverUndoCommentReplyLikeActivity.php +++ b/app/Jobs/Federation/DeliverUndoCommentReplyLikeActivity.php @@ -96,7 +96,7 @@ public function handle(): void $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), + ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverUndoFollowActivity.php b/app/Jobs/Federation/DeliverUndoFollowActivity.php index ee3239969..69361ac1d 100644 --- a/app/Jobs/Federation/DeliverUndoFollowActivity.php +++ b/app/Jobs/Federation/DeliverUndoFollowActivity.php @@ -91,7 +91,7 @@ public function handle(): void $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), + ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverUndoFollowRequestActivity.php b/app/Jobs/Federation/DeliverUndoFollowRequestActivity.php index 93f45be87..a9f49af1e 100644 --- a/app/Jobs/Federation/DeliverUndoFollowRequestActivity.php +++ b/app/Jobs/Federation/DeliverUndoFollowRequestActivity.php @@ -79,7 +79,7 @@ public function handle(): void $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), + ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverUndoVideoLikeActivity.php b/app/Jobs/Federation/DeliverUndoVideoLikeActivity.php index 1f5edd9d2..ec41fdc0d 100644 --- a/app/Jobs/Federation/DeliverUndoVideoLikeActivity.php +++ b/app/Jobs/Federation/DeliverUndoVideoLikeActivity.php @@ -100,7 +100,7 @@ public function handle(): void $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), + ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverUpdateVideoActivity.php b/app/Jobs/Federation/DeliverUpdateVideoActivity.php index cda29a854..d854536b0 100644 --- a/app/Jobs/Federation/DeliverUpdateVideoActivity.php +++ b/app/Jobs/Federation/DeliverUpdateVideoActivity.php @@ -101,7 +101,7 @@ public function handle(): void $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), + ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), json_encode($activity) ); diff --git a/app/Services/DeliveryService.php b/app/Services/DeliveryService.php index ee101471f..4d3c726d5 100644 --- a/app/Services/DeliveryService.php +++ b/app/Services/DeliveryService.php @@ -45,7 +45,7 @@ public function deliverToInbox($actor, $target, $activity) $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), + ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), $body ); diff --git a/app/Services/RelayService.php b/app/Services/RelayService.php index f93198e5b..4461c3e36 100644 --- a/app/Services/RelayService.php +++ b/app/Services/RelayService.php @@ -200,7 +200,7 @@ protected function deliverActivity(Profile $actor, string $inboxUrl, array $acti $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/') . (isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : ''), + ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), $body ); From 196fe852114952aab94b06f509a9c7d068e85b19 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 5 Feb 2026 17:53:57 +1030 Subject: [PATCH 3/4] updated --- app/Jobs/Federation/DeliverCommentLikeActivity.php | 3 ++- app/Jobs/Federation/DeliverCommentReplyLikeActivity.php | 3 ++- app/Jobs/Federation/DeliverCreateCommentActivity.php | 3 ++- app/Jobs/Federation/DeliverCreateCommentReplyActivity.php | 3 ++- app/Jobs/Federation/DeliverCreateVideoActivity.php | 3 ++- app/Jobs/Federation/DeliverDeleteCommentActivity.php | 3 ++- app/Jobs/Federation/DeliverDeleteCommentReplyActivity.php | 3 ++- app/Jobs/Federation/DeliverDeleteVideoActivity.php | 3 ++- app/Jobs/Federation/DeliverFollowRequest.php | 3 ++- app/Jobs/Federation/DeliverRejectActivity.php | 3 ++- app/Jobs/Federation/DeliverUndoCommentLikeActivity.php | 3 ++- app/Jobs/Federation/DeliverUndoCommentReplyLikeActivity.php | 3 ++- app/Jobs/Federation/DeliverUndoFollowActivity.php | 3 ++- app/Jobs/Federation/DeliverUndoFollowRequestActivity.php | 3 ++- app/Jobs/Federation/DeliverUndoVideoLikeActivity.php | 3 ++- app/Jobs/Federation/DeliverUpdateVideoActivity.php | 3 ++- app/Services/DeliveryService.php | 4 +++- app/Services/RelayService.php | 4 +++- 18 files changed, 38 insertions(+), 18 deletions(-) diff --git a/app/Jobs/Federation/DeliverCommentLikeActivity.php b/app/Jobs/Federation/DeliverCommentLikeActivity.php index fc568b534..17e8e4565 100644 --- a/app/Jobs/Federation/DeliverCommentLikeActivity.php +++ b/app/Jobs/Federation/DeliverCommentLikeActivity.php @@ -90,6 +90,7 @@ public function handle(): void ]; $signatureService = app(HttpSignatureService::class); + $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); try { $privateKey = app(SigningService::class)->getPrivateKey(); @@ -98,7 +99,7 @@ public function handle(): void $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), + $fullParsedUrl, json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverCommentReplyLikeActivity.php b/app/Jobs/Federation/DeliverCommentReplyLikeActivity.php index ea6d6e2d1..52c272b27 100644 --- a/app/Jobs/Federation/DeliverCommentReplyLikeActivity.php +++ b/app/Jobs/Federation/DeliverCommentReplyLikeActivity.php @@ -90,6 +90,7 @@ public function handle(): void ]; $signatureService = app(HttpSignatureService::class); + $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); try { $privateKey = app(SigningService::class)->getPrivateKey(); @@ -98,7 +99,7 @@ public function handle(): void $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), + $fullParsedUrl, json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverCreateCommentActivity.php b/app/Jobs/Federation/DeliverCreateCommentActivity.php index 68ef4d116..5a3a68918 100644 --- a/app/Jobs/Federation/DeliverCreateCommentActivity.php +++ b/app/Jobs/Federation/DeliverCreateCommentActivity.php @@ -93,6 +93,7 @@ public function handle(): void ]; $signatureService = app(HttpSignatureService::class); + $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); try { $privateKey = app(SigningService::class)->getPrivateKey(); @@ -101,7 +102,7 @@ public function handle(): void $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), + $fullParsedUrl, json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverCreateCommentReplyActivity.php b/app/Jobs/Federation/DeliverCreateCommentReplyActivity.php index e083ad07f..cb8b97e6b 100644 --- a/app/Jobs/Federation/DeliverCreateCommentReplyActivity.php +++ b/app/Jobs/Federation/DeliverCreateCommentReplyActivity.php @@ -93,6 +93,7 @@ public function handle(): void ]; $signatureService = app(HttpSignatureService::class); + $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); try { $privateKey = app(SigningService::class)->getPrivateKey(); @@ -101,7 +102,7 @@ public function handle(): void $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), + $fullParsedUrl, json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverCreateVideoActivity.php b/app/Jobs/Federation/DeliverCreateVideoActivity.php index a64230c31..b37558c6b 100644 --- a/app/Jobs/Federation/DeliverCreateVideoActivity.php +++ b/app/Jobs/Federation/DeliverCreateVideoActivity.php @@ -97,6 +97,7 @@ public function handle(): void ]; $signatureService = app(HttpSignatureService::class); + $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); try { $privateKey = app(SigningService::class)->getPrivateKey(); @@ -105,7 +106,7 @@ public function handle(): void $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), + $fullParsedUrl, json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverDeleteCommentActivity.php b/app/Jobs/Federation/DeliverDeleteCommentActivity.php index 9853054e1..5e321654c 100644 --- a/app/Jobs/Federation/DeliverDeleteCommentActivity.php +++ b/app/Jobs/Federation/DeliverDeleteCommentActivity.php @@ -95,6 +95,7 @@ public function handle(): void ]; $signatureService = app(HttpSignatureService::class); + $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); try { $privateKey = app(SigningService::class)->getPrivateKey(); @@ -103,7 +104,7 @@ public function handle(): void $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), + $fullParsedUrl, json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverDeleteCommentReplyActivity.php b/app/Jobs/Federation/DeliverDeleteCommentReplyActivity.php index 94317caea..41317a8c1 100644 --- a/app/Jobs/Federation/DeliverDeleteCommentReplyActivity.php +++ b/app/Jobs/Federation/DeliverDeleteCommentReplyActivity.php @@ -95,6 +95,7 @@ public function handle(): void ]; $signatureService = app(HttpSignatureService::class); + $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); try { $privateKey = app(SigningService::class)->getPrivateKey(); @@ -103,7 +104,7 @@ public function handle(): void $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), + $fullParsedUrl, json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverDeleteVideoActivity.php b/app/Jobs/Federation/DeliverDeleteVideoActivity.php index 386a46c68..9c31dd5f0 100644 --- a/app/Jobs/Federation/DeliverDeleteVideoActivity.php +++ b/app/Jobs/Federation/DeliverDeleteVideoActivity.php @@ -95,6 +95,7 @@ public function handle(): void ]; $signatureService = app(HttpSignatureService::class); + $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); try { $privateKey = app(SigningService::class)->getPrivateKey(); @@ -103,7 +104,7 @@ public function handle(): void $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), + $fullParsedUrl, json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverFollowRequest.php b/app/Jobs/Federation/DeliverFollowRequest.php index 643e8e985..7f5545d3c 100644 --- a/app/Jobs/Federation/DeliverFollowRequest.php +++ b/app/Jobs/Federation/DeliverFollowRequest.php @@ -71,6 +71,7 @@ public function handle(): void ]; $signatureService = app(HttpSignatureService::class); + $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); try { $privateKey = app(SigningService::class)->getPrivateKey(); @@ -79,7 +80,7 @@ public function handle(): void $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), + $fullParsedUrl, json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverRejectActivity.php b/app/Jobs/Federation/DeliverRejectActivity.php index a25430ba6..1fdaa1eba 100644 --- a/app/Jobs/Federation/DeliverRejectActivity.php +++ b/app/Jobs/Federation/DeliverRejectActivity.php @@ -66,6 +66,7 @@ public function handle(): void } $signatureService = app(HttpSignatureService::class); + $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); $headers = [ 'Host' => $parsedUrl['host'], @@ -82,7 +83,7 @@ public function handle(): void $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), + $fullParsedUrl, json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverUndoCommentLikeActivity.php b/app/Jobs/Federation/DeliverUndoCommentLikeActivity.php index d1e1eb45e..aaa5e534f 100644 --- a/app/Jobs/Federation/DeliverUndoCommentLikeActivity.php +++ b/app/Jobs/Federation/DeliverUndoCommentLikeActivity.php @@ -88,6 +88,7 @@ public function handle(): void ]; $signatureService = app(HttpSignatureService::class); + $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); try { $privateKey = app(SigningService::class)->getPrivateKey(); @@ -96,7 +97,7 @@ public function handle(): void $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), + $fullParsedUrl, json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverUndoCommentReplyLikeActivity.php b/app/Jobs/Federation/DeliverUndoCommentReplyLikeActivity.php index c54dca3c9..a7578da9c 100644 --- a/app/Jobs/Federation/DeliverUndoCommentReplyLikeActivity.php +++ b/app/Jobs/Federation/DeliverUndoCommentReplyLikeActivity.php @@ -88,6 +88,7 @@ public function handle(): void ]; $signatureService = app(HttpSignatureService::class); + $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); try { $privateKey = app(SigningService::class)->getPrivateKey(); @@ -96,7 +97,7 @@ public function handle(): void $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), + $fullParsedUrl, json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverUndoFollowActivity.php b/app/Jobs/Federation/DeliverUndoFollowActivity.php index 69361ac1d..f594d64bf 100644 --- a/app/Jobs/Federation/DeliverUndoFollowActivity.php +++ b/app/Jobs/Federation/DeliverUndoFollowActivity.php @@ -83,6 +83,7 @@ public function handle(): void ]; $signatureService = app(HttpSignatureService::class); + $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); try { $privateKey = app(SigningService::class)->getPrivateKey(); @@ -91,7 +92,7 @@ public function handle(): void $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), + $fullParsedUrl, json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverUndoFollowRequestActivity.php b/app/Jobs/Federation/DeliverUndoFollowRequestActivity.php index a9f49af1e..3b4f0ba86 100644 --- a/app/Jobs/Federation/DeliverUndoFollowRequestActivity.php +++ b/app/Jobs/Federation/DeliverUndoFollowRequestActivity.php @@ -71,6 +71,7 @@ public function handle(): void ]; $signatureService = app(HttpSignatureService::class); + $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); try { $privateKey = app(SigningService::class)->getPrivateKey(); @@ -79,7 +80,7 @@ public function handle(): void $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), + $fullParsedUrl, json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverUndoVideoLikeActivity.php b/app/Jobs/Federation/DeliverUndoVideoLikeActivity.php index ec41fdc0d..531768962 100644 --- a/app/Jobs/Federation/DeliverUndoVideoLikeActivity.php +++ b/app/Jobs/Federation/DeliverUndoVideoLikeActivity.php @@ -92,6 +92,7 @@ public function handle(): void ]; $signatureService = app(HttpSignatureService::class); + $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); try { $privateKey = app(SigningService::class)->getPrivateKey(); @@ -100,7 +101,7 @@ public function handle(): void $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), + $fullParsedUrl, json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverUpdateVideoActivity.php b/app/Jobs/Federation/DeliverUpdateVideoActivity.php index d854536b0..200847778 100644 --- a/app/Jobs/Federation/DeliverUpdateVideoActivity.php +++ b/app/Jobs/Federation/DeliverUpdateVideoActivity.php @@ -93,6 +93,7 @@ public function handle(): void ]; $signatureService = app(HttpSignatureService::class); + $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); try { $privateKey = app(SigningService::class)->getPrivateKey(); @@ -101,7 +102,7 @@ public function handle(): void $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), + $fullParsedUrl, json_encode($activity) ); diff --git a/app/Services/DeliveryService.php b/app/Services/DeliveryService.php index 4d3c726d5..05b8ee5d6 100644 --- a/app/Services/DeliveryService.php +++ b/app/Services/DeliveryService.php @@ -40,12 +40,14 @@ public function deliverToInbox($actor, $target, $activity) try { $privateKey = app(SigningService::class)->getPrivateKey(); + $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); + $signature = $this->signatureService->sign( $actor->getKeyId(), $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), + $fullParsedUrl, $body ); diff --git a/app/Services/RelayService.php b/app/Services/RelayService.php index 4461c3e36..d54f77093 100644 --- a/app/Services/RelayService.php +++ b/app/Services/RelayService.php @@ -195,12 +195,14 @@ protected function deliverActivity(Profile $actor, string $inboxUrl, array $acti ]; $privateKey = $this->signingService->getPrivateKey(); + $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); + $signature = app(HttpSignatureService::class)->sign( $actor->getKeyId(), $privateKey, $headers, 'POST', - ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''), + $fullParsedUrl, $body ); From 469ffea211107e6d0b4af63608436a3df7455acc Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 5 Feb 2026 20:50:58 +1030 Subject: [PATCH 4/4] updated --- app/Jobs/Federation/DeliverCommentLikeActivity.php | 6 ++++-- app/Jobs/Federation/DeliverCommentReplyLikeActivity.php | 6 ++++-- app/Jobs/Federation/DeliverCreateCommentActivity.php | 6 ++++-- app/Jobs/Federation/DeliverCreateCommentReplyActivity.php | 6 ++++-- app/Jobs/Federation/DeliverCreateVideoActivity.php | 6 ++++-- app/Jobs/Federation/DeliverDeleteCommentActivity.php | 6 ++++-- app/Jobs/Federation/DeliverDeleteCommentReplyActivity.php | 6 ++++-- app/Jobs/Federation/DeliverDeleteVideoActivity.php | 6 ++++-- app/Jobs/Federation/DeliverFollowRequest.php | 6 ++++-- app/Jobs/Federation/DeliverRejectActivity.php | 6 ++++-- app/Jobs/Federation/DeliverUndoCommentLikeActivity.php | 6 ++++-- app/Jobs/Federation/DeliverUndoCommentReplyLikeActivity.php | 6 ++++-- app/Jobs/Federation/DeliverUndoFollowActivity.php | 6 ++++-- app/Jobs/Federation/DeliverUndoFollowRequestActivity.php | 6 ++++-- app/Jobs/Federation/DeliverUndoVideoLikeActivity.php | 6 ++++-- app/Jobs/Federation/DeliverUpdateVideoActivity.php | 6 ++++-- app/Services/DeliveryService.php | 6 ++++-- app/Services/RelayService.php | 6 ++++-- 18 files changed, 72 insertions(+), 36 deletions(-) diff --git a/app/Jobs/Federation/DeliverCommentLikeActivity.php b/app/Jobs/Federation/DeliverCommentLikeActivity.php index 17e8e4565..ca732efde 100644 --- a/app/Jobs/Federation/DeliverCommentLikeActivity.php +++ b/app/Jobs/Federation/DeliverCommentLikeActivity.php @@ -90,7 +90,9 @@ public function handle(): void ]; $signatureService = app(HttpSignatureService::class); - $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); + $path = $parsedUrl['path'] ?? '/'; + $queryString = isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''; + $requestPath = $path.$queryString; try { $privateKey = app(SigningService::class)->getPrivateKey(); @@ -99,7 +101,7 @@ public function handle(): void $privateKey, $headers, 'POST', - $fullParsedUrl, + $requestPath, json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverCommentReplyLikeActivity.php b/app/Jobs/Federation/DeliverCommentReplyLikeActivity.php index 52c272b27..123faee2e 100644 --- a/app/Jobs/Federation/DeliverCommentReplyLikeActivity.php +++ b/app/Jobs/Federation/DeliverCommentReplyLikeActivity.php @@ -90,7 +90,9 @@ public function handle(): void ]; $signatureService = app(HttpSignatureService::class); - $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); + $path = $parsedUrl['path'] ?? '/'; + $queryString = isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''; + $requestPath = $path.$queryString; try { $privateKey = app(SigningService::class)->getPrivateKey(); @@ -99,7 +101,7 @@ public function handle(): void $privateKey, $headers, 'POST', - $fullParsedUrl, + $requestPath, json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverCreateCommentActivity.php b/app/Jobs/Federation/DeliverCreateCommentActivity.php index 5a3a68918..665841a64 100644 --- a/app/Jobs/Federation/DeliverCreateCommentActivity.php +++ b/app/Jobs/Federation/DeliverCreateCommentActivity.php @@ -93,7 +93,9 @@ public function handle(): void ]; $signatureService = app(HttpSignatureService::class); - $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); + $path = $parsedUrl['path'] ?? '/'; + $queryString = isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''; + $requestPath = $path.$queryString; try { $privateKey = app(SigningService::class)->getPrivateKey(); @@ -102,7 +104,7 @@ public function handle(): void $privateKey, $headers, 'POST', - $fullParsedUrl, + $requestPath, json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverCreateCommentReplyActivity.php b/app/Jobs/Federation/DeliverCreateCommentReplyActivity.php index cb8b97e6b..8f880f48e 100644 --- a/app/Jobs/Federation/DeliverCreateCommentReplyActivity.php +++ b/app/Jobs/Federation/DeliverCreateCommentReplyActivity.php @@ -93,7 +93,9 @@ public function handle(): void ]; $signatureService = app(HttpSignatureService::class); - $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); + $path = $parsedUrl['path'] ?? '/'; + $queryString = isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''; + $requestPath = $path.$queryString; try { $privateKey = app(SigningService::class)->getPrivateKey(); @@ -102,7 +104,7 @@ public function handle(): void $privateKey, $headers, 'POST', - $fullParsedUrl, + $requestPath, json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverCreateVideoActivity.php b/app/Jobs/Federation/DeliverCreateVideoActivity.php index b37558c6b..d77515261 100644 --- a/app/Jobs/Federation/DeliverCreateVideoActivity.php +++ b/app/Jobs/Federation/DeliverCreateVideoActivity.php @@ -97,7 +97,9 @@ public function handle(): void ]; $signatureService = app(HttpSignatureService::class); - $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); + $path = $parsedUrl['path'] ?? '/'; + $queryString = isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''; + $requestPath = $path.$queryString; try { $privateKey = app(SigningService::class)->getPrivateKey(); @@ -106,7 +108,7 @@ public function handle(): void $privateKey, $headers, 'POST', - $fullParsedUrl, + $requestPath, json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverDeleteCommentActivity.php b/app/Jobs/Federation/DeliverDeleteCommentActivity.php index 5e321654c..37a67064d 100644 --- a/app/Jobs/Federation/DeliverDeleteCommentActivity.php +++ b/app/Jobs/Federation/DeliverDeleteCommentActivity.php @@ -95,7 +95,9 @@ public function handle(): void ]; $signatureService = app(HttpSignatureService::class); - $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); + $path = $parsedUrl['path'] ?? '/'; + $queryString = isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''; + $requestPath = $path.$queryString; try { $privateKey = app(SigningService::class)->getPrivateKey(); @@ -104,7 +106,7 @@ public function handle(): void $privateKey, $headers, 'POST', - $fullParsedUrl, + $requestPath, json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverDeleteCommentReplyActivity.php b/app/Jobs/Federation/DeliverDeleteCommentReplyActivity.php index 41317a8c1..3b9ce24fa 100644 --- a/app/Jobs/Federation/DeliverDeleteCommentReplyActivity.php +++ b/app/Jobs/Federation/DeliverDeleteCommentReplyActivity.php @@ -95,7 +95,9 @@ public function handle(): void ]; $signatureService = app(HttpSignatureService::class); - $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); + $path = $parsedUrl['path'] ?? '/'; + $queryString = isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''; + $requestPath = $path.$queryString; try { $privateKey = app(SigningService::class)->getPrivateKey(); @@ -104,7 +106,7 @@ public function handle(): void $privateKey, $headers, 'POST', - $fullParsedUrl, + $requestPath, json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverDeleteVideoActivity.php b/app/Jobs/Federation/DeliverDeleteVideoActivity.php index 9c31dd5f0..23e1aad04 100644 --- a/app/Jobs/Federation/DeliverDeleteVideoActivity.php +++ b/app/Jobs/Federation/DeliverDeleteVideoActivity.php @@ -95,7 +95,9 @@ public function handle(): void ]; $signatureService = app(HttpSignatureService::class); - $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); + $path = $parsedUrl['path'] ?? '/'; + $queryString = isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''; + $requestPath = $path.$queryString; try { $privateKey = app(SigningService::class)->getPrivateKey(); @@ -104,7 +106,7 @@ public function handle(): void $privateKey, $headers, 'POST', - $fullParsedUrl, + $requestPath, json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverFollowRequest.php b/app/Jobs/Federation/DeliverFollowRequest.php index 7f5545d3c..227f8280c 100644 --- a/app/Jobs/Federation/DeliverFollowRequest.php +++ b/app/Jobs/Federation/DeliverFollowRequest.php @@ -71,7 +71,9 @@ public function handle(): void ]; $signatureService = app(HttpSignatureService::class); - $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); + $path = $parsedUrl['path'] ?? '/'; + $queryString = isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''; + $requestPath = $path.$queryString; try { $privateKey = app(SigningService::class)->getPrivateKey(); @@ -80,7 +82,7 @@ public function handle(): void $privateKey, $headers, 'POST', - $fullParsedUrl, + $requestPath, json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverRejectActivity.php b/app/Jobs/Federation/DeliverRejectActivity.php index 1fdaa1eba..2ede44010 100644 --- a/app/Jobs/Federation/DeliverRejectActivity.php +++ b/app/Jobs/Federation/DeliverRejectActivity.php @@ -66,7 +66,9 @@ public function handle(): void } $signatureService = app(HttpSignatureService::class); - $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); + $path = $parsedUrl['path'] ?? '/'; + $queryString = isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''; + $requestPath = $path.$queryString; $headers = [ 'Host' => $parsedUrl['host'], @@ -83,7 +85,7 @@ public function handle(): void $privateKey, $headers, 'POST', - $fullParsedUrl, + $requestPath, json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverUndoCommentLikeActivity.php b/app/Jobs/Federation/DeliverUndoCommentLikeActivity.php index aaa5e534f..2910c7c70 100644 --- a/app/Jobs/Federation/DeliverUndoCommentLikeActivity.php +++ b/app/Jobs/Federation/DeliverUndoCommentLikeActivity.php @@ -88,7 +88,9 @@ public function handle(): void ]; $signatureService = app(HttpSignatureService::class); - $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); + $path = $parsedUrl['path'] ?? '/'; + $queryString = isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''; + $requestPath = $path.$queryString; try { $privateKey = app(SigningService::class)->getPrivateKey(); @@ -97,7 +99,7 @@ public function handle(): void $privateKey, $headers, 'POST', - $fullParsedUrl, + $requestPath, json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverUndoCommentReplyLikeActivity.php b/app/Jobs/Federation/DeliverUndoCommentReplyLikeActivity.php index a7578da9c..f2c060b20 100644 --- a/app/Jobs/Federation/DeliverUndoCommentReplyLikeActivity.php +++ b/app/Jobs/Federation/DeliverUndoCommentReplyLikeActivity.php @@ -88,7 +88,9 @@ public function handle(): void ]; $signatureService = app(HttpSignatureService::class); - $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); + $path = $parsedUrl['path'] ?? '/'; + $queryString = isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''; + $requestPath = $path.$queryString; try { $privateKey = app(SigningService::class)->getPrivateKey(); @@ -97,7 +99,7 @@ public function handle(): void $privateKey, $headers, 'POST', - $fullParsedUrl, + $requestPath, json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverUndoFollowActivity.php b/app/Jobs/Federation/DeliverUndoFollowActivity.php index f594d64bf..4d50f2b18 100644 --- a/app/Jobs/Federation/DeliverUndoFollowActivity.php +++ b/app/Jobs/Federation/DeliverUndoFollowActivity.php @@ -83,7 +83,9 @@ public function handle(): void ]; $signatureService = app(HttpSignatureService::class); - $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); + $path = $parsedUrl['path'] ?? '/'; + $queryString = isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''; + $requestPath = $path.$queryString; try { $privateKey = app(SigningService::class)->getPrivateKey(); @@ -92,7 +94,7 @@ public function handle(): void $privateKey, $headers, 'POST', - $fullParsedUrl, + $requestPath, json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverUndoFollowRequestActivity.php b/app/Jobs/Federation/DeliverUndoFollowRequestActivity.php index 3b4f0ba86..c182c49dd 100644 --- a/app/Jobs/Federation/DeliverUndoFollowRequestActivity.php +++ b/app/Jobs/Federation/DeliverUndoFollowRequestActivity.php @@ -71,7 +71,9 @@ public function handle(): void ]; $signatureService = app(HttpSignatureService::class); - $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); + $path = $parsedUrl['path'] ?? '/'; + $queryString = isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''; + $requestPath = $path.$queryString; try { $privateKey = app(SigningService::class)->getPrivateKey(); @@ -80,7 +82,7 @@ public function handle(): void $privateKey, $headers, 'POST', - $fullParsedUrl, + $requestPath, json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverUndoVideoLikeActivity.php b/app/Jobs/Federation/DeliverUndoVideoLikeActivity.php index 531768962..e80db8791 100644 --- a/app/Jobs/Federation/DeliverUndoVideoLikeActivity.php +++ b/app/Jobs/Federation/DeliverUndoVideoLikeActivity.php @@ -92,7 +92,9 @@ public function handle(): void ]; $signatureService = app(HttpSignatureService::class); - $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); + $path = $parsedUrl['path'] ?? '/'; + $queryString = isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''; + $requestPath = $path.$queryString; try { $privateKey = app(SigningService::class)->getPrivateKey(); @@ -101,7 +103,7 @@ public function handle(): void $privateKey, $headers, 'POST', - $fullParsedUrl, + $requestPath, json_encode($activity) ); diff --git a/app/Jobs/Federation/DeliverUpdateVideoActivity.php b/app/Jobs/Federation/DeliverUpdateVideoActivity.php index 200847778..2cd48d613 100644 --- a/app/Jobs/Federation/DeliverUpdateVideoActivity.php +++ b/app/Jobs/Federation/DeliverUpdateVideoActivity.php @@ -93,7 +93,9 @@ public function handle(): void ]; $signatureService = app(HttpSignatureService::class); - $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); + $path = $parsedUrl['path'] ?? '/'; + $queryString = isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''; + $requestPath = $path.$queryString; try { $privateKey = app(SigningService::class)->getPrivateKey(); @@ -102,7 +104,7 @@ public function handle(): void $privateKey, $headers, 'POST', - $fullParsedUrl, + $requestPath, json_encode($activity) ); diff --git a/app/Services/DeliveryService.php b/app/Services/DeliveryService.php index 05b8ee5d6..023508b68 100644 --- a/app/Services/DeliveryService.php +++ b/app/Services/DeliveryService.php @@ -40,14 +40,16 @@ public function deliverToInbox($actor, $target, $activity) try { $privateKey = app(SigningService::class)->getPrivateKey(); - $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); + $path = $parsedUrl['path'] ?? '/'; + $queryString = isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''; + $requestPath = $path.$queryString; $signature = $this->signatureService->sign( $actor->getKeyId(), $privateKey, $headers, 'POST', - $fullParsedUrl, + $requestPath, $body ); diff --git a/app/Services/RelayService.php b/app/Services/RelayService.php index d54f77093..27860ffda 100644 --- a/app/Services/RelayService.php +++ b/app/Services/RelayService.php @@ -195,14 +195,16 @@ protected function deliverActivity(Profile $actor, string $inboxUrl, array $acti ]; $privateKey = $this->signingService->getPrivateKey(); - $fullParsedUrl = ($parsedUrl['path'] ?? '/').(isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''); + $path = $parsedUrl['path'] ?? '/'; + $queryString = isset($parsedUrl['query']) ? '?'.$parsedUrl['query'] : ''; + $requestPath = $path.$queryString; $signature = app(HttpSignatureService::class)->sign( $actor->getKeyId(), $privateKey, $headers, 'POST', - $fullParsedUrl, + $requestPath, $body );