Merge pull request #2981 from pixelfed/staging

Staging

CHANGELOG.md

@@ -16,6 +16,7 @@
 - Updated StatusCard component, add relationship state button. ([0436b124](https://github.com/pixelfed/pixelfed/commit/0436b124))
 - Updated Timeline component, cascade relationship state change. ([f4bd5672](https://github.com/pixelfed/pixelfed/commit/f4bd5672))
 - Updated Activity component, only show context button for actionable activities. ([7886fd59](https://github.com/pixelfed/pixelfed/commit/7886fd59))
+- Updated Autospam service, use silent classification for better user experience. ([f0d4c172](https://github.com/pixelfed/pixelfed/commit/f0d4c172))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.1 (2021-09-07)](https://github.com/pixelfed/pixelfed/compare/v0.11.0...v0.11.1)

app/Util/Sentiment/Bouncer.php

@@ -132,11 +132,11 @@ class Bouncer {
 
 		$status->scope = 'unlisted';
 		$status->visibility = 'unlisted';
-		$status->is_nsfw = true;
+		// $status->is_nsfw = true;
 		$status->save();
 
 		Cache::forget('pf:bouncer_v0:exemption_by_pid:' . $status->profile_id);
 		Cache::forget('pf:bouncer_v0:recent_by_pid:' . $status->profile_id);
 	}
 
-}
+}

config/horizon.php

@@ -83,7 +83,9 @@ return [
 		'redis:default' => 30,
 		'redis:low' => 30,
 		'redis:high' => 30,
-		'redis:delete' => 30
+		'redis:delete' => 30,
+		'redis:story' => 30,
+		'redis:mmo' => 30,
 	],
 
 	/*
@@ -167,7 +169,7 @@ return [
 		'production' => [
 			'supervisor-1' => [
 				'connection'    => 'redis',
-				'queue'         => ['high', 'default', 'feed', 'low', 'story', 'delete'],
+				'queue'         => ['high', 'default', 'feed', 'low', 'story', 'delete', 'mmo'],
 				'balance'       => 'auto',
 				'maxProcesses'  => 20,
 				'memory'        => 128,
@@ -179,7 +181,7 @@ return [
 		'local' => [
 			'supervisor-1' => [
 				'connection'    => 'redis',
-				'queue'         => ['high', 'default', 'feed', 'low', 'story', 'delete'],
+				'queue'         => ['high', 'default', 'feed', 'low', 'story', 'delete', 'mmo'],
 				'balance'       => 'auto',
 				'maxProcesses'  => 20,
 				'memory'        => 128,

resources/views/profile/story.blade.php

@@ -5,7 +5,7 @@
 @endsection
 
 @push('scripts')
-<script type="text/javascript" src="{{mix('js/stories.js')}}"></script>
+<script type="text/javascript" src="/js/stories.js?v={{ time() }}"></script>
 <script type="text/javascript" src="{{mix('js/profile.js')}}"></script>
 <script type="text/javascript">App.boot();</script>
 @endpush

resources/views/stories/compose.blade.php

@@ -6,6 +6,6 @@
 @endsection
 
 @push('scripts')
-<script type="text/javascript" src="{{ mix('js/story-compose.js') }}"></script>
+<script type="text/javascript" src="/js/story-compose.js?v={{time()}}"></script>
 <script type="text/javascript">window.App.boot()</script>
-@endpush
+@endpush

resources/views/stories/show_remote.blade.php

@@ -5,6 +5,6 @@
 @endsection
 
 @push('scripts')
-<script type="text/javascript" src="{{mix('js/stories.js')}}"></script>
+<script type="text/javascript" src="/js/stories.js?v={{ time() }}"></script>
 <script type="text/javascript">App.boot();</script>
 @endpush

routes/api.php

@@ -2,7 +2,7 @@
 
 use Illuminate\Http\Request;
 
-$middleware = ['auth:api','twofactor','validemail','interstitial'];
+$middleware = ['auth:api','twofactor','validemail'];
 
 Route::post('/f/inbox', 'FederationController@sharedInbox');
 Route::post('/users/{username}/inbox', 'FederationController@userInbox');

routes/web.php

@@ -84,7 +84,7 @@ Route::domain(config('pixelfed.domain.admin'))->prefix('i/admin')->group(functio
 	Route::post('diagnostics/decrypt', 'AdminController@diagnosticsDecrypt')->name('admin.diagnostics.decrypt');
 });
 
-Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofactor', 'localization','interstitial'])->group(function () {
+Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofactor', 'localization'])->group(function () {
 	Route::get('/', 'SiteController@home')->name('timeline.personal');
 	Route::post('/', 'StatusController@store');