From ad5551ed5eed4587e9f0e000c89f2495f76b51c5 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 11 Feb 2019 12:30:56 -0700 Subject: [PATCH] Update ProfileController --- app/Http/Controllers/ProfileController.php | 23 +++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 0e9271abe..5440b7890 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -66,18 +66,9 @@ class ProfileController extends Controller if ($isPrivate == true || $isBlocked == true) { return view('profile.private', compact('user', 'is_following')); } - $is_admin = is_null($user->domain) ? $user->user->is_admin : false; - $timeline = $user->statuses() - ->whereHas('media') - ->whereNull('in_reply_to_id') - ->whereNull('reblog_of_id') - ->whereIn('visibility', ['public', 'unlisted']) - ->orderBy('created_at', 'desc') - ->withCount(['comments', 'likes']) - ->simplePaginate(21); - - return view('profile.show', compact('user', 'settings', 'owner', 'is_following', 'is_admin', 'timeline')); + $profile = $user; + return view('profile.show', compact('user', 'profile', 'settings', 'owner', 'is_following', 'is_admin', 'timeline')); } public function permalinkRedirect(Request $request, $username) @@ -130,6 +121,7 @@ class ProfileController extends Controller { switch ($profile->status) { case 'disabled': + case 'suspended': case 'delete': return view('profile.disabled'); break; @@ -248,4 +240,13 @@ class ProfileController extends Controller $is_admin = is_null($user->domain) ? $user->user->is_admin : false; return view('profile.show', compact('user', 'settings', 'owner', 'following', 'timeline', 'is_following', 'is_admin')); } + + public function createCollection(Request $request) + { + } + + + public function collections(Request $request) + { + } }