update

app/Http/Controllers/Web/GalleryController.php

@@ -4,51 +4,23 @@ namespace App\Http\Controllers\Web;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
-use App\Models\Artwork;
 use App\Models\User;
-use Illuminate\Support\Facades\Schema;
+use App\Support\UsernamePolicy;
 
 class GalleryController extends Controller
 {
     public function show(Request $request, $userId, $username = null)
     {
-        $user = User::find((int)$userId);
+        $user = User::find((int) $userId);
         if (! $user) {
             abort(404);
         }
 
-        // canonicalize username in URL when possible
-        try {
-            $correctName = $user->name ?? $user->uname ?? null;
-            if ($username && $correctName && $username !== $correctName) {
-                $qs = $request->getQueryString();
-                $url = route('legacy.gallery', ['id' => $user->id, 'username' => $correctName]);
-                if ($qs) $url .= '?' . $qs;
-                return redirect($url, 301);
-            }
-        } catch (\Throwable $e) {
-            // ignore
+        $usernameSlug = UsernamePolicy::normalize((string) ($user->username ?? $user->name ?? ''));
+        if ($usernameSlug === '') {
+            abort(404);
         }
 
-        $page = max(1, (int) $request->query('page', 1));
-        $hits = 20;
-
-        $query = Artwork::where('user_id', $user->id)
-            ->approved()
-            ->published()
-            ->public()
-            ->orderByDesc('published_at');
-
-        $total = (int) $query->count();
-
-        $artworks = $query->skip(($page - 1) * $hits)->take($hits)->get();
-
-        return view('web.gallery', [
-            'user' => $user,
-            'artworks' => $artworks,
-            'page' => $page,
-            'hits' => $hits,
-            'total' => $total,
-        ]);
+        return redirect()->route('profile.gallery', ['username' => $usernameSlug], 301);
     }
 }