From 8c111d22c6120e7a35fd140acdc6e3d42542a4bb Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 16 Oct 2018 15:36:08 -0600 Subject: [PATCH] Update StatusController --- app/Http/Controllers/StatusController.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/StatusController.php b/app/Http/Controllers/StatusController.php index 04c42747e..77962b1be 100644 --- a/app/Http/Controllers/StatusController.php +++ b/app/Http/Controllers/StatusController.php @@ -22,6 +22,7 @@ class StatusController extends Controller $user = Profile::whereUsername($username)->firstOrFail(); $status = Status::whereProfileId($user->id) + ->where('visibility', '!=', 'draft') ->withCount(['likes', 'comments', 'media']) ->findOrFail($id); @@ -41,7 +42,7 @@ class StatusController extends Controller $template = $this->detectTemplate($status); - $replies = Status::whereInReplyToId($status->id)->simplePaginate(30); + $replies = Status::whereInReplyToId($status->id)->orderBy('created_at', 'desc')->simplePaginate(30); return view($template, compact('user', 'status', 'replies')); } @@ -59,6 +60,9 @@ class StatusController extends Controller if ($status->viewType() == 'video') { $template = 'status.show.video'; } + if ($status->viewType() == 'video-album') { + $template = 'status.show.video-album'; + } return $template; }); @@ -85,13 +89,7 @@ class StatusController extends Controller } $this->validate($request, [ - 'photo.*' => function() { - return [ - 'required', - 'mimes:' . config('pixelfed.media_types'), - 'max:' . config('pixelfed.max_photo_size'), - ]; - }, + 'photo.*' => 'required|mimetypes:' . config('pixelfed.media_types').'|max:' . config('pixelfed.max_photo_size'), 'caption' => 'string|max:'.config('pixelfed.max_caption_length'), 'cw' => 'nullable|string', 'filter_class' => 'nullable|string',