From 789ed4b49804ac66f4e26ac9816af3366cf5b4cf Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 30 Jan 2021 16:34:44 -0700 Subject: [PATCH] Update ComposeController, use placeholder image for video media. Fixes #2595 --- app/Http/Controllers/ComposeController.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/ComposeController.php b/app/Http/Controllers/ComposeController.php index 8881b7656..d292b590b 100644 --- a/app/Http/Controllers/ComposeController.php +++ b/app/Http/Controllers/ComposeController.php @@ -39,6 +39,7 @@ use App\Services\NotificationService; use App\Services\MediaPathService; use App\Services\MediaBlocklistService; use App\Services\MediaTagService; +use App\Services\ServiceService; use Illuminate\Support\Str; use App\Util\Lexer\Autolink; use App\Util\Lexer\Extractor; @@ -117,10 +118,9 @@ class ComposeController extends Controller $media->version = 3; $media->save(); - // $url = URL::temporarySignedRoute( - // 'temp-media', now()->addHours(1), ['profileId' => $profile->id, 'mediaId' => $media->id, 'timestamp' => time()] - // ); - + $preview_url = $media->url() . '?v=' . time(); + $url = $media->url() . '?v=' . time(); + switch ($media->mime) { case 'image/jpeg': case 'image/png': @@ -139,8 +139,8 @@ class ComposeController extends Controller $resource = new Fractal\Resource\Item($media, new MediaTransformer()); $res = $this->fractal->createData($resource)->toArray(); - $res['preview_url'] = $media->url() . '?v=' . time(); - $res['url'] = $media->url() . '?v=' . time(); + $res['preview_url'] = $preview_url; + $res['url'] = $url; return response()->json($res); }