hide future event achievement selection

RetroAchievements · Jan 20, 2025 · 0a9ba96 · 0a9ba96
1 parent 7790651
commit 0a9ba96
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 11 deletions.
diff --git a/resources/views/components/game/achievements-list/achievements-list-item.blade.php b/resources/views/components/game/achievements-list/achievements-list-item.blade.php
@@ -26,15 +26,6 @@
 $imgClass = $isUnlockedOnHardcore ? 'goldimagebig' : 'badgeimg';
 $imgClass .= ' w-[54px] h-[54px] sm:w-16 sm:h-16';
 
-$renderedAchievementAvatar = achievementAvatar(
-    $achievement,
-    label: false,
-    icon: $achBadgeName,
-    iconSize: 64,
-    iconClass: $imgClass,
-    tooltip: false
-);
-
 $unlockDate = '';
 if (isset($achievement['DateEarned'])) {
     $unlockDate = Carbon::parse($achievement['DateEarned'])->format('F j Y, g:ia');
@@ -53,8 +44,23 @@
         if ($activeUntil > Carbon::now()) {
             $isActive = true;
         }
+    } elseif ($achievement['SourceAchievementId']) {
+        // future event has been picked. don't show it until it's active
+        $achBadgeName = '00000';
+        $achievement['Title'] = '?????';
+        $achievement['Description'] = '?????';
+        $achievement['SourceGameId'] = null;
     }
 }
+
+$renderedAchievementAvatar = achievementAvatar(
+    $achievement,
+    label: false,
+    icon: $achBadgeName,
+    iconSize: 64,
+    iconClass: $imgClass,
+    tooltip: false
+);
 ?>
 
 <li class="flex gap-x-3 odd:bg-[rgba(50,50,50,0.4)] light:odd:bg-neutral-200  px-2 py-3 md:py-1 w-full {{ $isUnlocked ? 'unlocked-row' : '' }} {{ $achievement['type'] === 'missable' ? 'missable-row' : '' }} {{ $isActive ? 'active-row' : '' }}">

diff --git a/resources/views/pages-legacy/achievementInfo.blade.php b/resources/views/pages-legacy/achievementInfo.blade.php
@@ -15,6 +15,7 @@
 use App\Platform\Enums\AchievementType;
 use App\Platform\Services\TriggerDecoderService;
 use App\Support\Shortcode\Shortcode;
+use Carbon\Carbon;
 use Illuminate\Support\Facades\Blade;
 
 authenticateFromCookie($user, $permissions, $userDetails);
@@ -132,9 +133,18 @@
     $eventAchievement = EventAchievement::where('achievement_id', '=', $achievementID)
         ->with('sourceAchievement')->first();
 
-    // update the ID of the dataOut so the link goes to the source achievement
     if ($eventAchievement?->sourceAchievement) {
-        $dataOut['ID'] = $eventAchievement->sourceAchievement->ID;
+        if ($eventAchievement->active_from > Carbon::now()) {
+            // future event has been picked. don't show it until it's active
+            $eventAchievement = null;
+            $badgeName = $dataOut['BadgeName'] = '00000';
+            $achievementTitleRaw = $achievementTitle = $dataOut['Title'] = '?????';
+            $achievementDescriptionRaw = $dataOut['Description'] = '?????';
+            $dataOut['SourceGameId'] = null;
+        } else {
+            // update the ID of the dataOut so the link goes to the source achievement
+            $dataOut['ID'] = $eventAchievement->sourceAchievement->ID;
+        }
     }
 }