UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-25 15:55:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update ProfileController

Browse source
This commit is contained in:
Daniel Supernault 2019-05-20 21:50:06 -06:00
parent a40021f55e
commit 93cf351168
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/Http/Controllers/ProfileController.php
View file

@ -19,7 +19,10 @@ class ProfileController extends Controller
{ {
public function show(Request $request, $username) 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) { if($user->status != null) {
return $this->accountCheck($user); return $this->accountCheck($user);
} else { } else {
@ -252,12 +255,4 @@ class ProfileController extends Controller
return view('profile.bookmarks', compact('user', 'profile', 'settings', 'owner', 'following', 'timeline', 'is_following', 'is_admin')); 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)
{
}
} }