update

app/Http/Controllers/User/FavouritesController.php

@@ -3,68 +3,25 @@
 namespace App\Http\Controllers\User;
 
 use App\Http\Controllers\Controller;
+use App\Models\User;
 use App\Services\UserStatsService;
+use App\Support\UsernamePolicy;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Str;
-use App\Models\ArtworkFavourite;
 
 class FavouritesController extends Controller
 {
     public function index(Request $request, $userId = null, $username = null)
     {
-        $userId = $userId ? (int) $userId : ($request->user()->id ?? null);
-
-        $page = max(1, (int) $request->query('page', 1));
-        $hits = 20;
-        $start = ($page - 1) * $hits;
-
-        $total = 0;
-        $results = collect();
-
-        try {
-            $query = ArtworkFavourite::with(['artwork.user'])
-                ->where('user_id', $userId)
-                ->orderByDesc('created_at')
-                ->orderByDesc('artwork_id');
-
-            $total = (int) $query->count();
-
-            $favorites = $query->skip($start)->take($hits)->get();
-
-            $results = $favorites->map(function ($fav) {
-                $art = $fav->artwork;
-                if (! $art) {
-                    return null;
-                }
-                $item = (object) $art->toArray();
-                $item->uname = $art->user?->username ?? $art->user?->name ?? null;
-                $item->datum = $fav->created_at;
-                return $item;
-            })->filter();
-        } catch (\Throwable $e) {
-            $total = 0;
-            $results = collect();
+        $user = $this->resolveLegacyFavouritesUser($request, $userId, $username);
+        if (! $user) {
+            abort(404);
         }
 
-        $results = collect($results)->filter()->values()->transform(function ($row) {
-            $row->name = $row->name ?? $row->title ?? '';
-            $row->slug = $row->slug ?? Str::slug($row->name);
-            $row->encoded = isset($row->id) ? app(\App\Helpers\Thumb::class)::encodeId((int) $row->id) : null;
-            return $row;
-        });
-
-        $displayName = $username ?: (DB::table('users')->where('id', $userId)->value('username') ?? '');
-        $page_title = $displayName . ' Favourites';
-
-        return view('user.favourites', [
-            'results' => $results,
-            'page_title' => $page_title,
-            'user_id' => $userId,
-            'page' => $page,
-            'hits' => $hits,
-            'total' => $total,
-        ]);
+        return redirect()->route('profile.show', [
+            'username' => strtolower((string) $user->username),
+            'tab' => 'favourites',
+        ], 301);
     }
 
     public function destroy(Request $request, $userId, $artworkId)
@@ -82,6 +39,31 @@ class FavouritesController extends Controller
             app(UserStatsService::class)->decrementFavoritesReceived($creatorId);
         }
 
-        return redirect()->route('legacy.favourites', ['id' => $userId])->with('status', 'Removed from favourites');
+        $username = strtolower((string) ($auth->username ?? DB::table('users')->where('id', (int) $userId)->value('username') ?? ''));
+
+        return redirect()->route('profile.show', [
+            'username' => $username,
+            'tab' => 'favourites',
+        ])->with('status', 'Removed from favourites');
+    }
+
+    private function resolveLegacyFavouritesUser(Request $request, mixed $userId, mixed $username): ?User
+    {
+        if (is_string($userId) && ! is_numeric($userId) && $username === null) {
+            $username = $userId;
+            $userId = null;
+        }
+
+        if (is_numeric($userId)) {
+            return User::query()->find((int) $userId);
+        }
+
+        if (is_string($username) && $username !== '') {
+            $normalized = UsernamePolicy::normalize($username);
+
+            return User::query()->whereRaw('LOWER(username) = ?', [$normalized])->first();
+        }
+
+        return $request->user();
     }
 }