fix: resolve 404 with deleted user sets and tickets (#3129)

RetroAchievements · Feb 1, 2025 · 0ece103 · 0ece103
1 parent e53035b
commit 0ece103
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 13 deletions.
diff --git a/app/Models/User.php b/app/Models/User.php
@@ -375,6 +375,14 @@ public function preferredLocale()
         return $this->locale;
     }
 
+    public function resolveSoftDeletableRouteBinding($value, $field = null)
+    {
+        return $this->where('display_name', $value)
+            ->orWhere('User', $value)
+            ->withTrashed()
+            ->firstOrFail();
+    }
+
     public function getRouteKey(): string
     {
         return !empty($this->display_name) ? $this->display_name : 'User';

diff --git a/resources/views/components/user/breadcrumbs.blade.php b/resources/views/components/user/breadcrumbs.blade.php
@@ -1,17 +1,21 @@
 @props([
-    'targetDisplayName' => '',
+    'currentPage' => '',
     'parentPage' => '',
     'parentPageUrl' => '',
-    'currentPage' => '',
+    'user' => null, // ?User
 ])
 
 <div class='navpath'>
     <a href='/userList.php'>All Users</a>
     &raquo;
     @if (empty($currentPage))
-        <span class="font-bold"><a href="{{ route('user.show', $targetDisplayName) }}">{{ $targetDisplayName }}</a></span>
+        <span class="font-bold"><a href="{{ route('user.show', $user->display_name) }}">{{ $user->display_name }}</a></span>
     @else
-        <a href="{{ route('user.show', $targetDisplayName) }}">{{ $targetDisplayName }}</a>
+        @if ($user->Deleted)
+            <span class="line-through">{{ $user->display_name }}</span>
+        @else
+            <a href="{{ route('user.show', $user->display_name) }}">{{ $user->display_name }}</a>
+        @endif
         &raquo;
         @if (!empty($parentPage))
             <a href="{!! $parentPageUrl !!}">{{ $parentPage }}</a>

diff --git a/resources/views/pages/user/[user]/developer/claims.blade.php b/resources/views/pages/user/[user]/developer/claims.blade.php
@@ -74,7 +74,7 @@
 ])
 
 <x-app-layout pageTitle="{{ $user->display_name }}'s Claims">
-    <x-user.breadcrumbs :targetDisplayName="$user->display_name" currentPage="Claims" />
+    <x-user.breadcrumbs :user="$user" currentPage="Claims" />
 
     <div class="mt-3 mb-6 w-full flex gap-x-3">
         {!! userAvatar($user, label: false, iconSize: 48, iconClass: 'rounded-sm') !!}

diff --git a/resources/views/pages/user/[user]/developer/sets.blade.php b/resources/views/pages/user/[user]/developer/sets.blade.php
@@ -6,6 +6,8 @@
 
 use function Laravel\Folio\{name, render, withTrashed};
 
+withTrashed();
+
 name('developer.sets');
 
 render(function (View $view, User $user, DeveloperSetsService $pageService) {
@@ -29,7 +31,7 @@
     pageTitle="{{ $user->display_name }} - Developed Sets"
     pageDescription="View achievement sets developed by {{ $user->display_name }} for various games on RetroAchievements"
 >
-    <x-user.breadcrumbs :targetDisplayName="$user->display_name" currentPage="Developed Sets" />
+    <x-user.breadcrumbs :user="$user" currentPage="Developed Sets" />
 
     <div class="mt-3 -mb-3 w-full flex gap-x-3">
         {!! userAvatar($user, label: false, iconSize: 48, iconClass: 'rounded-sm') !!}

diff --git a/resources/views/pages/user/[user]/game/[game]/compare.blade.php b/resources/views/pages/user/[user]/game/[game]/compare.blade.php
@@ -34,7 +34,7 @@
     pageDescription="Compares unlocks between {{ $user->display_name }} and {{ $otherUser->display_name }} for {{ $game->Title }}"
 >
     <x-user.breadcrumbs
-        :targetDisplayName="$otherUser->display_name"
+        :user="$otherUser"
         :parentPage="$game->Title"
         :parentPageUrl="$game->permalink"
         currentPage="Compare Unlocks"

diff --git a/resources/views/pages/user/[user]/progress.blade.php b/resources/views/pages/user/[user]/progress.blade.php
@@ -40,7 +40,7 @@
     :pageDescription="$seo['pageDescription']"
 >
     <div>
-        <x-user.breadcrumbs :targetDisplayName="$user->display_name" currentPage="Completion Progress" />
+        <x-user.breadcrumbs :user="$user" currentPage="Completion Progress" />
 
         <div class="mt-3 -mb-3 w-full flex gap-x-3">
             {!! userAvatar($targetUsername, label: false, iconSize: 48, iconClass: 'rounded-sm') !!}

diff --git a/resources/views/pages/user/[user]/tickets/created.blade.php b/resources/views/pages/user/[user]/tickets/created.blade.php
@@ -49,7 +49,7 @@
 
 <x-app-layout pageTitle="{{ $pageTitle }} - {{ $user->display_name }}">
     <x-user.breadcrumbs
-        :targetDisplayName="$user->display_name"
+        :user="$user"
         :currentPage="$pageTitle"
     />
 

diff --git a/resources/views/pages/user/[user]/tickets/feedback.blade.php b/resources/views/pages/user/[user]/tickets/feedback.blade.php
@@ -42,7 +42,7 @@
 
 <x-app-layout pageTitle="{{ $pageTitle }} - {{ $user->display_name }}">
     <x-user.breadcrumbs
-        :targetDisplayName="$user->display_name"
+        :user="$user"
         :currentPage="$pageTitle"
     />
 

diff --git a/resources/views/pages/user/[user]/tickets/index.blade.php b/resources/views/pages/user/[user]/tickets/index.blade.php
@@ -5,7 +5,9 @@
 use App\Platform\Services\TicketListService;
 use Illuminate\View\View;
 
-use function Laravel\Folio\{middleware, name, render};
+use function Laravel\Folio\{middleware, name, render, withTrashed};
+
+withTrashed();
 
 middleware(['auth', 'can:viewAny,' . App\Models\Ticket::class]);
 name('developer.tickets');
@@ -43,7 +45,7 @@
 
 <x-app-layout pageTitle="Tickets - {{ $user->display_name }}">
     <x-user.breadcrumbs
-        :targetDisplayName="$user->display_name"
+        :user="$user"
         currentPage="Tickets"
     />
 

diff --git a/resources/views/pages/user/[user]/tickets/resolved.blade.php b/resources/views/pages/user/[user]/tickets/resolved.blade.php
@@ -52,7 +52,7 @@
 
 <x-app-layout pageTitle="{{ $pageTitle }} - {{ $user->display_name }}">
     <x-user.breadcrumbs
-        :targetDisplayName="$user->display_name"
+        :user="$user"
         :currentPage="$pageTitle"
     />