From 41089fcccdeba7662a1a55ac7a40c6e5d1c74317 Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 20 Apr 2026 18:46:19 +0930 Subject: [PATCH 1/3] Remove COVID label feature flag and related code Remove ENABLE_COVID_LABEL, COVID_LABEL_URL, and COVID_LABEL_ORG env vars and all associated backend/frontend code: - config/instance.php: remove label.covid config block - StatusLabelService: remove keyword matching, return static false - Site/Config.php: remove label.covid from API response - StatusCard.vue: remove COVID banner and labelRedirect method - GroupStatus.vue: remove COVID banner and labelRedirect method - diagnostics blade: remove COVID diagnostic rows --- app/Services/StatusLabelService.php | 24 +++---------------- app/Util/Site/Config.php | 7 ------ config/instance.php | 8 ------- .../groups/partials/GroupStatus.vue | 17 ------------- .../js/components/partials/StatusCard.vue | 17 ------------- .../views/admin/diagnostics/home.blade.php | 15 ------------ 6 files changed, 3 insertions(+), 85 deletions(-) diff --git a/app/Services/StatusLabelService.php b/app/Services/StatusLabelService.php index 1e1ca4725..5c2aab954 100644 --- a/app/Services/StatusLabelService.php +++ b/app/Services/StatusLabelService.php @@ -3,31 +3,13 @@ namespace App\Services; use App\Status; -use Illuminate\Support\Facades\Cache; -use Illuminate\Support\Str; class StatusLabelService { - const CACHE_KEY = 'pf:services:status_label:_v0:'; - public static function get(Status $status) { - if (config('instance.label.covid.enabled') == false || ! $status) { - return [ - 'covid' => false, - ]; - } - - return Cache::remember(self::CACHE_KEY.$status->id, now()->addDays(7), function () use ($status) { - if (! $status->caption) { - return [ - 'covid' => false, - ]; - } - - return [ - 'covid' => Str::of(strtolower($status->caption))->contains(['covid', 'corona', 'coronavirus', 'vaccine', 'vaxx', 'vaccination', 'plandemic']), - ]; - }); + return [ + 'covid' => false, + ]; } } diff --git a/app/Util/Site/Config.php b/app/Util/Site/Config.php index f266793c1..c2a915db0 100644 --- a/app/Util/Site/Config.php +++ b/app/Util/Site/Config.php @@ -92,13 +92,6 @@ class Config 'mastodon' => false, 'pixelfed' => false, ], - 'label' => [ - 'covid' => [ - 'enabled' => (bool) config('instance.label.covid.enabled'), - 'org' => config('instance.label.covid.org'), - 'url' => config('instance.label.covid.url'), - ], - ], 'hls' => $hls, 'groups' => (bool) config('groups.enabled'), ], diff --git a/config/instance.php b/config/instance.php index 1719c5145..5066f4cca 100644 --- a/config/instance.php +++ b/config/instance.php @@ -83,14 +83,6 @@ return [ ], ], - 'label' => [ - 'covid' => [ - 'enabled' => env('ENABLE_COVID_LABEL', true), - 'url' => env('COVID_LABEL_URL', 'https://www.who.int/emergencies/diseases/novel-coronavirus-2019/advice-for-public'), - 'org' => env('COVID_LABEL_ORG', 'visit the WHO website'), - ], - ], - 'enable_cc' => env('ENABLE_CONFIG_CACHE', true), 'has_legal_notice' => env('INSTANCE_LEGAL_NOTICE', false), diff --git a/resources/assets/components/groups/partials/GroupStatus.vue b/resources/assets/components/groups/partials/GroupStatus.vue index fe61c892e..7c8dc1e0c 100644 --- a/resources/assets/components/groups/partials/GroupStatus.vue +++ b/resources/assets/components/groups/partials/GroupStatus.vue @@ -225,18 +225,6 @@ -
-

- - - For information about COVID-19, {{config.features.label.covid.org}} - - - - -

-
-

