mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge pull request #2483 from pixelfed/staging 

Staging
This commit is contained in:
daniel 2020-12-10 22:13:24 -07:00 committed by GitHub
parent 6d9ee2a720 b4573a8f0a
commit 2803aaf6c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -126,6 +126,7 @@
- Updated dockerfile, fix composer issue. ([ef45c4b21](https://github.com/pixelfed/pixelfed/commit/ef45c4b21)) - Updated dockerfile, fix composer issue. ([ef45c4b21](https://github.com/pixelfed/pixelfed/commit/ef45c4b21))
- Updated reply/comment view, improve layout and include child reply. ([2eca670e](https://github.com/pixelfed/pixelfed/commit/2eca670e)) - Updated reply/comment view, improve layout and include child reply. ([2eca670e](https://github.com/pixelfed/pixelfed/commit/2eca670e))
- Updated Collections, add custom limit. ([048642be](https://github.com/pixelfed/pixelfed/commit/048642be)) - Updated Collections, add custom limit. ([048642be](https://github.com/pixelfed/pixelfed/commit/048642be))
- Updated AccountInterstitialController, add autospam type. ([c67f0c57](https://github.com/pixelfed/pixelfed/commit/c67f0c57))
## [v0.10.9 (2020-04-17)](https://github.com/pixelfed/pixelfed/compare/v0.10.8...v0.10.9) ## [v0.10.9 (2020-04-17)](https://github.com/pixelfed/pixelfed/compare/v0.10.8...v0.10.9)
### Added ### Added

4
app/Http/Controllers/AccountInterstitialController.php
View File

@ -20,12 +20,14 @@ class AccountInterstitialController extends Controller
->interstitials() ->interstitials()
->whereNull('read_at') ->whereNull('read_at')
->first(); ->first();
if(!$interstitial) { if(!$interstitial) {
$user = $request->user(); $user = $request->user();
$user->has_interstitial = false; $user->has_interstitial = false;
$user->save(); $user->save();
return redirect('/'); return redirect('/');
} }
$meta = json_decode($interstitial->meta); $meta = json_decode($interstitial->meta);
$view = $interstitial->view; $view = $interstitial->view;
return view($view, compact('interstitial', 'meta')); return view($view, compact('interstitial', 'meta'));
@ -35,7 +37,7 @@ class AccountInterstitialController extends Controller
{ {
$this->validate($request, [ $this->validate($request, [
'id' => 'required', 'id' => 'required',
'type' => 'required|in:post.cw,post.removed,post.unlist', 'type' => 'required|in:post.cw,post.removed,post.unlist,post.autospam',
'action' => 'required|in:appeal,confirm', 'action' => 'required|in:appeal,confirm',
'appeal_message' => 'nullable|max:500' 'appeal_message' => 'nullable|max:500'
]); ]);