Merge pull request #2483 from pixelfed/staging

Staging

CHANGELOG.md

@@ -126,6 +126,7 @@
 - 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 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)
 ### Added

app/Http/Controllers/AccountInterstitialController.php

@@ -20,12 +20,14 @@ class AccountInterstitialController extends Controller
             ->interstitials()
             ->whereNull('read_at')
             ->first();
+
         if(!$interstitial) {
             $user = $request->user();
             $user->has_interstitial = false;
             $user->save();
             return redirect('/');
         }
+
         $meta = json_decode($interstitial->meta);
         $view = $interstitial->view;
     	return view($view, compact('interstitial', 'meta'));
@@ -35,7 +37,7 @@ class AccountInterstitialController extends Controller
     {
         $this->validate($request, [
             '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',
             'appeal_message' => 'nullable|max:500'
         ]);