chris/pixelfed
1
0
Fork 0
forked from mirror/pixelfed
Code Pull requests Activity

Merge pull request #3297 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2022-03-08 22:24:49 -07:00 committed by GitHub
commit 5fa521f296
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -74,6 +74,7 @@
- Updated AP Helpers, fixes #3290. ([53975206](https://github.com/pixelfed/pixelfed/commit/53975206)) - Updated AP Helpers, fixes #3290. ([53975206](https://github.com/pixelfed/pixelfed/commit/53975206))
- Updated AccountController, refresh relationship after handling follow request. ([fe768785](https://github.com/pixelfed/pixelfed/commit/fe768785)) - Updated AccountController, refresh relationship after handling follow request. ([fe768785](https://github.com/pixelfed/pixelfed/commit/fe768785))
- Updated CollectionController, fixes #3289. ([c7e1e473](https://github.com/pixelfed/pixelfed/commit/c7e1e473)) - Updated CollectionController, fixes #3289. ([c7e1e473](https://github.com/pixelfed/pixelfed/commit/c7e1e473))
- Updated SpaController, handle web redirects. ([b6c6c85b](https://github.com/pixelfed/pixelfed/commit/b6c6c85b))
- ([](https://github.com/pixelfed/pixelfed/commit/)) - ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.2 (2022-01-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.1...v0.11.2) ## [v0.11.2 (2022-01-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.1...v0.11.2)

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

@ -27,10 +27,6 @@ class SpaController extends Controller
return view('layouts.spa'); return view('layouts.spa');
} }
if(SnowflakeService::byDate(now()->subDays(30)) > $id) {
return redirect('/login');
}
$post = StatusService::get($id); $post = StatusService::get($id);
if( if(
@ -39,6 +35,7 @@ class SpaController extends Controller
isset($post['local']) && isset($post['local']) &&
$post['local'] === true $post['local'] === true
) { ) {
sleep(5);
return redirect($post['url']); return redirect($post['url']);
} }
@ -56,11 +53,13 @@ class SpaController extends Controller
return view('layouts.spa'); return view('layouts.spa');
} }
// $account = AccountService::get($id); $account = AccountService::get($id);
// if($account && isset($account['url'])) { sleep(5);
// return redirect($account['url']);
// } if($account && isset($account['url']) && $account['local']) {
return redirect($account['url']);
}
return redirect('/login'); return redirect('/login');
} }