mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-11-26 08:13:16 +00:00
Update ProfileController, fixes #1912
This commit is contained in:
parent
3f75763d7d
commit
2f44cafbf0
1 changed files with 28 additions and 0 deletions
|
@ -9,6 +9,7 @@ use View;
|
||||||
use App\Follower;
|
use App\Follower;
|
||||||
use App\FollowRequest;
|
use App\FollowRequest;
|
||||||
use App\Profile;
|
use App\Profile;
|
||||||
|
use App\Story;
|
||||||
use App\User;
|
use App\User;
|
||||||
use App\UserFilter;
|
use App\UserFilter;
|
||||||
use League\Fractal;
|
use League\Fractal;
|
||||||
|
@ -135,6 +136,21 @@ class ProfileController extends Controller
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static function accountCheck(Profile $profile)
|
||||||
|
{
|
||||||
|
switch ($profile->status) {
|
||||||
|
case 'disabled':
|
||||||
|
case 'suspended':
|
||||||
|
case 'delete':
|
||||||
|
return view('profile.disabled');
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return abort(404);
|
||||||
|
}
|
||||||
|
|
||||||
protected function blockedProfileCheck(Profile $profile)
|
protected function blockedProfileCheck(Profile $profile)
|
||||||
{
|
{
|
||||||
$pid = Auth::user()->profile->id;
|
$pid = Auth::user()->profile->id;
|
||||||
|
@ -215,4 +231,16 @@ class ProfileController extends Controller
|
||||||
|
|
||||||
return response($content)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
|
return response($content)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function stories(Request $request, $username)
|
||||||
|
{
|
||||||
|
abort_if(!config('instance.stories.enabled') || !$request->user(), 404);
|
||||||
|
$profile = Profile::whereNull('domain')->whereUsername($username)->firstOrFail();
|
||||||
|
$pid = $profile->id;
|
||||||
|
$exists = Story::whereProfileId($pid)
|
||||||
|
->where('expires_at', '>', now())
|
||||||
|
->count();
|
||||||
|
abort_unless($exists > 1, 404);
|
||||||
|
return view('profile.story', compact('pid'));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue