From c556441b4c7e4d66b29c32dffc0c7c9a5f11921a Mon Sep 17 00:00:00 2001 From: Ghostie Date: Sun, 5 Jan 2025 20:15:22 -0500 Subject: [PATCH] bug fix --- app/Http/Controllers/AP/APOutboxController.php | 6 +++--- app/Http/Controllers/HomeController.php | 2 +- app/Types/TypeActivity.php | 5 ++++- app/Types/TypeActor.php | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/AP/APOutboxController.php b/app/Http/Controllers/AP/APOutboxController.php index dc745ab..eee7b75 100644 --- a/app/Http/Controllers/AP/APOutboxController.php +++ b/app/Http/Controllers/AP/APOutboxController.php @@ -173,7 +173,7 @@ class APOutboxController extends Controller "object" => $object_actor->id, ]); - if ($response->getStatusCode () < 200 || $response->getStatusCode () >= 300) + if (!$response || $response->getStatusCode () < 200 || $response->getStatusCode () >= 300) return response ()->json ([ "error" => "failed to post activity" ], 500); return [ @@ -197,7 +197,7 @@ class APOutboxController extends Controller $unfollow_activity = TypeActivity::craft_undo ($follow_activity, $user->actor ()->first ()); $response = TypeActivity::post_activity ($unfollow_activity, $user->actor ()->first (), $object_actor); - if ($response->getStatusCode () < 200 || $response->getStatusCode () >= 300) + if (!$response || $response->getStatusCode () < 200 || $response->getStatusCode () >= 300) return response ()->json ([ "error" => "failed to post activity" ], 500); $follow_activity->delete (); @@ -243,7 +243,7 @@ class APOutboxController extends Controller $response = TypeActivity::post_activity ($like_activity, $actor, $object->get_actor ()->first ()); - if ($response->getStatusCode () < 200 || $response->getStatusCode () >= 300) + if (!$response || $response->getStatusCode () < 200 || $response->getStatusCode () >= 300) return response ()->json ([ "error" => "failed to post activity" ], 500); return [ diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 8ce4f8c..c15f6a3 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -58,7 +58,7 @@ class HomeController extends Controller if (!$actor) return redirect ()->route ("home"); - return redirect ()->route ("users.show", "@$actor->preferredUsername@$domain"); + return redirect ()->route ("users.show", "@$username@$domain"); } } diff --git a/app/Types/TypeActivity.php b/app/Types/TypeActivity.php index af3a397..175d509 100644 --- a/app/Types/TypeActivity.php +++ b/app/Types/TypeActivity.php @@ -269,8 +269,11 @@ class TypeActivity { $instances = Instance::all (); foreach ($instances as $instance) { + if (!$instance->inbox) + continue; + $response = TypeActivity::post_activity ($activity, $source, $instance->inbox, true); - if ($response->getStatusCode () < 200 || $response->getStatusCode () >= 300) + if (!$response || $response->getStatusCode () < 200 || $response->getStatusCode () >= 300) { Log::info ("failed to post activity to " . $instance->inbox); } diff --git a/app/Types/TypeActor.php b/app/Types/TypeActor.php index 60ddd44..50739ec 100644 --- a/app/Types/TypeActor.php +++ b/app/Types/TypeActor.php @@ -171,7 +171,7 @@ class TypeActor { $actor->public_key = $request['publicKey']['publicKeyPem'] ?? ''; $instances = Instance::where ("inbox", $actor->sharedInbox); - if (!$instances->first ()) + if (!$instances->first () && $actor->sharedInbox) { $instance = new Instance (); $instance->inbox = $actor->sharedInbox;