mirror/pixelfed
1
0
Fork 1
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-29 19:25:00 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3265 from pixelfed/staging

Browse source 
Update SpaController
This commit is contained in:
daniel 2022-02-18 04:20:05 -07:00 committed by GitHub
commit 41a934ace8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
app/Http/Controllers/SpaController.php
View file

@ -13,14 +13,10 @@ use App\Util\Localization\Localization;
class SpaController extends Controller
{
public function __construct()
{
$this->middleware('auth');
}
public function index()
public function index(Request $req)
{
abort_unless(config('exp.spa'), 404);
if(!$req->user()) { return redirect('/login'); }
return view('layouts.spa');
}
@ -32,7 +28,7 @@ class SpaController extends Controller
}
if(SnowflakeService::byDate(now()->subDays(30)) > $id) {
abort(404);
return redirect('/login');
}
$post = StatusService::get($id);
@ -46,7 +42,7 @@ class SpaController extends Controller
return redirect($post['url']);
}
abort(404);
return redirect('/login');
}
public function webProfile(Request $request, $id)
@ -60,17 +56,19 @@ class SpaController extends Controller
return view('layouts.spa');
}
$account = AccountService::get($id);
// $account = AccountService::get($id);
if($account && isset($account['url'])) {
return redirect($account['url']);
}
// if($account && isset($account['url'])) {
// return redirect($account['url']);
// }
return redirect('404');
return redirect('/login');
}
public function updateLanguage(Request $request)
{
abort_unless(config('exp.spa'), 404);
abort_unless($req->user(), 404);
$this->validate($request, [
'v' => 'required|in:0.1,0.2',
'l' => 'required|alpha_dash|max:5'
@ -90,6 +88,7 @@ class SpaController extends Controller
public function getPrivacy()
{
abort_unless($req->user(), 404);
$body = $this->markdownToHtml('views/page/privacy.md');
return [
'body' => $body
@ -98,6 +97,7 @@ class SpaController extends Controller
public function getTerms()
{
abort_unless($req->user(), 404);
$body = $this->markdownToHtml('views/page/terms.md');
return [
'body' => $body
@ -119,6 +119,7 @@ class SpaController extends Controller
public function usernameRedirect(Request $request, $username)
{
abort_unless($req->user(), 404);
$id = AccountService::usernameToId($username);
if(!$id) {
return redirect('/i/web/404');