From 64c75bdaecd23a11afa398c62f40eef7780f3c43 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 19 Oct 2021 22:07:57 -0600 Subject: [PATCH 1/4] Update story views --- resources/views/profile/story.blade.php | 2 +- resources/views/stories/compose.blade.php | 4 ++-- resources/views/stories/show_remote.blade.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/profile/story.blade.php b/resources/views/profile/story.blade.php index 4199e0b9..8f89cdab 100644 --- a/resources/views/profile/story.blade.php +++ b/resources/views/profile/story.blade.php @@ -5,7 +5,7 @@ @endsection @push('scripts') - + @endpush diff --git a/resources/views/stories/compose.blade.php b/resources/views/stories/compose.blade.php index 1b5466f8..f698ade9 100644 --- a/resources/views/stories/compose.blade.php +++ b/resources/views/stories/compose.blade.php @@ -6,6 +6,6 @@ @endsection @push('scripts') - + -@endpush \ No newline at end of file +@endpush diff --git a/resources/views/stories/show_remote.blade.php b/resources/views/stories/show_remote.blade.php index 86347f4d..db01e4d1 100644 --- a/resources/views/stories/show_remote.blade.php +++ b/resources/views/stories/show_remote.blade.php @@ -5,6 +5,6 @@ @endsection @push('scripts') - + @endpush From f0d4c17236f0eff8af2b25a5b9ecd924eb7f8315 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 19 Oct 2021 23:13:12 -0600 Subject: [PATCH 2/4] Update Autospam service, use silent classification for better user experience --- app/Util/Sentiment/Bouncer.php | 4 ++-- routes/api.php | 2 +- routes/web.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Util/Sentiment/Bouncer.php b/app/Util/Sentiment/Bouncer.php index dd72c355..4e198333 100644 --- a/app/Util/Sentiment/Bouncer.php +++ b/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); } -} \ No newline at end of file +} diff --git a/routes/api.php b/routes/api.php index 56c73370..cbf2b85a 100644 --- a/routes/api.php +++ b/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'); diff --git a/routes/web.php b/routes/web.php index 23a0080b..e4afd596 100644 --- a/routes/web.php +++ b/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'); From eac6b767794f96342351af70239d58ea45ce1f16 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 19 Oct 2021 23:15:03 -0600 Subject: [PATCH 3/4] Update horizon config --- config/horizon.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/config/horizon.php b/config/horizon.php index e43ff35b..c089fd90 100644 --- a/config/horizon.php +++ b/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, From 4225f32af084ee74638e56435b03c64a30d82375 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 19 Oct 2021 23:38:34 -0600 Subject: [PATCH 4/4] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c2769c4..0e0b77c0 100644 --- a/CHANGELOG.md +++ b/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)