UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-19 19:43:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5183 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2024-06-19 00:19:29 -06:00 committed by GitHub
commit 53faeefd40
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/DirectMessageController.php
View file

@ -13,6 +13,7 @@ use App\Profile;
use App\Services\AccountService; use App\Services\AccountService;
use App\Services\MediaBlocklistService; use App\Services\MediaBlocklistService;
use App\Services\MediaPathService; use App\Services\MediaPathService;
use App\Services\MediaService;
use App\Services\StatusService; use App\Services\StatusService;
use App\Services\UserFilterService; use App\Services\UserFilterService;
use App\Services\UserRoleService; use App\Services\UserRoleService;
@ -456,6 +457,7 @@ class DirectMessageController extends Controller
'type' => $s->type, 'type' => $s->type,
'text' => $s->status->caption, 'text' => $s->status->caption,
'media' => $s->status->firstMedia() ? $s->status->firstMedia()->url() : null, 'media' => $s->status->firstMedia() ? $s->status->firstMedia()->url() : null,
'carousel' => MediaService::get($s->status_id),
'created_at' => $s->created_at->format('c'), 'created_at' => $s->created_at->format('c'),
'timeAgo' => $s->created_at->diffForHumans(null, null, true), 'timeAgo' => $s->created_at->diffForHumans(null, null, true),
'seen' => $s->read_at != null, 'seen' => $s->read_at != null,