From 1f2028fb13f4624978701337cc5b25f8e566c27a Mon Sep 17 00:00:00 2001 From: Shlee Date: Sat, 14 May 2022 18:10:38 +0930 Subject: [PATCH 01/13] Update trustedproxy.php --- config/trustedproxy.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/trustedproxy.php b/config/trustedproxy.php index 608e189d5..81cef227e 100644 --- a/config/trustedproxy.php +++ b/config/trustedproxy.php @@ -23,5 +23,5 @@ return [ * how many proxies that client's request has * subsequently passed through. */ - 'proxies' => env('TRUST_PROXIES', ''), + 'proxies' => env('TRUST_PROXIES', '*'), ]; From 549b8f40dcf0c7af69c979eb53195150f619fb6e Mon Sep 17 00:00:00 2001 From: Shlee Date: Sat, 14 May 2022 18:30:01 +0930 Subject: [PATCH 02/13] Update StatusTransformer.php --- app/Transformer/Api/Mastodon/v1/StatusTransformer.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Transformer/Api/Mastodon/v1/StatusTransformer.php b/app/Transformer/Api/Mastodon/v1/StatusTransformer.php index a9196249c..3467654af 100644 --- a/app/Transformer/Api/Mastodon/v1/StatusTransformer.php +++ b/app/Transformer/Api/Mastodon/v1/StatusTransformer.php @@ -38,7 +38,6 @@ class StatusTransformer extends Fractal\TransformerAbstract 'website' => null ], 'mentions' => [], - 'tags' => [], 'emojis' => [], 'card' => null, 'poll' => null, From d36e472646737d887fdb8e877f9ce34af26a8f27 Mon Sep 17 00:00:00 2001 From: Shlee Date: Sat, 14 May 2022 18:35:26 +0930 Subject: [PATCH 03/13] Update Installer.php --- app/Console/Commands/Installer.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Console/Commands/Installer.php b/app/Console/Commands/Installer.php index c0efc633c..d4839dfc1 100644 --- a/app/Console/Commands/Installer.php +++ b/app/Console/Commands/Installer.php @@ -97,7 +97,6 @@ class Installer extends Command if(extension_loaded($ext) == false) { $this->error("- {$ext} extension not found, aborting installation"); exit; - } else { } } $this->info("- Required PHP extensions found!"); From 05371b3c2fdb71f3490f1301443b1967d3a9ac39 Mon Sep 17 00:00:00 2001 From: Shlee Date: Sat, 14 May 2022 18:41:29 +0930 Subject: [PATCH 04/13] Update home.blade.php --- resources/views/admin/diagnostics/home.blade.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/resources/views/admin/diagnostics/home.blade.php b/resources/views/admin/diagnostics/home.blade.php index c55645e7b..ca605a61f 100644 --- a/resources/views/admin/diagnostics/home.blade.php +++ b/resources/views/admin/diagnostics/home.blade.php @@ -184,6 +184,11 @@ Storage Filesystems default (local/s3/spaces): {{ config_cache('filesystems.default')}} +
  • + Network TrustedProxy: + {{ config('trustedproxy.proxies') }} +
    • +
    From a47deef76f4619f71f9884191069c841d8c182c3 Mon Sep 17 00:00:00 2001 From: Shlee Date: Sat, 14 May 2022 18:42:49 +0930 Subject: [PATCH 05/13] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb7ca5aa2..69d4e19b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Add storage flags to admin dashboard diagnostics ([#3444](https://github.com/pixelfed/pixelfed/pull/3444)) - Hardcode UTC application timezone to prevent timezone issues ([b0d2c5e1](https://github.com/pixelfed/pixelfed/commit/b0d2c5e1)) - Remove arbitrary metro url redirect timeout ([84209c24](https://github.com/pixelfed/pixelfed/commit/84209c24)) +- Add trusted proxies flag to admin dashboard diagnostics ([#3450](https://github.com/pixelfed/pixelfed/pull/3450)) ## [v0.11.3 (2022-05-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.2...v0.11.3) From d0c44757e7c295c157ad076c731b00ffbb74243d Mon Sep 17 00:00:00 2001 From: Shlee Date: Sat, 14 May 2022 19:27:04 +0930 Subject: [PATCH 06/13] Update AdminController.php --- app/Http/Controllers/AdminController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index d83088737..8cacd6fb6 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -120,7 +120,7 @@ class AdminController extends Controller public function appsHome(Request $request) { $filter = $request->input('filter'); - if(in_array($filter, ['revoked'])) { + if($filter == 'revoked') { $apps = OauthClient::with('user') ->whereNotNull('user_id') ->whereRevoked(true) From b5ea4c9ba5da846907cacae745c054e0a2f4f635 Mon Sep 17 00:00:00 2001 From: Shlee Date: Sat, 14 May 2022 19:29:00 +0930 Subject: [PATCH 07/13] mismatched tags --- resources/views/settings/email.blade.php | 2 +- resources/views/settings/password.blade.php | 2 +- resources/views/settings/template.blade.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/settings/email.blade.php b/resources/views/settings/email.blade.php index 602eb9579..7286896b1 100644 --- a/resources/views/settings/email.blade.php +++ b/resources/views/settings/email.blade.php @@ -9,7 +9,7 @@ @if ($errors->any())
    @foreach($errors->all() as $error) -

    {{ $error }} +

    {{ $error }}

    @endforeach
    @endif diff --git a/resources/views/settings/password.blade.php b/resources/views/settings/password.blade.php index 52782f102..395cbc2a5 100644 --- a/resources/views/settings/password.blade.php +++ b/resources/views/settings/password.blade.php @@ -9,7 +9,7 @@ @if ($errors->any())
    @foreach($errors->all() as $error) -

    {{ $error }} +

    {{ $error }}

    @endforeach
    @endif diff --git a/resources/views/settings/template.blade.php b/resources/views/settings/template.blade.php index 59cd3f8d5..ac5e98885 100644 --- a/resources/views/settings/template.blade.php +++ b/resources/views/settings/template.blade.php @@ -9,7 +9,7 @@ @if ($errors->any())
    @foreach($errors->all() as $error) -

    {{ $error }} +

    {{ $error }}

    @endforeach
    @endif From db664e103eba420fa554e9141c0bbf56008ed3b3 Mon Sep 17 00:00:00 2001 From: Shlee Date: Sat, 14 May 2022 19:35:18 +0930 Subject: [PATCH 08/13] removed dupes --- resources/assets/js/components/PostComponent.vue | 1 - resources/assets/js/components/RemotePost.vue | 1 - 2 files changed, 2 deletions(-) diff --git a/resources/assets/js/components/PostComponent.vue b/resources/assets/js/components/PostComponent.vue index 0378a2213..7d0c5a92a 100644 --- a/resources/assets/js/components/PostComponent.vue +++ b/resources/assets/js/components/PostComponent.vue @@ -735,7 +735,6 @@ export default { layout: this.profileLayout, showProfileMorePosts: false, profileMorePosts: [], - replySending: false, reactionBarLoading: true, tributeSettings: { collection: [ diff --git a/resources/assets/js/components/RemotePost.vue b/resources/assets/js/components/RemotePost.vue index 29e855a5a..87c516147 100644 --- a/resources/assets/js/components/RemotePost.vue +++ b/resources/assets/js/components/RemotePost.vue @@ -614,7 +614,6 @@ export default { layout: this.profileLayout, showProfileMorePosts: false, profileMorePosts: [], - replySending: false, reactionBarLoading: true, profileUrl: null, currentLayout: 'status' From d26cd331996294150e84dfde0e4e8aa44139781c Mon Sep 17 00:00:00 2001 From: Shlee Date: Sat, 14 May 2022 19:37:09 +0930 Subject: [PATCH 09/13] Update profile.php --- resources/lang/fi/profile.php | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/lang/fi/profile.php b/resources/lang/fi/profile.php index 96d98c98a..b04f9107c 100644 --- a/resources/lang/fi/profile.php +++ b/resources/lang/fi/profile.php @@ -4,6 +4,5 @@ return [ 'emptyTimeline' => 'Tällä käyttäjällä ei ole vielä päivityksiä!', 'emptyFollowers' => 'Tällä käyttäjällä ei ole vielä seuraajia!', 'emptyFollowing' => 'Tämä käyttäjä ei vielä seuraa ketään!', - 'savedWarning' => 'Only you can see what you\'ve saved', 'savedWarning' => 'Vain sinä voit nähdä, mitä olet tallentanut', ]; From d93addfb972bf39367cb94fc3fe4743ca2a55ef3 Mon Sep 17 00:00:00 2001 From: Shlee Date: Sat, 14 May 2022 19:38:55 +0930 Subject: [PATCH 10/13] Update PostMenu.vue --- resources/assets/js/components/PostMenu.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/js/components/PostMenu.vue b/resources/assets/js/components/PostMenu.vue index 55b7c3de0..6b4f72728 100644 --- a/resources/assets/js/components/PostMenu.vue +++ b/resources/assets/js/components/PostMenu.vue @@ -160,7 +160,7 @@ }); break; case 'suspend': - msg = 'Are you sure you want to suspend the account of ' + username + ' ?'; + let msg = 'Are you sure you want to suspend the account of ' + username + ' ?'; swal({ title: 'Confirm', text: msg, From 0053775bd456fbd14568919012c2d68248e51863 Mon Sep 17 00:00:00 2001 From: Shlee Date: Sat, 14 May 2022 19:43:28 +0930 Subject: [PATCH 11/13] Update Inbox.php --- app/Util/ActivityPub/Inbox.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Util/ActivityPub/Inbox.php b/app/Util/ActivityPub/Inbox.php index 25e3f186b..331fd52c1 100644 --- a/app/Util/ActivityPub/Inbox.php +++ b/app/Util/ActivityPub/Inbox.php @@ -667,6 +667,7 @@ class Inbox if($story) { StoryExpire::dispatch($story)->onQueue('story'); } + break; default: return; From a160b2339b9a966ab67f0251fe3d6a92eb141241 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 15 May 2022 21:25:18 -0600 Subject: [PATCH 12/13] Update exp config, enforce mastoapi compatibility by default --- config/exp.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/exp.php b/config/exp.php index 181c49f47..0c9f83706 100644 --- a/config/exp.php +++ b/config/exp.php @@ -32,6 +32,5 @@ return [ 'spa' => true, // Enforce Mastoapi Compatibility (alpha) - // Note: this may break 3rd party apps who use non-mastodon compliant fields - 'emc' => env('EXP_EMC', false), + 'emc' => env('EXP_EMC', true), ]; From 076ad539fb12bc1dd43f03996555fbfd83a91a17 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 15 May 2022 21:25:50 -0600 Subject: [PATCH 13/13] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6024b517..685572fea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Hardcode UTC application timezone to prevent timezone issues ([b0d2c5e1](https://github.com/pixelfed/pixelfed/commit/b0d2c5e1)) - Remove arbitrary metro url redirect timeout ([84209c24](https://github.com/pixelfed/pixelfed/commit/84209c24)) - Fix json-ld attributes, fixes #3423 ([95f902b1](https://github.com/pixelfed/pixelfed/commit/95f902b1)) +- Update exp config, enforce mastoapi compatibility by default ([a160b233](https://github.com/pixelfed/pixelfed/commit/a160b233)) ## [v0.11.3 (2022-05-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.2...v0.11.3)