From 96f24f337e0a52edd7aea1284ac2b144dcd37aaf Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Wed, 19 Jun 2024 00:18:03 -0600 Subject: [PATCH 1/2] Update DirectMessageController, add carousel entity to threads --- app/Http/Controllers/DirectMessageController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Http/Controllers/DirectMessageController.php b/app/Http/Controllers/DirectMessageController.php index ff5328078..952ba40a1 100644 --- a/app/Http/Controllers/DirectMessageController.php +++ b/app/Http/Controllers/DirectMessageController.php @@ -12,6 +12,7 @@ use App\Notification; use App\Profile; use App\Services\AccountService; use App\Services\MediaBlocklistService; +use App\Services\MediaService; use App\Services\MediaPathService; use App\Services\StatusService; use App\Services\UserFilterService; @@ -456,6 +457,7 @@ class DirectMessageController extends Controller 'type' => $s->type, 'text' => $s->status->caption, 'media' => $s->status->firstMedia() ? $s->status->firstMedia()->url() : null, + 'carousel' => MediaService::get($s->status_id), 'created_at' => $s->created_at->format('c'), 'timeAgo' => $s->created_at->diffForHumans(null, null, true), 'seen' => $s->read_at != null, From bc84259a6328f9ff66985f50e18e3ec8d2e11254 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Wed, 19 Jun 2024 00:18:42 -0600 Subject: [PATCH 2/2] Lint --- app/Http/Controllers/DirectMessageController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/DirectMessageController.php b/app/Http/Controllers/DirectMessageController.php index 952ba40a1..7e66d30fc 100644 --- a/app/Http/Controllers/DirectMessageController.php +++ b/app/Http/Controllers/DirectMessageController.php @@ -12,8 +12,8 @@ use App\Notification; use App\Profile; use App\Services\AccountService; use App\Services\MediaBlocklistService; -use App\Services\MediaService; use App\Services\MediaPathService; +use App\Services\MediaService; use App\Services\StatusService; use App\Services\UserFilterService; use App\Services\UserRoleService;