chore: remove FEATURE_BEAT flag (#2059)

RetroAchievements · Nov 28, 2023 · d6e6e7f · d6e6e7f
1 parent d74d235
commit d6e6e7f
Show file tree

Hide file tree

Showing 18 changed files with 63 additions and 107 deletions.
diff --git a/.env.example b/.env.example
@@ -15,7 +15,7 @@ FORWARD_PHPMYADMIN_PORT=64080
 
 # Feature Flags
 
-FEATURE_BEAT=true
+#FEATURE_EXAMPLE=true
 
 # Application
 

diff --git a/.env.testing b/.env.testing
@@ -10,5 +10,4 @@ SCOUT_DRIVER=null
 SESSION_DRIVER=array
 TELESCOPE_ENABLED=false
 DEBUGBAR_ENABLED=false
-CSP_ENABLED=false
-FEATURE_BEAT=true
+CSP_ENABLED=false
diff --git a/app/Helpers/render/game.php b/app/Helpers/render/game.php
@@ -184,7 +184,7 @@ function RenderGameSort(
         // }
         echo "<a href='/game/$gameID?$flagParam&s=$sort4'>Points$mark4</a> - ";
         echo "<a href='/game/$gameID?$flagParam&s=$sort5'>Title$mark5</a>";
-        if (config('feature.beat') && $canSortByType) {
+        if ($canSortByType) {
             echo " - ";
             echo "<a href='/game/$gameID?$flagParam&s=$sort6'>Type$mark6</a>";
         }

diff --git a/app/Helpers/render/user.php b/app/Helpers/render/user.php
@@ -96,9 +96,7 @@ function RenderCompletedGamesList(
         </label>
     HTML;
 
-    if (config('feature.beat')) {
-        echo "<a href='" . route('user.completion-progress', $username) . "'>more...</a>";
-    }
+    echo "<a href='" . route('user.completion-progress', $username) . "'>more...</a>";
     echo "</div>";
 
     echo "<div id='usercompletedgamescomponent'>";

diff --git a/app/Platform/Components/GameCard.php b/app/Platform/Components/GameCard.php
@@ -243,10 +243,7 @@ private function buildCardUserProgressionData(array $userGameProgressionAwards,
         $highestProgressionStatus = null;
         $highestProgressionAwardDate = null;
 
-        $progressionTypes = ['completed', 'mastered'];
-        if (config('feature.beat')) {
-            $progressionTypes = ['beaten-softcore', 'beaten-hardcore', 'completed', 'mastered'];
-        }
+        $progressionTypes = ['beaten-softcore', 'beaten-hardcore', 'completed', 'mastered'];
 
         foreach ($progressionTypes as $progressionType) {
             if (isset($userGameProgressionAwards[$progressionType])) {

diff --git a/app/Platform/Controllers/BeatenGamesLeaderboardController.php b/app/Platform/Controllers/BeatenGamesLeaderboardController.php
@@ -22,10 +22,6 @@ class BeatenGamesLeaderboardController extends Controller
 
     public function __invoke(Request $request): View
     {
-        if (!config('feature.beat')) {
-            abort(404);
-        }
-
         $validatedData = $request->validate([
             'page.number' => 'sometimes|integer|min:1',
             'filter.system' => 'sometimes|integer',

diff --git a/app/Platform/Controllers/PlayerCompletionProgressController.php b/app/Platform/Controllers/PlayerCompletionProgressController.php
@@ -22,10 +22,6 @@ public function __construct(protected PlayerProgressionService $playerProgressio
 
     public function __invoke(Request $request): View
     {
-        if (!config('feature.beat')) {
-            abort(404);
-        }
-
         $targetUsername = $request->route()->parameters['user'];
         $validatedData = $request->validate([
             'page.number' => 'sometimes|integer|min:1',

diff --git a/config/envy.php b/config/envy.php
@@ -80,7 +80,7 @@
         'REDIS_CACHE_DB',
         'MYSQL_ATTR_SSL_CA',
         // config/feature.php
-        'FEATURE_BEAT',
+        //
         // config/filesystem.php
         'AWS_ENDPOINT',
         'AWS_URL',

diff --git a/config/feature.php b/config/feature.php
@@ -1,10 +1,7 @@
 <?php
 
 return [
-
-    /*
-     * If true, player-facing beaten games UI/UX is enabled.
-     */
-    'beat' => env('FEATURE_BEAT', false),
-
+/**
+ * 'example' => env('FEATURE_EXAMPLE', false),
+ */
 ];
diff --git a/public/gameInfo.php b/public/gameInfo.php
@@ -833,7 +833,7 @@ function () {
         ', [
             'beatenGameCreditDialogContext' => $beatenGameCreditDialogContext,
             'gameId' => $gameID,
-            'isBeatable' => $isGameBeatable && config('feature.beat') === true,
+            'isBeatable' => $isGameBeatable,
             'isBeatenHardcore' => $isBeatenHardcore,
             'isBeatenSoftcore' => $isBeatenSoftcore,
             'isCompleted' => !is_null($userGameProgressionAwards['completed']),

diff --git a/public/userInfo.php b/public/userInfo.php
@@ -485,8 +485,7 @@ function resize() {
     }
 
     $canShowProgressionStatusComponent =
-        config('feature.beat')
-        && !empty($userCompletedGamesList)
+        !empty($userCompletedGamesList)
         // Needs at least one non-event game.
         && count(array_filter($userCompletedGamesList, fn ($game) => $game['ConsoleID'] != 101)) > 0;
 

diff --git a/resources/views/community/components/global-statistics/global-statistics.blade.php b/resources/views/community/components/global-statistics/global-statistics.blade.php
@@ -6,10 +6,8 @@
             <div class="grid grid-cols-2 gap-px mb-2">
                 <x-global-statistics.stat-embed label="Games" :count="$numGames" href="{{ route('game.index', ['s' => 1]) }}" />
                 <x-global-statistics.stat-embed label="Achievements" :count="$numAchievements" href="/achievementList.php" />
-                @hasfeature("beat")
-                    <x-global-statistics.stat-embed label="Games Mastered" :count="$numHardcoreMasteryAwards" href="/recentMastery.php?t=1&m=1" />
-                    <x-global-statistics.stat-embed label="Games Beaten" :count="$numHardcoreGameBeatenAwards" href="/recentMastery.php?t=8&m=1" />
-                @endhasfeature
+                <x-global-statistics.stat-embed label="Games Mastered" :count="$numHardcoreMasteryAwards" href="/recentMastery.php?t=1&m=1" />
+                <x-global-statistics.stat-embed label="Games Beaten" :count="$numHardcoreGameBeatenAwards" href="/recentMastery.php?t=8&m=1" />
                 <x-global-statistics.stat-embed label="Registered Players" :count="$numRegisteredPlayers" href="/userList.php" />
                 <x-global-statistics.stat-embed label="Achievement Unlocks" :count="$numAwarded" href="/recentMastery.php" />
             </div>
@@ -31,14 +29,12 @@
             :timestamp="$lastMasteredTimeAgo"
         />
 
-        @hasfeature("beat")
-            <x-global-statistics.recent-game-progress
-                headingLabel="Most recent game beaten"
-                :game="$lastBeatenGame"
-                :userId="$lastBeatenUserId"
-                :timestamp="$lastBeatenTimeAgo"
-            />
-        @endhasfeature
+        <x-global-statistics.recent-game-progress
+            headingLabel="Most recent game beaten"
+            :game="$lastBeatenGame"
+            :userId="$lastBeatenUserId"
+            :timestamp="$lastBeatenTimeAgo"
+        />
     </div>
 
     @if ($lastRegisteredUser)

diff --git a/resources/views/components/feature-flags.blade.php b/resources/views/components/feature-flags.blade.php
@@ -19,15 +19,6 @@ function handleToggleCookie(cookieName) {
 }
 </script>
 
-<div class="flex justify-between">
-    <p>Beaten Games Player-facing UX</p>
-    @hasfeature("beat")
-        Enabled
-    @else
-        Disabled
-    @endhasfeature
-</div>
-
 {{-- EXAMPLE
 <div class="flex justify-between">
     <p>Aggregate Queries</p>

diff --git a/resources/views/components/menu/account.blade.php b/resources/views/components/menu/account.blade.php
@@ -51,10 +51,7 @@
         </x-slot>
         <x-dropdown-header>{{ $user->username }}</x-dropdown-header>
         <x-dropdown-item :link="route('user.show', $user)">{{ __res('profile', 1) }}</x-dropdown-item>
-
-        @hasfeature("beat")
-            <x-dropdown-item :link="route('user.completion-progress', $user)">Completion Progress</x-dropdown-item>
-        @endhasfeature
+        <x-dropdown-item :link="route('user.completion-progress', $user)">Completion Progress</x-dropdown-item>
 
         @if($user->Permissions >= Permissions::Registered)
             <x-dropdown-item :link="url('gameList.php?t=play')">Want to Play Games</x-dropdown-item>

diff --git a/resources/views/components/menu/main.blade.php b/resources/views/components/menu/main.blade.php
@@ -154,9 +154,7 @@
     <div class="dropdown-divider"></div>
     <x-dropdown-item :link="url('userList.php')">{{ __res('user') }}</x-dropdown-item>
     <x-dropdown-item :link="url('globalRanking.php')">Global Points Ranking</x-dropdown-item>
-    @hasfeature("beat")
-        <x-dropdown-item :link="route('ranking.beaten-games')">Global Beaten Games Ranking</x-dropdown-item>
-    @endhasfeature
+    <x-dropdown-item :link="route('ranking.beaten-games')">Global Beaten Games Ranking</x-dropdown-item>
     <x-dropdown-item :link="url('recentMastery.php')">Recent Game Awards</x-dropdown-item>
     <x-dropdown-item :link="url('developerstats.php')">Developer Stats</x-dropdown-item>
     <div class="dropdown-divider"></div>

diff --git a/resources/views/content/top-links.blade.php b/resources/views/content/top-links.blade.php
@@ -7,12 +7,10 @@
         <span class="text-yellow-400"><x-fas-trophy/></span>
         Global Points Ranking
     </a>
-    @hasfeature("beat")
-        <a class="btn text-center py-2" href="{{ route('ranking.beaten-games') }}">
-            <span class="text-yellow-400"><x-fas-medal/></span>
-            Global Beaten Games Ranking
-        </a>
-    @endhasfeature
+    <a class="btn text-center py-2" href="{{ route('ranking.beaten-games') }}">
+        <span class="text-yellow-400"><x-fas-medal/></span>
+        Global Beaten Games Ranking
+    </a>
     @if(config('services.discord.invite_id'))
         <a class="btn text-center py-2" href="https://discord.gg/{{ config('services.discord.invite_id') }}">
             <span class="text-discord"><x-fab-discord/></span>

diff --git a/resources/views/platform/components/game/achievements-list/achievements-list-item.blade.php b/resources/views/platform/components/game/achievements-list/achievements-list-item.blade.php
@@ -67,21 +67,19 @@
                     @endif
                 </div>
 
-                @hasfeature("beat")
-                    @if ($achievement['type'] && !$useMinimalLayout)
-                        <div class="flex items-center gap-x-1 md:hidden -mt-1.5">
-                            <div class="-mt-1.5">
-                                <x-game.achievements-list.type-indicator
-                                    :achievementType="$achievement['type']"
-                                    :progressionTypeValue="$progressionTypeValue"
-                                    :winConditionTypeValue="$winConditionTypeValue"
-                                    :beatenGameCreditDialogContext="$beatenGameCreditDialogContext"
-                                    :isCreditDialogEnabled="$isCreditDialogEnabled"
-                                />
-                            </div>
+                @if ($achievement['type'] && !$useMinimalLayout)
+                    <div class="flex items-center gap-x-1 md:hidden -mt-1.5">
+                        <div class="-mt-1.5">
+                            <x-game.achievements-list.type-indicator
+                                :achievementType="$achievement['type']"
+                                :progressionTypeValue="$progressionTypeValue"
+                                :winConditionTypeValue="$winConditionTypeValue"
+                                :beatenGameCreditDialogContext="$beatenGameCreditDialogContext"
+                                :isCreditDialogEnabled="$isCreditDialogEnabled"
+                            />
                         </div>
-                    @endif
-                @endhasfeature
+                    </div>
+                @endif
             </div>
 
             <p class="leading-4">
@@ -106,19 +104,17 @@
         </div>
 
         <div class="md:col-span-2 md:flex md:flex-col-reverse md:justify-end md:pt-1 md:gap-y-1">
-            @hasfeature("beat")
-                @if ($achievement['type'] && !$useMinimalLayout)
-                    <div class="hidden md:flex items-center justify-end gap-x-1">
-                        <x-game.achievements-list.type-indicator
-                            :achievementType="$achievement['type']"
-                            :progressionTypeValue="$progressionTypeValue"
-                            :winConditionTypeValue="$winConditionTypeValue"
-                            :beatenGameCreditDialogContext="$beatenGameCreditDialogContext"
-                            :isCreditDialogEnabled="$isCreditDialogEnabled"    
-                        />
-                    </div>
-                @endif
-            @endhasfeature
+            @if ($achievement['type'] && !$useMinimalLayout)
+                <div class="hidden md:flex items-center justify-end gap-x-1">
+                    <x-game.achievements-list.type-indicator
+                        :achievementType="$achievement['type']"
+                        :progressionTypeValue="$progressionTypeValue"
+                        :winConditionTypeValue="$winConditionTypeValue"
+                        :beatenGameCreditDialogContext="$beatenGameCreditDialogContext"
+                        :isCreditDialogEnabled="$isCreditDialogEnabled"    
+                    />
+                </div>
+            @endif
 
             @if (!$useMinimalLayout)
                 <x-game.achievements-list.list-item-global-progress

diff --git a/resources/views/platform/components/game/current-progress/big-status-label.blade.php b/resources/views/platform/components/game/current-progress/big-status-label.blade.php
@@ -51,21 +51,19 @@
 <div class="text-lg {{ $colorClassName }} mb-1.5 mt-0.5 flex items-center gap-x-1">
     <p>{{ $statusLabel }}</p>
 
-    @hasfeature('beat')
-        @if (!$isBeaten && $isBeatable)
-            <x-modal-trigger
-                modalTitleLabel="Beaten Game Credit"
-                resourceApiRoute="/request/game/beaten-credit.php"
-                :resourceId="$gameId"
-                :resourceContext="$beatenGameCreditDialogContext"
-            >
-                <x-slot name="trigger">
-                    <x-fas-info-circle
-                        aria-label="Learn about beaten game credit"
-                        class="{{ $colorClassName }} w-5 h-5 -mt-1"
-                    />
-                </x-slot>
-            </x-modal-trigger>
-        @endif
-    @endhasfeature
+    @if (!$isBeaten && $isBeatable)
+        <x-modal-trigger
+            modalTitleLabel="Beaten Game Credit"
+            resourceApiRoute="/request/game/beaten-credit.php"
+            :resourceId="$gameId"
+            :resourceContext="$beatenGameCreditDialogContext"
+        >
+            <x-slot name="trigger">
+                <x-fas-info-circle
+                    aria-label="Learn about beaten game credit"
+                    class="{{ $colorClassName }} w-5 h-5 -mt-1"
+                />
+            </x-slot>
+        </x-modal-trigger>
+    @endif
 </div>