diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 3d256e0c1..52201dad1 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -19,7 +19,10 @@ class ProfileController extends Controller { public function show(Request $request, $username) { - $user = Profile::whereNull('domain')->whereUsername($username)->firstOrFail(); + $user = Profile::whereUsername($username)->firstOrFail(); + if($user->domain) { + return redirect($user->remote_url); + } if($user->status != null) { return $this->accountCheck($user); } else { @@ -252,12 +255,4 @@ class ProfileController extends Controller return view('profile.bookmarks', compact('user', 'profile', 'settings', 'owner', 'following', 'timeline', 'is_following', 'is_admin')); } - public function createCollection(Request $request) - { - } - - - public function collections(Request $request) - { - } } diff --git a/public/js/status.js b/public/js/status.js index 0ebabeea0..2e7bd3777 100644 Binary files a/public/js/status.js and b/public/js/status.js differ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index c25d1d605..e905dbcbd 100644 Binary files a/public/mix-manifest.json and b/public/mix-manifest.json differ diff --git a/resources/assets/js/components/PostComponent.vue b/resources/assets/js/components/PostComponent.vue index f3edddbea..1bc55c3fa 100644 --- a/resources/assets/js/components/PostComponent.vue +++ b/resources/assets/js/components/PostComponent.vue @@ -156,7 +156,6 @@
{{s.favourites_count == 1 ? '1 like' : s.favourites_count + ' likes'}} - Reply