@@ -708,11 +696,6 @@ window.location.href = status.media_attachments[0].url; }, - labelRedirect(type) { - let url = '/i/redirect?url=' + encodeURI(this.config.features.label.covid.url); - window.location.href = url; - }, - likeStatus(status, event) { event.currentTarget.blur(); let count = status.favourites_count; diff --git a/resources/assets/js/components/partials/StatusCard.vue b/resources/assets/js/components/partials/StatusCard.vue index 1efa6e2eb..7ff42d1af 100644 --- a/resources/assets/js/components/partials/StatusCard.vue +++ b/resources/assets/js/components/partials/StatusCard.vue @@ -109,18 +109,6 @@
-
-

- - - For information about COVID-19, {{config.features.label.covid.org}} - - - - -

-
-

@@ -311,11 +299,6 @@ window.location.href = status.media_attachments[0].url; }, - labelRedirect(type) { - let url = '/i/redirect?url=' + encodeURI(this.config.features.label.covid.url); - window.location.href = url; - }, - likeStatus(status, event) { if($('body').hasClass('loggedIn') == false) { return; diff --git a/resources/views/admin/diagnostics/home.blade.php b/resources/views/admin/diagnostics/home.blade.php index 0bc6cc07a..a93a3fa94 100644 --- a/resources/views/admin/diagnostics/home.blade.php +++ b/resources/views/admin/diagnostics/home.blade.php @@ -604,21 +604,6 @@ OAUTH_PAT_ID "{{config_cache('instance.oauth.pat.id')}}" - - INSTANCE - ENABLE_COVID_LABEL - {{config_cache('instance.label.covid.enabled') ? '✅ true' : '❌ false' }} - - - INSTANCE - COVID_LABEL_URL - "{{config_cache('instance.label.covid.url')}}" - - - INSTANCE - COVID_LABEL_ORG - "{{config_cache('instance.label.covid.org')}}" - INSTANCE ENABLE_CONFIG_CACHE From ace2b962af94de94241cc7e78269e026dd934d6a Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 20 Apr 2026 18:47:03 +0930 Subject: [PATCH 2/3] Remove StatusLabelService entirely Inline the static label value directly in StatusTransformer and StatusStatelessTransformer, then delete the now-unused service class. --- app/Services/StatusLabelService.php | 15 --------------- .../Api/StatusStatelessTransformer.php | 3 +-- app/Transformer/Api/StatusTransformer.php | 3 +-- 3 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 app/Services/StatusLabelService.php diff --git a/app/Services/StatusLabelService.php b/app/Services/StatusLabelService.php deleted file mode 100644 index 5c2aab954..000000000 --- a/app/Services/StatusLabelService.php +++ /dev/null @@ -1,15 +0,0 @@ - false, - ]; - } -} diff --git a/app/Transformer/Api/StatusStatelessTransformer.php b/app/Transformer/Api/StatusStatelessTransformer.php index 014466836..8cbbbf520 100644 --- a/app/Transformer/Api/StatusStatelessTransformer.php +++ b/app/Transformer/Api/StatusStatelessTransformer.php @@ -10,7 +10,6 @@ use App\Services\MediaService; use App\Services\MediaTagService; use App\Services\PollService; use App\Services\StatusHashtagService; -use App\Services\StatusLabelService; use App\Services\StatusMentionService; use App\Services\StatusService; use App\Status; @@ -62,7 +61,7 @@ class StatusStatelessTransformer extends Fractal\TransformerAbstract 'place' => $status->place, 'local' => (bool) $status->local, 'taggedPeople' => $taggedPeople, - 'label' => StatusLabelService::get($status), + 'label' => ['covid' => false], 'liked_by' => LikeService::likedBy($status), 'media_attachments' => MediaService::get($status->id), 'account' => AccountService::get($status->profile_id, true), diff --git a/app/Transformer/Api/StatusTransformer.php b/app/Transformer/Api/StatusTransformer.php index 4c8520628..a707b426c 100644 --- a/app/Transformer/Api/StatusTransformer.php +++ b/app/Transformer/Api/StatusTransformer.php @@ -11,7 +11,6 @@ use App\Services\MediaTagService; use App\Services\PollService; use App\Services\ProfileService; use App\Services\StatusHashtagService; -use App\Services\StatusLabelService; use App\Services\StatusMentionService; use App\Services\StatusService; use App\Status; @@ -63,7 +62,7 @@ class StatusTransformer extends Fractal\TransformerAbstract 'place' => $status->place, 'local' => (bool) $status->local, 'taggedPeople' => $taggedPeople, - 'label' => StatusLabelService::get($status), + 'label' => ['covid' => false], 'liked_by' => LikeService::likedBy($status), 'media_attachments' => MediaService::get($status->id), 'account' => ProfileService::get($status->profile_id, true), From 6f643e02df93b8a1d9045d85c035ff43c443fa60 Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 20 Apr 2026 18:49:46 +0930 Subject: [PATCH 3/3] Remove dead label field from status API response The label key was only used for COVID labels which are now removed. Drop it from both transformers and the StatusService unset list. --- app/Services/StatusService.php | 1 - app/Transformer/Api/StatusStatelessTransformer.php | 1 - app/Transformer/Api/StatusTransformer.php | 1 - 3 files changed, 3 deletions(-) diff --git a/app/Services/StatusService.php b/app/Services/StatusService.php index 014c76aba..807ca7f0d 100644 --- a/app/Services/StatusService.php +++ b/app/Services/StatusService.php @@ -73,7 +73,6 @@ class StatusService $status['comments_disabled'], $status['content_text'], $status['gid'], - $status['label'], $status['liked_by'], $status['local'], $status['parent'], diff --git a/app/Transformer/Api/StatusStatelessTransformer.php b/app/Transformer/Api/StatusStatelessTransformer.php index 8cbbbf520..812b4d79d 100644 --- a/app/Transformer/Api/StatusStatelessTransformer.php +++ b/app/Transformer/Api/StatusStatelessTransformer.php @@ -61,7 +61,6 @@ class StatusStatelessTransformer extends Fractal\TransformerAbstract 'place' => $status->place, 'local' => (bool) $status->local, 'taggedPeople' => $taggedPeople, - 'label' => ['covid' => false], 'liked_by' => LikeService::likedBy($status), 'media_attachments' => MediaService::get($status->id), 'account' => AccountService::get($status->profile_id, true), diff --git a/app/Transformer/Api/StatusTransformer.php b/app/Transformer/Api/StatusTransformer.php index a707b426c..7d58d6c40 100644 --- a/app/Transformer/Api/StatusTransformer.php +++ b/app/Transformer/Api/StatusTransformer.php @@ -62,7 +62,6 @@ class StatusTransformer extends Fractal\TransformerAbstract 'place' => $status->place, 'local' => (bool) $status->local, 'taggedPeople' => $taggedPeople, - 'label' => ['covid' => false], 'liked_by' => LikeService::likedBy($status), 'media_attachments' => MediaService::get($status->id), 'account' => ProfileService::get($status->profile_id, true),