From 234f1df0976002d49927881c2e4fdec95f95ac94 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 24 Jun 2019 22:46:35 -0600 Subject: [PATCH] Update AP Inbox --- app/Http/Controllers/SearchController.php | 2 +- app/Util/ActivityPub/Helpers.php | 2 +- app/Util/ActivityPub/Inbox.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index d8d13d47..6c9d4b83 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -56,7 +56,7 @@ class SearchController extends Controller ] ]]; } else if ($type == 'Note') { - $item = Helpers::statusFirstOrFetch($tag, false); + $item = Helpers::statusFetch($tag); $tokens['posts'] = [[ 'count' => 0, 'url' => $item->url(), diff --git a/app/Util/ActivityPub/Helpers.php b/app/Util/ActivityPub/Helpers.php index 6d34c64d..88a30d58 100644 --- a/app/Util/ActivityPub/Helpers.php +++ b/app/Util/ActivityPub/Helpers.php @@ -206,7 +206,7 @@ class Helpers { return self::fetchFromUrl($url); } - public static function statusFirstOrFetch($url, $replyTo = true) + public static function statusFirstOrFetch($url, $replyTo = false) { $url = self::validateUrl($url); if($url == false) { diff --git a/app/Util/ActivityPub/Inbox.php b/app/Util/ActivityPub/Inbox.php index 4731811f..48cb4b01 100644 --- a/app/Util/ActivityPub/Inbox.php +++ b/app/Util/ActivityPub/Inbox.php @@ -151,7 +151,7 @@ class Inbox if(Status::whereUrl($url)->exists()) { return; } - Helpers::statusFirstOrFetch($url, false); + Helpers::statusFetch($url); return; }