From 41287914aa983d2231bf8820222e14e043bc6a49 Mon Sep 17 00:00:00 2001 From: Gregor Klevze Date: Tue, 17 Feb 2026 17:14:43 +0100 Subject: [PATCH] Upload beautify --- app/Console/Commands/AvatarsMigrate.php | 142 +- app/Http/Controllers/AvatarController.php | 47 - .../Controllers/Community/ChatController.php | 44 + .../Controllers/Community/ForumController.php | 38 + .../Community/InterviewController.php | 103 ++ .../Community/LatestCommentsController.php | 54 + .../Community/LatestController.php | 47 + .../Controllers/Community/NewsController.php | 44 + .../{ => Dashboard}/ManageController.php | 24 +- app/Http/Controllers/InterviewController.php | 103 ++ app/Http/Controllers/InterviewsController.php | 28 + .../Controllers/Legacy/AvatarController.php | 57 +- .../Controllers/Legacy/BuddiesController.php | 2 +- .../Legacy/LatestCommentsController.php | 3 +- .../Legacy/MyBuddiesController.php | 2 +- .../Controllers/Legacy/ProfileController.php | 3 +- .../Controllers/Legacy/UserController.php | 17 +- .../Controllers/Misc/AvatarController.php | 55 + .../Controllers/PhotographyController.php | 101 ++ .../Controllers/User/AvatarController.php | 59 + .../Controllers/User/BuddiesController.php | 37 + .../Controllers/User/FavouritesController.php | 143 ++ .../Controllers/User/MembersController.php | 49 + .../User/MonthlyCommentatorsController.php | 39 + .../Controllers/User/MyBuddiesController.php | 56 + .../{ => User}/ProfileController.php | 36 +- .../User/ReceivedCommentsController.php | 27 + .../Controllers/User/StatisticsController.php | 66 + .../User/TodayDownloadsController.php | 64 + .../User/TodayInHistoryController.php | 53 + .../Controllers/User/TopAuthorsController.php | 57 + .../User/TopFavouritesController.php | 56 + app/Http/Controllers/User/UserController.php | 27 + app/Http/Controllers/Web/ArtController.php | 61 + .../{ => Web}/BrowseCategoriesController.php | 6 +- .../{ => Web}/BrowseGalleryController.php | 7 +- .../Controllers/Web/CategoryController.php | 100 ++ .../Web/DailyUploadsController.php | 94 ++ .../Web/FeaturedArtworksController.php | 62 + .../Controllers/Web/GalleryController.php | 41 + app/Http/Controllers/Web/HomeController.php | 80 ++ app/Http/Requests/AvatarUploadRequest.php | 27 + .../Manage/ManageArtworkUpdateRequest.php | 2 +- app/Http/Requests/ProfileUpdateRequest.php | 2 +- app/Models/User.php | 6 + app/Models/UserProfile.php | 23 +- app/Providers/AppServiceProvider.php | 8 +- app/Services/AvatarService.php | 326 +++-- app/Support/AvatarUrl.php | 50 + avatar_patch.diff | 1185 +++++++++++++++++ composer.json | 6 +- composer.lock | 321 ++++- config/avatars.php | 7 + config/cdn.php | 1 + ..._000100_finalize_avatar_schema_for_cdn.php | 61 + ...120500_finalize_avatar_metadata_schema.php | 61 + docs/avatar-cdn-config-notes.md | 32 + package-lock.json | 64 + package.json | 7 +- playwright.config.ts | 19 + public/gfx/sb_logo.png | Bin 0 -> 14045 bytes public/gfx/sb_logo2.png | Bin 0 -> 10611 bytes public/gfx/sb_logo_white.png | Bin 0 -> 8904 bytes resources/js/app.js | 17 + .../js/components/profile/AvatarUploader.jsx | 198 +++ .../{legacy => community}/chat.blade.php | 2 +- resources/views/components/avatar.blade.php | 4 +- resources/views/layouts/_legacy.blade.php | 50 + resources/views/layouts/legacy.blade.php | 82 -- .../views/layouts/nova/toolbar.blade.php | 421 +++--- .../views/legacy/_artwork_card.blade.php | 117 +- resources/views/legacy/forum/posts.blade.php | 2 +- resources/views/legacy/interview.blade.php | 2 +- resources/views/legacy/interviews.blade.php | 2 +- .../views/legacy/latest-comments.blade.php | 2 +- .../legacy/monthly-commentators.blade.php | 2 +- resources/views/legacy/mybuddies.blade.php | 2 +- resources/views/legacy/news.blade.php | 2 +- resources/views/legacy/profile.blade.php | 2 +- .../views/legacy/received-comments.blade.php | 2 +- resources/views/legacy/toolbar.blade.php | 8 +- resources/views/legacy/top-authors.blade.php | 6 +- resources/views/manage/edit.blade.php | 6 +- resources/views/manage/index.blade.php | 6 +- resources/views/profile/edit.blade.php | 1 + .../update-profile-information-form.blade.php | 11 + .../{legacy => shared}/placeholder.blade.php | 0 .../views/{legacy => user}/buddies.blade.php | 4 +- .../{legacy => user}/favourites.blade.php | 2 +- resources/views/{legacy => web}/art.blade.php | 8 +- .../{legacy => web}/categories.blade.php | 2 +- .../views/{legacy => web}/category.blade.php | 2 +- .../{legacy => web}/daily-uploads.blade.php | 4 +- .../featured-artworks.blade.php | 4 +- .../views/{legacy => web}/gallery.blade.php | 4 +- resources/views/web/home.blade.php | 17 + resources/views/web/home/featured.blade.php | 47 + resources/views/web/home/news.blade.php | 80 ++ resources/views/web/home/uploads.blade.php | 14 + .../web/partials/_artwork_card.blade.php | 112 ++ .../partials/daily-uploads-grid.blade.php | 0 routes/legacy.php | 98 -- routes/web.php | 107 +- test-results/.last-run.json | 4 + tests/Feature/AvatarUploadTest.php | 49 + tests/e2e/home.spec.ts | 7 + 106 files changed, 4948 insertions(+), 906 deletions(-) delete mode 100644 app/Http/Controllers/AvatarController.php create mode 100644 app/Http/Controllers/Community/ChatController.php create mode 100644 app/Http/Controllers/Community/ForumController.php create mode 100644 app/Http/Controllers/Community/InterviewController.php create mode 100644 app/Http/Controllers/Community/LatestCommentsController.php create mode 100644 app/Http/Controllers/Community/LatestController.php create mode 100644 app/Http/Controllers/Community/NewsController.php rename app/Http/Controllers/{ => Dashboard}/ManageController.php (83%) create mode 100644 app/Http/Controllers/InterviewController.php create mode 100644 app/Http/Controllers/InterviewsController.php create mode 100644 app/Http/Controllers/Misc/AvatarController.php create mode 100644 app/Http/Controllers/PhotographyController.php create mode 100644 app/Http/Controllers/User/AvatarController.php create mode 100644 app/Http/Controllers/User/BuddiesController.php create mode 100644 app/Http/Controllers/User/FavouritesController.php create mode 100644 app/Http/Controllers/User/MembersController.php create mode 100644 app/Http/Controllers/User/MonthlyCommentatorsController.php create mode 100644 app/Http/Controllers/User/MyBuddiesController.php rename app/Http/Controllers/{ => User}/ProfileController.php (78%) create mode 100644 app/Http/Controllers/User/ReceivedCommentsController.php create mode 100644 app/Http/Controllers/User/StatisticsController.php create mode 100644 app/Http/Controllers/User/TodayDownloadsController.php create mode 100644 app/Http/Controllers/User/TodayInHistoryController.php create mode 100644 app/Http/Controllers/User/TopAuthorsController.php create mode 100644 app/Http/Controllers/User/TopFavouritesController.php create mode 100644 app/Http/Controllers/User/UserController.php create mode 100644 app/Http/Controllers/Web/ArtController.php rename app/Http/Controllers/{ => Web}/BrowseCategoriesController.php (78%) rename app/Http/Controllers/{ => Web}/BrowseGalleryController.php (96%) create mode 100644 app/Http/Controllers/Web/CategoryController.php create mode 100644 app/Http/Controllers/Web/DailyUploadsController.php create mode 100644 app/Http/Controllers/Web/FeaturedArtworksController.php create mode 100644 app/Http/Controllers/Web/GalleryController.php create mode 100644 app/Http/Controllers/Web/HomeController.php create mode 100644 app/Http/Requests/AvatarUploadRequest.php create mode 100644 app/Support/AvatarUrl.php create mode 100644 avatar_patch.diff create mode 100644 config/avatars.php create mode 100644 database/migrations/2026_02_15_000100_finalize_avatar_schema_for_cdn.php create mode 100644 database/migrations/2026_02_15_120500_finalize_avatar_metadata_schema.php create mode 100644 docs/avatar-cdn-config-notes.md create mode 100644 playwright.config.ts create mode 100644 public/gfx/sb_logo.png create mode 100644 public/gfx/sb_logo2.png create mode 100644 public/gfx/sb_logo_white.png create mode 100644 resources/js/components/profile/AvatarUploader.jsx rename resources/views/{legacy => community}/chat.blade.php (98%) create mode 100644 resources/views/layouts/_legacy.blade.php delete mode 100644 resources/views/layouts/legacy.blade.php rename resources/views/{legacy => shared}/placeholder.blade.php (100%) rename resources/views/{legacy => user}/buddies.blade.php (90%) rename resources/views/{legacy => user}/favourites.blade.php (99%) rename resources/views/{legacy => web}/art.blade.php (92%) rename resources/views/{legacy => web}/categories.blade.php (99%) rename resources/views/{legacy => web}/category.blade.php (97%) rename resources/views/{legacy => web}/daily-uploads.blade.php (93%) rename resources/views/{legacy => web}/featured-artworks.blade.php (95%) rename resources/views/{legacy => web}/gallery.blade.php (91%) create mode 100644 resources/views/web/home.blade.php create mode 100644 resources/views/web/home/featured.blade.php create mode 100644 resources/views/web/home/news.blade.php create mode 100644 resources/views/web/home/uploads.blade.php create mode 100644 resources/views/web/partials/_artwork_card.blade.php rename resources/views/{legacy => web}/partials/daily-uploads-grid.blade.php (100%) delete mode 100644 routes/legacy.php create mode 100644 test-results/.last-run.json create mode 100644 tests/e2e/home.spec.ts diff --git a/app/Console/Commands/AvatarsMigrate.php b/app/Console/Commands/AvatarsMigrate.php index 45f893d1..6267e3cd 100644 --- a/app/Console/Commands/AvatarsMigrate.php +++ b/app/Console/Commands/AvatarsMigrate.php @@ -2,82 +2,124 @@ namespace App\Console\Commands; +use App\Services\AvatarService; use Illuminate\Console\Command; use Illuminate\Support\Facades\DB; -use App\Services\AvatarService; class AvatarsMigrate extends Command { - /** - * The name and signature of the console command. - * - * @var string - */ - protected $signature = 'avatars:migrate {--force}'; + protected $signature = 'avatars:migrate {--force : Reprocess avatars even when avatar_hash is already present} {--limit=0 : Limit number of users processed}'; - /** - * The console command description. - * - * @var string - */ - protected $description = 'Migrate legacy avatars to new WebP avatar storage'; + protected $description = 'Migrate legacy avatars into CDN-ready WebP variants and avatar_hash metadata'; - protected $service; - - public function __construct(AvatarService $service) + public function __construct(private readonly AvatarService $service) { parent::__construct(); - $this->service = $service; } - public function handle() + public function handle(): int { + $force = (bool) $this->option('force'); + $limit = max(0, (int) $this->option('limit')); + $this->info('Starting avatar migration...'); - // Try to read legacy data from user_profiles.avatar_legacy or users.avatar_legacy or users.icon - $rows = DB::table('user_profiles')->select('user_id', 'avatar_legacy')->whereNotNull('avatar_legacy')->get(); + $rows = DB::table('user_profiles as p') + ->leftJoin('users as u', 'u.id', '=', 'p.user_id') + ->select([ + 'p.user_id', + 'p.avatar_hash', + 'p.avatar_legacy', + 'u.icon as user_icon', + ]) + ->when(!$force, fn ($query) => $query->whereNull('p.avatar_hash')) + ->where(function ($query) { + $query->whereNotNull('p.avatar_legacy') + ->orWhereNotNull('u.icon'); + }) + ->orderBy('p.user_id') + ->when($limit > 0, fn ($query) => $query->limit($limit)) + ->get(); if ($rows->isEmpty()) { - // fallback to users table - $rows = DB::table('users')->select('user_id', 'icon as avatar_legacy')->whereNotNull('icon')->get(); + $this->info('No avatars require migration.'); + + return self::SUCCESS; } - $count = 0; + $migrated = 0; + $skipped = 0; + $failed = 0; + foreach ($rows as $row) { - $userId = $row->user_id; - $legacy = $row->avatar_legacy ?? null; - if (!$legacy) { + $userId = (int) $row->user_id; + $legacyName = $this->normalizeLegacyName($row->avatar_legacy ?: $row->user_icon); + + if ($legacyName === null) { + $skipped++; continue; } - // Try common legacy paths - $candidates = [ - public_path('user-picture/' . $legacy), - public_path('avatar/' . $userId . '/' . $legacy), - storage_path('app/public/user-picture/' . $legacy), - storage_path('app/public/avatar/' . $userId . '/' . $legacy), - ]; - - $found = false; - foreach ($candidates as $p) { - if (file_exists($p) && is_readable($p)) { - $this->info("Processing user {$userId} from {$p}"); - $hash = $this->service->storeFromLegacyFile($userId, $p); - if ($hash) { - $this->info(" -> migrated, hash={$hash}"); - $count++; - $found = true; - break; - } - } + $path = $this->locateLegacyAvatarPath($userId, $legacyName); + if ($path === null) { + $failed++; + $this->warn("User {$userId}: legacy avatar not found ({$legacyName})"); + continue; } - if (!$found) { - $this->warn("Legacy file not found for user {$userId}, filename={$legacy}"); + try { + $hash = $this->service->storeFromLegacyFile($userId, $path); + if (!$hash) { + $failed++; + $this->warn("User {$userId}: unable to process legacy avatar ({$legacyName})"); + continue; + } + + $migrated++; + $this->line("User {$userId}: migrated ({$hash})"); + } catch (\Throwable $e) { + $failed++; + $this->warn("User {$userId}: migration failed ({$e->getMessage()})"); } } - $this->info("Migration complete. Processed: {$count}"); - return 0; + $this->info("Avatar migration complete. Migrated={$migrated}, Skipped={$skipped}, Failed={$failed}"); + + return $failed > 0 ? self::FAILURE : self::SUCCESS; + } + + private function normalizeLegacyName(?string $value): ?string + { + if (!$value) { + return null; + } + + $trimmed = trim($value); + if ($trimmed === '') { + return null; + } + + return basename(urldecode($trimmed)); + } + + private function locateLegacyAvatarPath(int $userId, string $legacyName): ?string + { + $candidates = [ + public_path('avatar/' . $legacyName), + public_path('avatar/' . $userId . '/' . $legacyName), + public_path('user-picture/' . $legacyName), + storage_path('app/public/avatar/' . $legacyName), + storage_path('app/public/avatar/' . $userId . '/' . $legacyName), + storage_path('app/public/user-picture/' . $legacyName), + base_path('oldSite/www/files/usericons/' . $legacyName), + ]; + + foreach ($candidates as $candidate) { + if (is_string($candidate) && is_file($candidate) && is_readable($candidate)) { + return $candidate; + } + } + + return null; } } diff --git a/app/Http/Controllers/AvatarController.php b/app/Http/Controllers/AvatarController.php deleted file mode 100644 index b80150de..00000000 --- a/app/Http/Controllers/AvatarController.php +++ /dev/null @@ -1,47 +0,0 @@ -service = $service; - } - - /** - * Handle avatar upload request. - */ - public function upload(Request $request) - { - $user = Auth::user(); - if (!$user) { - return response()->json(['error' => 'Unauthorized'], 401); - } - - $rules = [ - 'avatar' => 'required|image|max:2048|mimes:jpg,jpeg,png,webp', - ]; - - $validator = Validator::make($request->all(), $rules); - if ($validator->fails()) { - return response()->json(['errors' => $validator->errors()], 422); - } - - $file = $request->file('avatar'); - - try { - $hash = $this->service->storeFromUploadedFile($user->id, $file); - return response()->json(['success' => true, 'hash' => $hash], 200); - } catch (\Exception $e) { - return response()->json(['error' => 'Processing failed', 'message' => $e->getMessage()], 500); - } - } -} diff --git a/app/Http/Controllers/Community/ChatController.php b/app/Http/Controllers/Community/ChatController.php new file mode 100644 index 00000000..7cfff4bd --- /dev/null +++ b/app/Http/Controllers/Community/ChatController.php @@ -0,0 +1,44 @@ +input('store_chat'); + $chat_text = $request->input('chat_txt'); + + $chat = new \App\Chat(); + + if (!empty($store) && $store === 'true' && !empty($chat_text)) { + if (!empty($_SESSION['web_login']['status'])) { + $chat->StoreMessage($chat_text); + $chat->UpdateChatFile('cron/chat_log.txt', 10); + } + } + + ob_start(); + \App\Banner::ShowResponsiveAd(); + $adHtml = ob_get_clean(); + + ob_start(); + $userID = $_SESSION['web_login']['user_id'] ?? null; + $chat->ShowChat(50, $userID); + $chatHtml = ob_get_clean(); + + try { + $smileys = DB::table('smileys')->select('code', 'picture', 'emotion')->get(); + } catch (\Throwable $e) { + $smileys = collect(); + } + + return view('community.chat', compact('page_title', 'adHtml', 'chatHtml', 'smileys')); + } +} diff --git a/app/Http/Controllers/Community/ForumController.php b/app/Http/Controllers/Community/ForumController.php new file mode 100644 index 00000000..5ec82a4f --- /dev/null +++ b/app/Http/Controllers/Community/ForumController.php @@ -0,0 +1,38 @@ +legacy = $legacy; + } + + public function index() + { + $data = $this->legacy->forumIndex(); + return view('community.forum.index', $data); + } + + public function topic(Request $request, $topic_id) + { + $data = $this->legacy->forumTopic((int) $topic_id, (int) $request->query('page', 1)); + + if (! $data) { + return view('shared.placeholder'); + } + + if (isset($data['type']) && $data['type'] === 'subtopics') { + return view('community.forum.topic', $data); + } + + return view('community.forum.posts', $data); + } +} diff --git a/app/Http/Controllers/Community/InterviewController.php b/app/Http/Controllers/Community/InterviewController.php new file mode 100644 index 00000000..f1352925 --- /dev/null +++ b/app/Http/Controllers/Community/InterviewController.php @@ -0,0 +1,103 @@ +isMethod('post')) { + $action = $request->input('action'); + if ($action === 'store' && (!empty($_SESSION['web_login']['user_type']) && $_SESSION['web_login']['user_type'] > 1)) { + $comment = $request->input('comment'); + $tekst = nl2br(htmlspecialchars($comment ?? '', ENT_QUOTES, 'UTF-8')); + $interviewId = (int) $request->input('interview_id'); + + try { + DB::table('interviews_comment')->insert([ + 'nid' => $interviewId, + 'author' => $_SESSION['web_login']['username'] ?? 'Anonymous', + 'datum' => DB::raw('CURRENT_TIMESTAMP'), + 'tekst' => $tekst, + ]); + + $ar2 = DB::table('users') + ->where('uname', $_SESSION['web_login']['username']) + ->first(); + + if (!empty($ar2->user_id)) { + DB::table('users_statistics') + ->where('user_id', $ar2->user_id) + ->increment('newscomment'); + } + } catch (\Throwable $e) { + // fail silently + } + } + } + + try { + $ar = DB::table('interviews')->where('id', $id)->first(); + } catch (\Throwable $e) { + $ar = null; + } + + if (! $ar) { + return redirect('/interviews'); + } + + try { + $artworks = DB::table('wallz') + ->where('uname', $ar->username) + ->inRandomOrder() + ->limit(2) + ->get(); + } catch (\Throwable $e) { + $artworks = collect(); + } + + try { + $comments = DB::table('interviews_comment as c') + ->leftJoin('users as u', 'u.uname', '=', 'c.author') + ->where('c.nid', $id) + ->select('c.*', 'u.user_id', 'u.user_type', 'u.signature', 'u.icon') + ->orderBy('c.datum') + ->get(); + } catch (\Throwable $e) { + $comments = collect(); + } + + $authors = $comments->pluck('author')->unique()->values()->all(); + $postCounts = []; + if (!empty($authors)) { + try { + $counts = DB::table('interviews_comment') + ->select('author', DB::raw('COUNT(*) as cnt')) + ->whereIn('author', $authors) + ->groupBy('author') + ->get(); + + foreach ($counts as $c) { + $postCounts[$c->author] = $c->cnt; + } + } catch (\Throwable $e) { + } + } + + $page_title = 'Interview with ' . ($ar->username ?? ''); + + return view('community.interview', [ + 'ar' => $ar, + 'artworks' => $artworks, + 'comments' => $comments, + 'postCounts' => $postCounts, + 'page_title' => $page_title, + ]); + } +} diff --git a/app/Http/Controllers/Community/LatestCommentsController.php b/app/Http/Controllers/Community/LatestCommentsController.php new file mode 100644 index 00000000..14c4cb6b --- /dev/null +++ b/app/Http/Controllers/Community/LatestCommentsController.php @@ -0,0 +1,54 @@ +whereHas('artwork', function ($q) { + $q->public()->published()->whereNull('deleted_at'); + }) + ->orderByDesc('created_at'); + + $comments = $query->paginate($hits)->withQueryString(); + + $comments->getCollection()->transform(function (ArtworkComment $c) { + $art = $c->artwork; + $user = $c->user; + + $present = $art ? \App\Services\ThumbnailPresenter::present($art, 'md') : null; + $thumb = $present ? ($present['url']) : '/gfx/sb_join.jpg'; + + return (object) [ + 'comment_id' => $c->getKey(), + 'comment_description' => $c->content, + 'commenter_id' => $c->user_id, + 'country' => $user->country ?? null, + 'icon' => $user ? DB::table('user_profiles')->where('user_id', $user->id)->value('avatar_hash') : null, + 'uname' => $user->username ?? $user->name ?? 'User', + 'signature' => $user->signature ?? null, + 'user_type' => $user->role ?? null, + 'id' => $art->id ?? null, + 'name' => $art->title ?? null, + 'picture' => $art->file_name ?? null, + 'thumb' => $thumb, + 'artwork_slug' => $art->slug ?? Str::slug($art->title ?? ''), + 'datetime' => $c->created_at?->toDateTimeString() ?? now()->toDateTimeString(), + ]; + }); + + $page_title = 'Latest Comments'; + + return view('community.latest-comments', compact('page_title', 'comments')); + } +} diff --git a/app/Http/Controllers/Community/LatestController.php b/app/Http/Controllers/Community/LatestController.php new file mode 100644 index 00000000..5f0c4723 --- /dev/null +++ b/app/Http/Controllers/Community/LatestController.php @@ -0,0 +1,47 @@ +artworks = $artworks; + } + + public function index(Request $request) + { + $perPage = 21; + + $artworks = $this->artworks->browsePublicArtworks($perPage); + + $artworks->getCollection()->transform(function (Artwork $artwork) { + $primaryCategory = $artwork->categories->sortBy('sort_order')->first(); + $categoryName = $primaryCategory->name ?? ''; + $gid = $primaryCategory ? ((int) $primaryCategory->id % 5) * 5 : 0; + $present = \App\Services\ThumbnailPresenter::present($artwork, 'md'); + + return (object) [ + 'id' => $artwork->id, + 'name' => $artwork->title, + 'category_name' => $categoryName, + 'gid_num' => $gid, + 'thumb_url' => $present['url'], + 'thumb_srcset' => $present['srcset'] ?? $present['url'], + 'uname' => $artwork->user->name ?? 'Skinbase', + ]; + }); + + return view('community.latest-artworks', [ + 'artworks' => $artworks, + 'page_title' => 'Latest Artworks', + ]); + } +} diff --git a/app/Http/Controllers/Community/NewsController.php b/app/Http/Controllers/Community/NewsController.php new file mode 100644 index 00000000..cd21418f --- /dev/null +++ b/app/Http/Controllers/Community/NewsController.php @@ -0,0 +1,44 @@ +leftJoin('users as t2', 't1.user_id', '=', 't2.user_id') + ->where('t1.news_id', $id) + ->select('t1.*', 't2.uname', 't2.user_type', 't2.signature', 't2.icon') + ->first(); + } catch (\Throwable $e) { + $news = null; + } + + if (empty($news)) { + return redirect('/'); + } + + try { + $comments = DB::table('news_comment as c') + ->leftJoin('users as u', 'c.user_id', '=', 'u.user_id') + ->where('c.news_id', $id) + ->select('c.posted', 'c.message', 'c.user_id', 'u.user_type', 'u.signature', 'u.icon', 'u.uname') + ->orderBy('c.posted') + ->get(); + } catch (\Throwable $e) { + $comments = collect(); + } + + $page_title = ($news->headline ?? 'News') . ' - SkinBase News'; + + return view('community.news', compact('news', 'comments', 'page_title')); + } +} diff --git a/app/Http/Controllers/ManageController.php b/app/Http/Controllers/Dashboard/ManageController.php similarity index 83% rename from app/Http/Controllers/ManageController.php rename to app/Http/Controllers/Dashboard/ManageController.php index f8f53576..ef58bfd0 100644 --- a/app/Http/Controllers/ManageController.php +++ b/app/Http/Controllers/Dashboard/ManageController.php @@ -1,7 +1,8 @@ user()->id; $perPage = 50; - // Use default connection query builder and join category name to avoid Eloquent model issues $categorySub = DB::table('artwork_category as ac') ->join('categories as c', 'ac.category_id', '=', 'c.id') ->select('ac.artwork_id', DB::raw('MIN(c.name) as category_name')) @@ -26,8 +26,17 @@ class ManageController extends Controller ->leftJoinSub($categorySub, 'cat', function ($join) { $join->on('a.id', '=', 'cat.artwork_id'); }) + ->leftJoin('artwork_stats as s', 'a.id', '=', 's.artwork_id') ->where('a.user_id', $userId) - ->select('a.*', DB::raw('cat.category_name as category_name')) + ->select( + 'a.*', + DB::raw('cat.category_name as category_name'), + DB::raw('COALESCE(s.rating_count, 0) as rating_num'), + DB::raw('COALESCE(s.rating_avg, 0) as rating'), + DB::raw('COALESCE(s.downloads, 0) as dls'), + DB::raw('COALESCE(s.favorites, 0) as zoom'), + DB::raw('COALESCE(s.views, 0) as views') + ) ->orderByDesc('a.published_at') ->orderByDesc('a.id'); @@ -43,7 +52,6 @@ class ManageController extends Controller { $artwork = $request->artwork(); - // If artworks no longer have a single `category` column, fetch pivot selection $selectedCategory = DB::table('artwork_category')->where('artwork_id', (int)$id)->value('category_id'); $artwork->category = $selectedCategory; @@ -56,7 +64,7 @@ class ManageController extends Controller return view('manage.edit', [ 'artwork' => $artwork, 'categories' => $categories, - 'page_title' => 'Edit Artwork: ' . ($artwork->name ?? ''), + 'page_title' => 'Edit Artwork: ' . ($artwork->title ?? ''), ]); } @@ -65,12 +73,11 @@ class ManageController extends Controller $existing = $request->artwork(); $data = $request->validated(); $update = [ - 'name' => $data['name'], + 'title' => $data['title'], 'description' => $data['description'] ?? $existing->description, 'updated' => now(), ]; - // handle artwork image upload (replacing picture) if ($request->hasFile('artwork')) { $file = $request->file('artwork'); $path = $file->store('public/uploads/artworks'); @@ -78,7 +85,6 @@ class ManageController extends Controller $update['picture'] = $filename; } - // handle attachment upload (zip, etc.) if ($request->hasFile('attachment')) { $att = $request->file('attachment'); $attPath = $att->store('public/uploads/attachments'); @@ -87,7 +93,6 @@ class ManageController extends Controller DB::table('artworks')->where('id', (int)$id)->update($update); - // Update pivot: set single category selection for this artwork if (isset($data['section'])) { DB::table('artwork_category')->where('artwork_id', (int)$id)->delete(); DB::table('artwork_category')->insert([ @@ -103,7 +108,6 @@ class ManageController extends Controller { $artwork = $request->artwork(); - // delete files if present (stored in new storage location) if (!empty($artwork->fname)) { Storage::delete('public/uploads/attachments/' . $artwork->fname); } diff --git a/app/Http/Controllers/InterviewController.php b/app/Http/Controllers/InterviewController.php new file mode 100644 index 00000000..4f4558fa --- /dev/null +++ b/app/Http/Controllers/InterviewController.php @@ -0,0 +1,103 @@ +isMethod('post')) { + $action = $request->input('action'); + if ($action === 'store' && (!empty($_SESSION['web_login']['user_type']) && $_SESSION['web_login']['user_type'] > 1)) { + $comment = $request->input('comment'); + $tekst = nl2br(htmlspecialchars($comment ?? '', ENT_QUOTES, 'UTF-8')); + $interviewId = (int) $request->input('interview_id'); + + try { + DB::table('interviews_comment')->insert([ + 'nid' => $interviewId, + 'author' => $_SESSION['web_login']['username'] ?? 'Anonymous', + 'datum' => DB::raw('CURRENT_TIMESTAMP'), + 'tekst' => $tekst, + ]); + + $ar2 = DB::table('users') + ->where('uname', $_SESSION['web_login']['username']) + ->first(); + + if (!empty($ar2->user_id)) { + DB::table('users_statistics') + ->where('user_id', $ar2->user_id) + ->increment('newscomment'); + } + } catch (\Throwable $e) { + // fail silently + } + } + } + + try { + $ar = DB::table('interviews')->where('id', $id)->first(); + } catch (\Throwable $e) { + $ar = null; + } + + if (! $ar) { + return redirect('/interviews'); + } + + try { + $artworks = DB::table('wallz') + ->where('uname', $ar->username) + ->inRandomOrder() + ->limit(2) + ->get(); + } catch (\Throwable $e) { + $artworks = collect(); + } + + try { + $comments = DB::table('interviews_comment as c') + ->leftJoin('users as u', 'u.uname', '=', 'c.author') + ->where('c.nid', $id) + ->select('c.*', 'u.user_id', 'u.user_type', 'u.signature', 'u.icon') + ->orderBy('c.datum') + ->get(); + } catch (\Throwable $e) { + $comments = collect(); + } + + $authors = $comments->pluck('author')->unique()->values()->all(); + $postCounts = []; + if (!empty($authors)) { + try { + $counts = DB::table('interviews_comment') + ->select('author', DB::raw('COUNT(*) as cnt')) + ->whereIn('author', $authors) + ->groupBy('author') + ->get(); + + foreach ($counts as $c) { + $postCounts[$c->author] = $c->cnt; + } + } catch (\Throwable $e) { + } + } + + $page_title = 'Interview with ' . ($ar->username ?? ''); + + return view('legacy.interview', [ + 'ar' => $ar, + 'artworks' => $artworks, + 'comments' => $comments, + 'postCounts' => $postCounts, + 'page_title' => $page_title, + ]); + } +} diff --git a/app/Http/Controllers/InterviewsController.php b/app/Http/Controllers/InterviewsController.php new file mode 100644 index 00000000..5b7dcf5e --- /dev/null +++ b/app/Http/Controllers/InterviewsController.php @@ -0,0 +1,28 @@ +select('t1.id', 't1.headline', 't2.user_id', 't2.uname', 't2.icon') + ->leftJoin('users AS t2', 't1.username', '=', 't2.uname') + ->orderByDesc('t1.datum') + ->limit(60) + ->get(); + } catch (\Throwable $e) { + $interviews = collect(); + } + + $page_title = 'Interviews'; + + return view('legacy.interviews', compact('interviews', 'page_title')); + } +} diff --git a/app/Http/Controllers/Legacy/AvatarController.php b/app/Http/Controllers/Legacy/AvatarController.php index eb322a07..391c514f 100644 --- a/app/Http/Controllers/Legacy/AvatarController.php +++ b/app/Http/Controllers/Legacy/AvatarController.php @@ -4,64 +4,15 @@ namespace App\Http\Controllers\Legacy; use App\Http\Controllers\Controller; use Illuminate\Http\Request; -use Illuminate\Support\Facades\DB; -use Illuminate\Support\Facades\Storage; +use App\Support\AvatarUrl; class AvatarController extends Controller { public function show(Request $request, $id, $name = null) { - $user_id = (int) $id; + $userId = (int) $id; + $target = AvatarUrl::forUser($userId, null, 128); - // default avatar in project public gfx - $defaultAvatar = public_path('gfx/avatar.jpg'); - - try { - $icon = DB::table('users')->where('user_id', $user_id)->value('icon'); - } catch (\Throwable $e) { - $icon = null; - } - - $candidates = []; - if (!empty($icon)) { - // common legacy locations to check - $candidates[] = base_path('oldSite/www/files/usericons/' . $icon); - $candidates[] = base_path('oldSite/www/files/usericons/' . rawurlencode($icon)); - $candidates[] = base_path('oldSite/www/files/usericons/' . basename($icon)); - $candidates[] = public_path('avatar/' . $user_id . '/' . $icon); - $candidates[] = public_path('avatar/' . $user_id . '/' . basename($icon)); - $candidates[] = storage_path('app/public/usericons/' . $icon); - $candidates[] = storage_path('app/public/usericons/' . basename($icon)); - } - - // find first readable file - $found = null; - foreach ($candidates as $path) { - if ($path && file_exists($path) && is_readable($path)) { - $found = $path; - break; - } - } - - if ($found) { - $type = @exif_imagetype($found); - if ($type) { - $mime = image_type_to_mime_type($type); - } else { - $f = finfo_open(FILEINFO_MIME_TYPE); - $mime = finfo_file($f, $found) ?: 'application/octet-stream'; - finfo_close($f); - } - - return response()->file($found, ['Content-Type' => $mime]); - } - - // fallback to default - if (file_exists($defaultAvatar) && is_readable($defaultAvatar)) { - return response()->file($defaultAvatar, ['Content-Type' => 'image/jpeg']); - } - - // final fallback: 404 - abort(404); + return redirect()->away($target, 301); } } diff --git a/app/Http/Controllers/Legacy/BuddiesController.php b/app/Http/Controllers/Legacy/BuddiesController.php index cfb3b040..d1ec9ccc 100644 --- a/app/Http/Controllers/Legacy/BuddiesController.php +++ b/app/Http/Controllers/Legacy/BuddiesController.php @@ -22,7 +22,7 @@ class BuddiesController extends Controller ->leftJoin('users as t2', 't1.user_id', '=', 't2.id') ->leftJoin('user_profiles as p', 'p.user_id', '=', 't2.id') ->where('t1.friend_id', $user->id) - ->select('t1.id', 't1.user_id', 't1.friend_id', 't2.name as uname', 'p.avatar as icon', 't1.date_added') + ->select('t1.id', 't1.user_id', 't1.friend_id', 't2.name as uname', 'p.avatar_hash as icon', 't1.date_added') ->orderByDesc('t1.date_added'); $followers = $query->paginate($perPage)->withQueryString(); diff --git a/app/Http/Controllers/Legacy/LatestCommentsController.php b/app/Http/Controllers/Legacy/LatestCommentsController.php index eb091e27..02db175f 100644 --- a/app/Http/Controllers/Legacy/LatestCommentsController.php +++ b/app/Http/Controllers/Legacy/LatestCommentsController.php @@ -7,6 +7,7 @@ use Illuminate\Http\Request; use App\Models\ArtworkComment; use Illuminate\Support\Facades\Storage; use Illuminate\Support\Str; +use Illuminate\Support\Facades\DB; class LatestCommentsController extends Controller { @@ -36,7 +37,7 @@ class LatestCommentsController extends Controller 'comment_description' => $c->content, 'commenter_id' => $c->user_id, 'country' => $user->country ?? null, - 'icon' => $user->avatar ?? null, + 'icon' => $user ? DB::table('user_profiles')->where('user_id', $user->id)->value('avatar_hash') : null, 'uname' => $user->username ?? $user->name ?? 'User', 'signature' => $user->signature ?? null, 'user_type' => $user->role ?? null, diff --git a/app/Http/Controllers/Legacy/MyBuddiesController.php b/app/Http/Controllers/Legacy/MyBuddiesController.php index 3ff2f962..9ab8db4b 100644 --- a/app/Http/Controllers/Legacy/MyBuddiesController.php +++ b/app/Http/Controllers/Legacy/MyBuddiesController.php @@ -23,7 +23,7 @@ class MyBuddiesController extends Controller ->leftJoin('users as t2', 't1.friend_id', '=', 't2.id') ->leftJoin('user_profiles as p', 'p.user_id', '=', 't2.id') ->where('t1.user_id', $user->id) - ->select('t1.id', 't1.friend_id', 't1.user_id', 't2.name as uname', 'p.avatar as icon', 't1.date_added') + ->select('t1.id', 't1.friend_id', 't1.user_id', 't2.name as uname', 'p.avatar_hash as icon', 't1.date_added') ->orderByDesc('t1.date_added'); $buddies = $query->paginate($perPage)->withQueryString(); diff --git a/app/Http/Controllers/Legacy/ProfileController.php b/app/Http/Controllers/Legacy/ProfileController.php index dfe911c0..5d3b1497 100644 --- a/app/Http/Controllers/Legacy/ProfileController.php +++ b/app/Http/Controllers/Legacy/ProfileController.php @@ -10,6 +10,7 @@ use App\Models\User; use App\Models\Artwork; use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\DB; class ProfileController extends Controller { @@ -63,7 +64,7 @@ class ProfileController extends Controller 'user_id' => $user->id, 'uname' => $user->name, 'real_name' => $user->name, - 'icon' => $user->avatar ?? null, + 'icon' => DB::table('user_profiles')->where('user_id', $user->id)->value('avatar_hash'), 'about_me' => $user->bio ?? null, ]; diff --git a/app/Http/Controllers/Legacy/UserController.php b/app/Http/Controllers/Legacy/UserController.php index a8a35464..e7286a83 100644 --- a/app/Http/Controllers/Legacy/UserController.php +++ b/app/Http/Controllers/Legacy/UserController.php @@ -4,11 +4,10 @@ namespace App\Http\Controllers\Legacy; use App\Http\Controllers\Controller; use Illuminate\Http\Request; -use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Schema; -use App\Models\User; +use App\Services\AvatarService; use Carbon\Carbon; class UserController extends Controller @@ -72,12 +71,12 @@ class UserController extends Controller // Files: avatar/photo/emoticon if ($request->hasFile('avatar')) { - $f = $request->file('avatar'); - $name = $user->id . '.' . $f->getClientOriginalExtension(); - $f->move(public_path('avatar'), $name); - // store filename in profile avatar (legacy field) — modern avatar pipeline will later migrate - $profileUpdates['avatar'] = $name; - $user->icon = $name; + try { + $hash = app(AvatarService::class)->storeFromUploadedFile((int) $user->id, $request->file('avatar')); + $user->icon = $hash; + } catch (\Throwable $e) { + $request->session()->flash('error', 'Avatar upload failed.'); + } } if ($request->hasFile('personal_picture')) { @@ -141,7 +140,7 @@ class UserController extends Controller if (isset($profile->birthdate)) $user->birth = $profile->birthdate; if (isset($profile->gender)) $user->gender = $profile->gender; if (isset($profile->country_code)) $user->country_code = $profile->country_code; - if (isset($profile->avatar)) $user->icon = $profile->avatar; + if (isset($profile->avatar_hash)) $user->icon = $profile->avatar_hash; if (isset($profile->cover_image)) $user->picture = $profile->cover_image; if (isset($profile->signature)) $user->signature = $profile->signature; if (isset($profile->description)) $user->description = $profile->description; diff --git a/app/Http/Controllers/Misc/AvatarController.php b/app/Http/Controllers/Misc/AvatarController.php new file mode 100644 index 00000000..fd1bf0ed --- /dev/null +++ b/app/Http/Controllers/Misc/AvatarController.php @@ -0,0 +1,55 @@ +service = $service; + } + + public function upload(AvatarUploadRequest $request): JsonResponse + { + $user = $request->user(); + if (!$user) { + return response()->json(['error' => 'Unauthorized'], 401); + } + + $file = $request->file('avatar'); + + try { + $hash = $this->service->storeFromUploadedFile($user->id, $file); + return response()->json([ + 'success' => true, + 'hash' => $hash, + 'url' => AvatarUrl::forUser((int) $user->id, $hash, 128), + ], 200); + } catch (RuntimeException $e) { + logger()->warning('Avatar upload validation failed', [ + 'user_id' => (int) $user->id, + 'message' => $e->getMessage(), + ]); + + return response()->json([ + 'error' => 'Validation failed', + 'message' => $e->getMessage(), + ], 422); + } catch (\Throwable $e) { + logger()->error('Avatar upload failed', [ + 'user_id' => (int) $user->id, + 'message' => $e->getMessage(), + ]); + + return response()->json(['error' => 'Processing failed'], 500); + } + } +} diff --git a/app/Http/Controllers/PhotographyController.php b/app/Http/Controllers/PhotographyController.php new file mode 100644 index 00000000..1b1483e6 --- /dev/null +++ b/app/Http/Controllers/PhotographyController.php @@ -0,0 +1,101 @@ +artworks = $artworks; + } + + public function index(Request $request) + { + $segment = strtolower($request->segment(1) ?? 'photography'); + $contentSlug = in_array($segment, ['photography','wallpapers','skins','other']) ? $segment : 'photography'; + + $group = ucfirst($contentSlug); + + $id = null; + if ($contentSlug === 'photography') { + $id = 3; + } + + $category = null; + try { + if ($id !== null && Schema::hasTable('artworks_categories')) { + $category = DB::table('artworks_categories') + ->select('category_name', 'rootid', 'section_id', 'description', 'category_id') + ->where('category_id', $id) + ->first(); + } + } catch (\Throwable $e) { + $category = null; + } + + $ct = ContentType::where('slug', $contentSlug)->first(); + $page_title = $category->category_name ?? ($ct->name ?? ucfirst($contentSlug)); + $tidy = $category->description ?? ($ct->description ?? null); + + $perPage = 40; + $sort = (string) $request->get('sort', 'latest'); + + try { + $artworks = $this->artworks->getArtworksByContentType($contentSlug, $perPage, $sort); + } catch (\Throwable $e) { + $artworks = new \Illuminate\Pagination\LengthAwarePaginator([], 0, $perPage, 1, [ + 'path' => url()->current(), + ]); + } + + $subcategories = collect(); + try { + if ($id !== null && Schema::hasTable('artworks_categories')) { + $subcategories = DB::table('artworks_categories')->select('category_id','category_name')->where('rootid', $id)->orderBy('category_name')->get(); + if ($subcategories->count() == 0 && !empty($category->rootid)) { + $subcategories = DB::table('artworks_categories')->select('category_id','category_name')->where('rootid', $category->rootid)->orderBy('category_name')->get(); + } + } + } catch (\Throwable $e) { + $subcategories = collect(); + } + + if (! $subcategories || $subcategories->count() === 0) { + if ($ct) { + $subcategories = $ct->rootCategories() + ->orderBy('sort_order') + ->orderBy('name') + ->get() + ->map(fn ($c) => (object) ['category_id' => $c->id, 'category_name' => $c->name, 'slug' => $c->slug]); + } else { + $subcategories = collect(); + } + } + + if ($artworks instanceof \Illuminate\Database\Eloquent\Collection || $artworks instanceof \Illuminate\Support\Collection) { + $page = (int) ($request->query('page', 1)); + $artworks = new \Illuminate\Pagination\LengthAwarePaginator($artworks->values()->all(), $artworks->count(), $perPage, $page, [ + 'path' => url()->current(), + 'query' => request()->query(), + ]); + } + + $contentType = ContentType::where('slug', $contentSlug)->first(); + $rootCategories = $contentType + ? $contentType->rootCategories()->orderBy('sort_order')->orderBy('name')->get() + : collect(); + + $page_meta_description = $tidy; + + return view('legacy.content-type', compact('contentType','rootCategories','artworks','page_title','page_meta_description','subcategories','id')); + } +} diff --git a/app/Http/Controllers/User/AvatarController.php b/app/Http/Controllers/User/AvatarController.php new file mode 100644 index 00000000..4a3f4f1d --- /dev/null +++ b/app/Http/Controllers/User/AvatarController.php @@ -0,0 +1,59 @@ +service = $service; + } + + /** + * Handle avatar upload request. + */ + public function upload(AvatarUploadRequest $request): JsonResponse + { + $user = $request->user(); + if (!$user) { + return response()->json(['error' => 'Unauthorized'], 401); + } + + $file = $request->file('avatar'); + + try { + $hash = $this->service->storeFromUploadedFile($user->id, $file); + return response()->json([ + 'success' => true, + 'hash' => $hash, + 'url' => AvatarUrl::forUser((int) $user->id, $hash, 128), + ], 200); + } catch (RuntimeException $e) { + logger()->warning('Avatar upload validation failed', [ + 'user_id' => (int) $user->id, + 'message' => $e->getMessage(), + ]); + + return response()->json([ + 'error' => 'Validation failed', + 'message' => $e->getMessage(), + ], 422); + } catch (\Throwable $e) { + logger()->error('Avatar upload failed', [ + 'user_id' => (int) $user->id, + 'message' => $e->getMessage(), + ]); + + return response()->json(['error' => 'Processing failed'], 500); + } + } +} diff --git a/app/Http/Controllers/User/BuddiesController.php b/app/Http/Controllers/User/BuddiesController.php new file mode 100644 index 00000000..379d0e21 --- /dev/null +++ b/app/Http/Controllers/User/BuddiesController.php @@ -0,0 +1,37 @@ +user(); + if (! $user) { + return redirect()->route('login'); + } + + $perPage = 50; + + try { + $query = DB::table('friends_list as t1') + ->leftJoin('users as t2', 't1.user_id', '=', 't2.id') + ->leftJoin('user_profiles as p', 'p.user_id', '=', 't2.id') + ->where('t1.friend_id', $user->id) + ->select('t1.id', 't1.user_id', 't1.friend_id', 't2.name as uname', 'p.avatar_hash as icon', 't1.date_added') + ->orderByDesc('t1.date_added'); + + $followers = $query->paginate($perPage)->withQueryString(); + } catch (\Throwable $e) { + $followers = collect(); + } + + $page_title = ($user->name ?? $user->username ?? 'User') . ': Followers'; + + return view('user.buddies', compact('followers', 'page_title')); + } +} diff --git a/app/Http/Controllers/User/FavouritesController.php b/app/Http/Controllers/User/FavouritesController.php new file mode 100644 index 00000000..8be69d96 --- /dev/null +++ b/app/Http/Controllers/User/FavouritesController.php @@ -0,0 +1,143 @@ +user()->id ?? null); + + $page = max(1, (int) $request->query('page', 1)); + $hits = 20; + $start = ($page - 1) * $hits; + + $total = 0; + $results = collect(); + + try { + $schema = DB::getSchemaBuilder(); + } catch (\Throwable $e) { + $schema = null; + } + + $userIdCol = Schema::hasColumn('users', 'user_id') ? 'user_id' : 'id'; + $userNameCol = null; + foreach (['uname', 'username', 'name'] as $col) { + if (Schema::hasColumn('users', $col)) { + $userNameCol = $col; + break; + } + } + + if ($schema && $schema->hasTable('user_favorites') && class_exists(UserFavorite::class)) { + try { + $query = UserFavorite::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) use ($userNameCol) { + $art = $fav->artwork; + if (! $art) { + return null; + } + $item = (object) $art->toArray(); + $item->uname = ($userNameCol && isset($art->user)) ? ($art->user->{$userNameCol} ?? null) : null; + $item->datum = $fav->created_at; + return $item; + })->filter(); + } catch (\Throwable $e) { + $total = 0; + $results = collect(); + } + } else { + try { + if ($schema && $schema->hasTable('artworks_favourites')) { + $favTable = 'artworks_favourites'; + } elseif ($schema && $schema->hasTable('favourites')) { + $favTable = 'favourites'; + } else { + $favTable = null; + } + + if ($schema && $schema->hasTable('artworks')) { + $artTable = 'artworks'; + } elseif ($schema && $schema->hasTable('wallz')) { + $artTable = 'wallz'; + } else { + $artTable = null; + } + } catch (\Throwable $e) { + $favTable = null; + $artTable = null; + } + + if ($favTable && $artTable) { + try { + $total = (int) DB::table($favTable)->where('user_id', $userId)->count(); + + $t2JoinCol = 't2.' . $userIdCol; + $t2NameSelect = $userNameCol ? DB::raw("t2.{$userNameCol} as uname") : DB::raw("'' as uname"); + + $results = DB::table($favTable . ' as t1') + ->rightJoin($artTable . ' as t3', 't1.artwork_id', '=', 't3.id') + ->leftJoin('users as t2', 't3.user_id', '=', $t2JoinCol) + ->where('t1.user_id', $userId) + ->select('t3.*', $t2NameSelect, 't1.datum') + ->orderByDesc('t1.datum') + ->orderByDesc('t1.artwork_id') + ->skip($start) + ->take($hits) + ->get(); + } catch (\Throwable $e) { + $total = 0; + $results = collect(); + } + } + } + + $results = collect($results)->filter()->values()->transform(function ($row) { + $row->name = $row->name ?? ''; + $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; + }); + + $page_title = ($username ?: ($userNameCol ? DB::table('users')->where($userIdCol, $userId)->value($userNameCol) : '')) . ' Favourites'; + + return view('user.favourites', [ + 'results' => $results, + 'page_title' => $page_title, + 'user_id' => $userId, + 'page' => $page, + 'hits' => $hits, + 'total' => $total, + ]); + } + + public function destroy(Request $request, $userId, $artworkId) + { + $auth = $request->user(); + if (! $auth || $auth->id != (int)$userId) { + abort(403); + } + + $favTable = Schema::hasTable('user_favorites') ? 'user_favorites' : (Schema::hasTable('artworks_favourites') ? 'artworks_favourites' : 'favourites'); + + DB::table($favTable)->where('user_id', (int)$userId)->where('artwork_id', (int)$artworkId)->delete(); + + return redirect()->route('legacy.favourites', ['id' => $userId])->with('status', 'Removed from favourites'); + } +} diff --git a/app/Http/Controllers/User/MembersController.php b/app/Http/Controllers/User/MembersController.php new file mode 100644 index 00000000..d1320f8d --- /dev/null +++ b/app/Http/Controllers/User/MembersController.php @@ -0,0 +1,49 @@ +legacy = $legacy; + } + + public function photos(Request $request, $id = null) + { + $id = (int) ($id ?: 545); + + $result = $this->legacy->categoryPage('', null, $id); + if (! $result) { + return redirect('/'); + } + + $page_title = $result['page_title'] ?? ($result['category']->category_name ?? 'Members Photos'); + $artworks = $result['artworks'] ?? collect(); + + if ($artworks && method_exists($artworks, 'getCollection')) { + $artworks->getCollection()->transform(function ($row) { + $row->slug = $row->slug ?? Str::slug($row->name ?? ''); + $row->thumb = $row->thumb ?? ($row->thumb_url ?? null); + $row->thumb_srcset = $row->thumb_srcset ?? ($row->thumb_srcset ?? null); + return $row; + }); + } elseif (is_iterable($artworks)) { + $artworks = collect($artworks)->map(function ($row) { + $row->slug = $row->slug ?? Str::slug($row->name ?? ''); + $row->thumb = $row->thumb ?? ($row->thumb_url ?? null); + $row->thumb_srcset = $row->thumb_srcset ?? ($row->thumb_srcset ?? null); + return $row; + }); + } + + return view('web.browse', compact('page_title', 'artworks')); + } +} diff --git a/app/Http/Controllers/User/MonthlyCommentatorsController.php b/app/Http/Controllers/User/MonthlyCommentatorsController.php new file mode 100644 index 00000000..a89cae22 --- /dev/null +++ b/app/Http/Controllers/User/MonthlyCommentatorsController.php @@ -0,0 +1,39 @@ +query('page', 1)); + + $query = DB::table('artwork_comments as t1') + ->leftJoin('users as t2', 't1.user_id', '=', 't2.user_id') + ->leftJoin('country as c', 't2.country', '=', 'c.id') + ->where('t1.user_id', '>', 0) + ->whereRaw("DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= t1.date") + ->select( + 't2.user_id', + 't2.uname', + 't2.user_type', + 't2.country', + 'c.name as country_name', + 'c.flag as country_flag', + DB::raw('COUNT(*) as num_comments') + ) + ->groupBy('t1.user_id') + ->orderByDesc('num_comments'); + + $rows = $query->paginate($hits)->withQueryString(); + + $page_title = 'Monthly Top Commentators'; + + return view('user.monthly-commentators', compact('page_title', 'rows')); + } +} diff --git a/app/Http/Controllers/User/MyBuddiesController.php b/app/Http/Controllers/User/MyBuddiesController.php new file mode 100644 index 00000000..85b33f1c --- /dev/null +++ b/app/Http/Controllers/User/MyBuddiesController.php @@ -0,0 +1,56 @@ +user(); + if (! $user) { + return redirect()->route('login'); + } + + $perPage = 50; + + try { + $query = DB::table('friends_list as t1') + ->leftJoin('users as t2', 't1.friend_id', '=', 't2.id') + ->leftJoin('user_profiles as p', 'p.user_id', '=', 't2.id') + ->where('t1.user_id', $user->id) + ->select('t1.id', 't1.friend_id', 't1.user_id', 't2.name as uname', 'p.avatar_hash as icon', 't1.date_added') + ->orderByDesc('t1.date_added'); + + $buddies = $query->paginate($perPage)->withQueryString(); + } catch (\Throwable $e) { + $buddies = collect(); + } + + $page_title = ($user->name ?? $user->username ?? 'User') . ': Following List'; + + return view('user.mybuddies', compact('buddies', 'page_title')); + } + + public function destroy(Request $request, $id) + { + $user = $request->user(); + if (! $user) { + abort(403); + } + + try { + $deleted = DB::table('friends_list')->where('id', $id)->where('user_id', $user->id)->delete(); + if ($deleted) { + $request->session()->flash('status', 'Removed from following list.'); + } + } catch (\Throwable $e) { + $request->session()->flash('error', 'Could not remove buddy.'); + } + + return redirect()->route('legacy.mybuddies'); + } +} diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/User/ProfileController.php similarity index 78% rename from app/Http/Controllers/ProfileController.php rename to app/Http/Controllers/User/ProfileController.php index d2d80cb6..ed954c80 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/User/ProfileController.php @@ -1,7 +1,8 @@ user(); - // Core fields $validated = $request->validated(); logger()->debug('Profile update validated data', $validated); - // Username is read-only and must not be changed here. - // Use `name` for the real/display name field. if (isset($validated['name'])) { $user->name = $validated['name']; } - // Only allow setting email when we don't have one yet (legacy users) if (!empty($validated['email']) && empty($user->email)) { $user->email = $validated['email']; $user->email_verified_at = null; @@ -49,18 +40,15 @@ class ProfileController extends Controller $user->save(); - // Profile fields - target columns in `user_profiles` per spec $profileUpdates = []; if (!empty($validated['about'])) $profileUpdates['about'] = $validated['about']; - // website / legacy homepage if (!empty($validated['web'])) { $profileUpdates['website'] = $validated['web']; } elseif (!empty($validated['homepage'])) { $profileUpdates['website'] = $validated['homepage']; } - // Birthday -> store as birthdate $day = $validated['day'] ?? null; $month = $validated['month'] ?? null; $year = $validated['year'] ?? null; @@ -68,7 +56,6 @@ class ProfileController extends Controller $profileUpdates['birthdate'] = sprintf('%04d-%02d-%02d', (int)$year, (int)$month, (int)$day); } - // Gender normalization -> store as provided normalized value if (!empty($validated['gender'])) { $g = strtolower($validated['gender']); $map = ['m' => 'M', 'f' => 'F', 'n' => 'X', 'x' => 'X']; @@ -77,7 +64,6 @@ class ProfileController extends Controller if (!empty($validated['country'])) $profileUpdates['country_code'] = $validated['country']; - // Mailing and notify flags: normalize true/false when saving if (array_key_exists('mailing', $validated)) { $profileUpdates['mlist'] = filter_var($validated['mailing'], FILTER_VALIDATE_BOOLEAN) ? 1 : 0; } @@ -85,21 +71,14 @@ class ProfileController extends Controller $profileUpdates['friend_upload_notice'] = filter_var($validated['notify'], FILTER_VALIDATE_BOOLEAN) ? 1 : 0; } - // signature/description should be stored in their own columns if (isset($validated['signature'])) $profileUpdates['signature'] = $validated['signature']; if (isset($validated['description'])) $profileUpdates['description'] = $validated['description']; - // 'about' direct field (ensure explicit about wins when provided) if (isset($validated['about'])) $profileUpdates['about'] = $validated['about']; - // Files: avatar -> use AvatarService, emoticon and photo -> store to public disk if ($request->hasFile('avatar')) { try { - $hash = $avatarService->storeFromUploadedFile($user->id, $request->file('avatar')); - // store returned hash into profile avatar column - if (!empty($hash)) { - $profileUpdates['avatar'] = $hash; - } + $avatarService->storeFromUploadedFile($user->id, $request->file('avatar')); } catch (\Exception $e) { return Redirect::back()->with('error', 'Avatar processing failed: ' . $e->getMessage()); } @@ -118,7 +97,6 @@ class ProfileController extends Controller $file = $request->file('photo'); $fname = $file->getClientOriginalName(); $path = \Illuminate\Support\Facades\Storage::disk('public')->putFileAs('user-picture/'.$user->id, $file, $fname); - // store cover image filename in user_profiles.cover_image (fallback to users.picture) if (\Illuminate\Support\Facades\Schema::hasTable('user_profiles')) { $profileUpdates['cover_image'] = $fname; } else { @@ -128,7 +106,6 @@ class ProfileController extends Controller } } - // Persist profile updates now that files (avatar/cover) have been handled try { if (\Illuminate\Support\Facades\Schema::hasTable('user_profiles')) { if (!empty($profileUpdates)) { @@ -146,9 +123,6 @@ class ProfileController extends Controller return Redirect::to('/user')->with('status', 'profile-updated'); } - /** - * Delete the user's account. - */ public function destroy(Request $request): RedirectResponse { $request->validateWithBag('userDeletion', [ @@ -159,7 +133,6 @@ class ProfileController extends Controller Auth::logout(); - // Soft-delete the user (preserve record) — align with soft-delete policy. $user->delete(); $request->session()->invalidate(); @@ -168,9 +141,6 @@ class ProfileController extends Controller return Redirect::to('/'); } - /** - * Update the user's password. - */ public function password(Request $request): RedirectResponse { $request->validate([ diff --git a/app/Http/Controllers/User/ReceivedCommentsController.php b/app/Http/Controllers/User/ReceivedCommentsController.php new file mode 100644 index 00000000..51cc7f60 --- /dev/null +++ b/app/Http/Controllers/User/ReceivedCommentsController.php @@ -0,0 +1,27 @@ +user(); + if (! $user) { + return redirect()->route('login'); + } + + try { + $comments = app(\App\Services\LegacyService::class)->receivedComments($user->id); + } catch (\Throwable $e) { + $comments = collect(); + } + + return view('user.received-comments', [ + 'comments' => $comments, + ]); + } +} diff --git a/app/Http/Controllers/User/StatisticsController.php b/app/Http/Controllers/User/StatisticsController.php new file mode 100644 index 00000000..ea80010f --- /dev/null +++ b/app/Http/Controllers/User/StatisticsController.php @@ -0,0 +1,66 @@ +user()->id; + + $sort = (string) $request->query('sort', 'date'); + $allowed = ['date', 'name', 'dls', 'category', 'comments']; + if (! in_array($sort, $allowed, true)) { + $sort = 'date'; + } + + $categorySub = DB::table('artwork_category as ac') + ->join('categories as c', 'ac.category_id', '=', 'c.id') + ->select('ac.artwork_id', DB::raw('MIN(c.name) as category_name')) + ->groupBy('ac.artwork_id'); + + $query = DB::table('artworks as a') + ->leftJoinSub($categorySub, 'cat', function ($join) { + $join->on('a.id', '=', 'cat.artwork_id'); + }) + ->where('a.user_id', $userId) + ->select([ + 'a.*', + DB::raw('cat.category_name as category_name'), + ]) + ->selectRaw('(SELECT COUNT(*) FROM artwork_comments WHERE artwork_id = a.id) AS num_comments'); + + if ($sort === 'name') { + $query->orderBy('a.name', 'asc'); + } elseif ($sort === 'dls') { + $query->orderByDesc('a.dls'); + } elseif ($sort === 'category') { + $query->orderBy('cat.category_name', 'asc'); + } elseif ($sort === 'comments') { + $query->orderByDesc('num_comments'); + } else { + $query->orderByDesc('a.published_at')->orderByDesc('a.id'); + } + + $artworks = $query->paginate(20)->appends(['sort' => $sort]); + + $artworks->getCollection()->transform(function ($row) { + $thumb = ThumbnailPresenter::present($row, 'sm'); + $row->thumb_url = $thumb['url'] ?? ''; + $row->thumb_srcset = $thumb['srcset'] ?? null; + return $row; + }); + + return view('user.statistics', [ + 'artworks' => $artworks, + 'sort' => $sort, + 'page_title' => 'Artwork Statistics', + ]); + } +} diff --git a/app/Http/Controllers/User/TodayDownloadsController.php b/app/Http/Controllers/User/TodayDownloadsController.php new file mode 100644 index 00000000..e688bdac --- /dev/null +++ b/app/Http/Controllers/User/TodayDownloadsController.php @@ -0,0 +1,64 @@ +toDateString(); + + $query = ArtworkDownload::with(['artwork']) + ->whereDate('created_at', $today) + ->whereHas('artwork', function ($q) { + $q->public()->published()->whereNull('deleted_at'); + }) + ->selectRaw('artwork_id, COUNT(*) as num_downloads') + ->groupBy('artwork_id') + ->orderByDesc('num_downloads'); + + $paginator = $query->paginate($hits)->withQueryString(); + + $paginator->getCollection()->transform(function ($row) { + $art = $row->artwork ?? null; + if (! $art && isset($row->artwork_id)) { + $art = \App\Models\Artwork::find($row->artwork_id); + } + + $name = $art->title ?? null; + $picture = $art->file_name ?? null; + $ext = pathinfo($picture ?? '', PATHINFO_EXTENSION) ?: 'jpg'; + $encoded = null; + $present = $art ? \App\Services\ThumbnailPresenter::present($art, 'md') : null; + $thumb = $present ? $present['url'] : '/gfx/sb_join.jpg'; + $categoryId = $art->categories->first()->id ?? null; + + return (object) [ + 'id' => $art->id ?? null, + 'name' => $name, + 'picture' => $picture, + 'slug' => $art->slug ?? Str::slug($name ?? ''), + 'ext' => $ext, + 'encoded' => $encoded, + 'thumb' => $thumb, + 'thumb_srcset' => $thumb, + 'category' => $categoryId, + 'num_downloads' => $row->num_downloads ?? 0, + 'gid_num' => $categoryId ? ((int) $categoryId % 5) * 5 : 0, + ]; + }); + + $page_title = 'Today Downloaded Artworks'; + + return view('web.browse', ['page_title' => $page_title, 'artworks' => $paginator]); + } +} diff --git a/app/Http/Controllers/User/TodayInHistoryController.php b/app/Http/Controllers/User/TodayInHistoryController.php new file mode 100644 index 00000000..524f9d30 --- /dev/null +++ b/app/Http/Controllers/User/TodayInHistoryController.php @@ -0,0 +1,53 @@ +leftJoin('artworks as t1', 't0.artwork_id', '=', 't1.id') + ->join('categories as t2', 't1.category', '=', 't2.id') + ->where('t1.approved', 1) + ->whereRaw('MONTH(t0.post_date) = MONTH(CURRENT_DATE())') + ->whereRaw('DAY(t0.post_date) = DAY(CURRENT_DATE())') + ->select('t1.id', 't1.name', 't1.picture', 't1.uname', 't1.category', DB::raw('t2.name as category_name')); + + $artworks = $base->orderBy('t0.post_date','desc')->paginate($hits); + } catch (\Throwable $e) { + $artworks = null; + } + + if ($artworks && method_exists($artworks, 'getCollection')) { + $artworks->getCollection()->transform(function ($row) { + $row->ext = pathinfo($row->picture ?? '', PATHINFO_EXTENSION) ?: 'jpg'; + $row->encoded = \App\Services\LegacyService::encode($row->id); + try { + $art = \App\Models\Artwork::find($row->id); + $present = \App\Services\ThumbnailPresenter::present($art ?: (array) $row, 'md'); + $row->thumb_url = $present['url']; + $row->thumb_srcset = $present['srcset']; + } catch (\Throwable $e) { + $present = \App\Services\ThumbnailPresenter::present((array) $row, 'md'); + $row->thumb_url = $present['url']; + $row->thumb_srcset = $present['srcset']; + } + $row->gid_num = ((int)($row->category ?? 0) % 5) * 5; + return $row; + }); + } + + return view('user.today-in-history', [ + 'artworks' => $artworks, + 'page_title' => 'Popular on this day in history', + ]); + } +} diff --git a/app/Http/Controllers/User/TopAuthorsController.php b/app/Http/Controllers/User/TopAuthorsController.php new file mode 100644 index 00000000..314afd4e --- /dev/null +++ b/app/Http/Controllers/User/TopAuthorsController.php @@ -0,0 +1,57 @@ +query('metric', 'views')); + + if (! in_array($metric, ['views', 'downloads'])) { + $metric = 'views'; + } + + $sub = Artwork::query() + ->select('artworks.user_id') + ->join('artwork_stats', 'artwork_stats.artwork_id', '=', 'artworks.id') + ->where('artworks.is_public', true) + ->where('artworks.is_approved', true) + ->whereNotNull('artworks.published_at') + ->where('artworks.published_at', '<=', now()) + ->whereNull('artworks.deleted_at') + ->selectRaw('artworks.user_id, SUM(artwork_stats.' . $metric . ') as total_metric, MAX(artworks.published_at) as latest_published') + ->groupBy('artworks.user_id'); + + $query = DB::table(DB::raw('(' . $sub->toSql() . ') as t')) + ->mergeBindings($sub->getQuery()) + ->join('users as u', 'u.id', '=', 't.user_id') + ->select('u.id as user_id', 'u.name as uname', 'u.username', 't.total_metric', 't.latest_published') + ->orderByDesc('t.total_metric') + ->orderByDesc('t.latest_published'); + + $authors = $query->paginate($perPage)->withQueryString(); + + $authors->getCollection()->transform(function ($row) use ($metric) { + return (object) [ + 'user_id' => $row->user_id, + 'uname' => $row->uname, + 'username' => $row->username, + 'total' => (int) $row->total_metric, + 'metric' => $metric, + ]; + }); + + $page_title = 'Top Authors'; + + return view('user.top-authors', compact('page_title', 'authors', 'metric')); + } +} diff --git a/app/Http/Controllers/User/TopFavouritesController.php b/app/Http/Controllers/User/TopFavouritesController.php new file mode 100644 index 00000000..b0c2ac0a --- /dev/null +++ b/app/Http/Controllers/User/TopFavouritesController.php @@ -0,0 +1,56 @@ +query('page', 1)); + + $base = DB::table('artworks_favourites as t1') + ->rightJoin('wallz as t2', 't1.artwork_id', '=', 't2.id') + ->where('t2.approved', 1) + ->select('t2.id', 't2.name', 't2.picture', 't2.category', DB::raw('COUNT(*) as num')) + ->groupBy('t1.artwork_id'); + + try { + $paginator = (clone $base)->orderBy('num', 'desc')->paginate($hits)->withQueryString(); + } catch (\Throwable $e) { + $paginator = collect(); + } + + if ($paginator && method_exists($paginator, 'getCollection')) { + $paginator->getCollection()->transform(function ($row) { + $row->slug = $row->slug ?? Str::slug($row->name ?? ''); + $ext = pathinfo($row->picture ?? '', PATHINFO_EXTENSION) ?: 'jpg'; + $encoded = \App\Helpers\Thumb::encodeId((int) $row->id); + $row->encoded = $encoded; + $row->ext = $ext; + try { + $art = \App\Models\Artwork::find($row->id); + $present = \App\Services\ThumbnailPresenter::present($art ?: (array) $row, 'md'); + $row->thumb = $row->thumb ?? $present['url']; + $row->thumb_srcset = $row->thumb_srcset ?? ($present['srcset'] ?? $present['url']); + } catch (\Throwable $e) { + $present = \App\Services\ThumbnailPresenter::present((array) $row, 'md'); + $row->thumb = $row->thumb ?? $present['url']; + $row->thumb_srcset = $row->thumb_srcset ?? ($present['srcset'] ?? $present['url']); + } + $row->gid_num = ((int)($row->category ?? 0) % 5) * 5; + return $row; + }); + } + + $page_title = 'Top Favourites'; + + return view('user.top-favourites', ['page_title' => $page_title, 'artworks' => $paginator]); + } +} diff --git a/app/Http/Controllers/User/UserController.php b/app/Http/Controllers/User/UserController.php new file mode 100644 index 00000000..dda65e6a --- /dev/null +++ b/app/Http/Controllers/User/UserController.php @@ -0,0 +1,27 @@ +user(); + if (! $user) { + return redirect()->route('login'); + } + + try { + $profile = app(\App\Services\LegacyService::class)->userAccount($user->id); + } catch (\Throwable $e) { + $profile = null; + } + + return view('user.user', [ + 'profile' => $profile, + ]); + } +} diff --git a/app/Http/Controllers/Web/ArtController.php b/app/Http/Controllers/Web/ArtController.php new file mode 100644 index 00000000..c0fd545f --- /dev/null +++ b/app/Http/Controllers/Web/ArtController.php @@ -0,0 +1,61 @@ +legacy = $legacy; + } + + public function show(Request $request, $id, $slug = null) + { + if ($request->isMethod('post') && $request->input('action') === 'store_comment') { + if (auth()->check()) { + try { + DB::table('artwork_comments')->insert([ + 'artwork_id' => (int)$id, + 'owner_user_id' => (int)($request->user()->id ?? 0), + 'user_id' => (int)$request->user()->id, + 'date' => now()->toDateString(), + 'time' => now()->toTimeString(), + 'description' => (string)$request->input('comment_text'), + ]); + } catch (\Throwable $e) { + // ignore DB errors for now + } + } + return redirect()->back(); + } + + $data = $this->legacy->getArtwork((int) $id); + + if (! $data || empty($data['artwork'])) { + return view('shared.placeholder', ['title' => 'Artwork Not Found']); + } + + try { + $comments = DB::table('artwork_comments as t1') + ->rightJoin('users as t2', 't1.user_id', '=', 't2.user_id') + ->select('t1.description', 't1.date', 't1.time', 't2.uname', 't2.signature', 't2.icon', 't2.user_id') + ->where('t1.artwork_id', (int)$id) + ->where('t1.user_id', '>', 0) + ->orderBy('t1.comment_id') + ->get(); + } catch (\Throwable $e) { + $comments = collect(); + } + + $data['comments'] = $comments; + + return view('web.art', $data); + } +} diff --git a/app/Http/Controllers/BrowseCategoriesController.php b/app/Http/Controllers/Web/BrowseCategoriesController.php similarity index 78% rename from app/Http/Controllers/BrowseCategoriesController.php rename to app/Http/Controllers/Web/BrowseCategoriesController.php index 1dc21950..f45bbed6 100644 --- a/app/Http/Controllers/BrowseCategoriesController.php +++ b/app/Http/Controllers/Web/BrowseCategoriesController.php @@ -1,7 +1,8 @@ orderBy('id')->get(); - // Prepare categories grouped by content type and a flat list of root categories $categoriesByType = []; $categories = collect(); foreach ($contentTypes as $ct) { $rootCats = $ct->rootCategories; foreach ($rootCats as $cat) { - // Attach subcategories $cat->subcategories = $cat->children; $categories->push($cat); } diff --git a/app/Http/Controllers/BrowseGalleryController.php b/app/Http/Controllers/Web/BrowseGalleryController.php similarity index 96% rename from app/Http/Controllers/BrowseGalleryController.php rename to app/Http/Controllers/Web/BrowseGalleryController.php index 78509a23..1660ed4e 100644 --- a/app/Http/Controllers/BrowseGalleryController.php +++ b/app/Http/Controllers/Web/BrowseGalleryController.php @@ -1,14 +1,15 @@ show( + return app(\App\Http\Controllers\ArtController::class)->show( $request, strtolower($contentTypeSlug), trim($categoryPath, '/'), diff --git a/app/Http/Controllers/Web/CategoryController.php b/app/Http/Controllers/Web/CategoryController.php new file mode 100644 index 00000000..385eeae7 --- /dev/null +++ b/app/Http/Controllers/Web/CategoryController.php @@ -0,0 +1,100 @@ +artworkService = $artworkService; + } + + public function show(Request $request, $id, $slug = null, $group = null) + { + $path = trim($request->path(), '/'); + $segments = array_values(array_filter(explode('/', $path))); + + if (count($segments) < 2 || strtolower($segments[0]) !== 'category') { + return view('shared.placeholder'); + } + + $parts = array_slice($segments, 1); + + $first = $parts[0] ?? null; + if ($first !== null && ctype_digit((string) $first)) { + try { + $category = Category::findOrFail((int) $first); + $contentTypeSlug = $category->contentType->slug ?? null; + $canonical = '/' . strtolower($contentTypeSlug) . '/' . $category->full_slug_path; + return redirect($canonical, 301); + } catch (ModelNotFoundException $e) { + abort(404); + } + } + + $contentTypeSlug = array_shift($parts); + $slugs = array_merge([$contentTypeSlug], $parts); + + $perPage = (int) $request->get('per_page', 40); + $sort = (string) $request->get('sort', 'latest'); + + try { + $artworks = $this->artworkService->getArtworksByCategoryPath($slugs, $perPage, $sort); + } catch (ModelNotFoundException $e) { + abort(404); + } + + try { + $category = Category::whereHas('contentType', function ($q) use ($contentTypeSlug) { + $q->where('slug', strtolower($contentTypeSlug)); + })->whereNull('parent_id')->where('slug', strtolower($parts[0] ?? ''))->first(); + + if ($category && count($parts) > 1) { + $cur = $category; + foreach (array_slice($parts, 1) as $slugPart) { + $cur = $cur->children()->where('slug', strtolower($slugPart))->first(); + if (! $cur) { + abort(404); + } + } + $category = $cur; + } + } catch (\Throwable $e) { + $category = null; + } + + if (! $category) { + abort(404); + } + + $subcategories = $category->children()->orderBy('sort_order')->orderBy('name')->get(); + + $page_title = $category->name; + $page_meta_description = $category->description ?? ($category->contentType->name . ' artworks on Skinbase'); + $page_meta_keywords = strtolower($category->contentType->slug) . ', skinbase, artworks, wallpapers, skins, photography'; + + return view('web.category', compact( + 'page_title', + 'page_meta_description', + 'page_meta_keywords', + 'group', + 'category', + 'subcategories', + 'artworks' + )); + } + + public function browseCategories() + { + $data = app(\App\Services\LegacyService::class)->browseCategories(); + return view('web.categories', $data); + } +} diff --git a/app/Http/Controllers/Web/DailyUploadsController.php b/app/Http/Controllers/Web/DailyUploadsController.php new file mode 100644 index 00000000..663e461f --- /dev/null +++ b/app/Http/Controllers/Web/DailyUploadsController.php @@ -0,0 +1,94 @@ +artworks = $artworks; + } + + public function index(Request $request) + { + $isAjax = $request->boolean('ajax'); + $datum = $request->query('datum'); + + if ($isAjax && $datum) { + $arts = $this->fetchByDate($datum); + return view('web.partials.daily-uploads-grid', ['arts' => $arts])->render(); + } + + $dates = []; + for ($x = 0; $x > -15; $x--) { + $ts = strtotime(sprintf('%+d days', $x)); + $dates[] = [ + 'iso' => date('Y-m-d', $ts), + 'label' => date('d. F Y', $ts), + ]; + } + + $recent = $this->fetchRecent(); + + return view('web.daily-uploads', [ + 'dates' => $dates, + 'recent' => $recent, + 'page_title' => 'Daily Uploads', + ]); + } + + private function fetchByDate(string $date) + { + $ars = Artwork::public() + ->published() + ->whereDate('published_at', $date) + ->orderByDesc('published_at') + ->with(['user:id,name', 'categories' => function ($q) { + $q->select('categories.id', 'categories.name', 'categories.sort_order'); + }]) + ->get(); + + return $this->prepareArts($ars); + } + + private function fetchRecent() + { + $start = now()->subDays(7)->startOfDay(); + + $ars = Artwork::public() + ->published() + ->where('published_at', '>=', $start) + ->orderByDesc('published_at') + ->with(['user:id,name', 'categories' => function ($q) { + $q->select('categories.id', 'categories.name', 'categories.sort_order'); + }]) + ->get(); + + return $this->prepareArts($ars); + } + + private function prepareArts($ars) + { + return $ars->map(function (Artwork $ar) { + $primaryCategory = $ar->categories->sortBy('sort_order')->first(); + $present = \App\Services\ThumbnailPresenter::present($ar, 'md'); + + return (object) [ + 'id' => $ar->id, + 'name' => $ar->title, + 'thumb' => $present['url'], + 'thumb_srcset' => $present['srcset'] ?? $present['url'], + 'gid_num' => $primaryCategory ? ((int) $primaryCategory->id % 5) * 5 : 0, + 'category_name' => $primaryCategory->name ?? '', + 'uname' => $ar->user->name ?? 'Skinbase', + ]; + }); + } +} diff --git a/app/Http/Controllers/Web/FeaturedArtworksController.php b/app/Http/Controllers/Web/FeaturedArtworksController.php new file mode 100644 index 00000000..23dbf7cf --- /dev/null +++ b/app/Http/Controllers/Web/FeaturedArtworksController.php @@ -0,0 +1,62 @@ +artworks = $artworks; + } + + public function index(Request $request) + { + $perPage = 39; + + $type = (int) ($request->query('type', 4)); + + $typeFilter = $type === 4 ? null : $type; + + $artworks = $this->artworks->getFeaturedArtworks($typeFilter, $perPage); + + $artworks->getCollection()->transform(function (Artwork $artwork) { + $primaryCategory = $artwork->categories->sortBy('sort_order')->first(); + $categoryName = $primaryCategory->name ?? ''; + $gid = $primaryCategory ? ((int) $primaryCategory->id % 5) * 5 : 0; + $present = \App\Services\ThumbnailPresenter::present($artwork, 'md'); + + return (object) [ + 'id' => $artwork->id, + 'name' => $artwork->title, + 'category_name' => $categoryName, + 'gid_num' => $gid, + 'thumb_url' => $present['url'], + 'thumb_srcset' => $present['srcset'] ?? $present['url'], + 'uname' => $artwork->user->name ?? 'Skinbase', + ]; + }); + + $artworkTypes = [ + 1 => 'Bronze Awards', + 2 => 'Silver Awards', + 3 => 'Gold Awards', + 4 => 'Featured Artworks', + ]; + + $pageTitle = $artworkTypes[$type] ?? 'Featured Artworks'; + + return view('web.featured-artworks', [ + 'artworks' => $artworks, + 'type' => $type, + 'artworkTypes' => $artworkTypes, + 'page_title' => $pageTitle, + ]); + } +} diff --git a/app/Http/Controllers/Web/GalleryController.php b/app/Http/Controllers/Web/GalleryController.php new file mode 100644 index 00000000..87945079 --- /dev/null +++ b/app/Http/Controllers/Web/GalleryController.php @@ -0,0 +1,41 @@ +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, + ]); + } +} diff --git a/app/Http/Controllers/Web/HomeController.php b/app/Http/Controllers/Web/HomeController.php new file mode 100644 index 00000000..19f02566 --- /dev/null +++ b/app/Http/Controllers/Web/HomeController.php @@ -0,0 +1,80 @@ +artworks = $artworks; + } + + public function index(Request $request) + { + $page_title = 'Skinbase - Photography, Skins & Wallpapers'; + $page_meta_description = 'Skinbase legacy home, rendered via Laravel.'; + $page_meta_keywords = 'wallpapers, skins, photography, community'; + + $featuredResult = $this->artworks->getFeaturedArtworks(null, 39); + if ($featuredResult instanceof \Illuminate\Pagination\LengthAwarePaginator) { + $featured = $featuredResult->getCollection()->first(); + } elseif (is_array($featuredResult)) { + $featured = $featuredResult[0] ?? null; + } else { + $featured = method_exists($featuredResult, 'first') ? $featuredResult->first() : $featuredResult; + } + + $memberFeatured = $featured; + + $latestUploads = $this->artworks->getLatestArtworks(20); + + // Forum news (root forum section id 2876) + $forumNews = DB::table('forum_topics as t1') + ->leftJoin('users as u', 't1.user_id', '=', 'u.user_id') + ->select('t1.topic_id', 't1.topic', 'u.uname', 't1.post_date', 't1.preview') + ->where('t1.root_id', 2876) + ->where('t1.privilege', '<', 4) + ->orderBy('t1.post_date', 'desc') + ->limit(8) + ->get(); + + // Our news (latest site news) + $ourNews = DB::table('news as t1') + ->join('news_categories as c', 't1.category_id', '=', 'c.category_id') + ->join('users as u', 't1.user_id', '=', 'u.user_id') + ->selectRaw('t1.news_id, t1.headline, t1.user_id, t1.picture, t1.preview, u.uname, t1.create_date, t1.views, c.category_name, (SELECT COUNT(*) FROM news_comments WHERE news_id = t1.news_id) AS num_comments') + ->orderBy('t1.create_date', 'desc') + ->limit(5) + ->get(); + + // Latest forum activity (exclude rootless and news root) + $latestForumActivity = DB::table('forum_topics as t1') + ->selectRaw('t1.topic_id, t1.topic, (SELECT COUNT(*) FROM forum_posts WHERE topic_id = t1.topic_id) AS numPosts') + ->where('t1.root_id', '<>', 0) + ->where('t1.root_id', '<>', 2876) + ->where('t1.privilege', '<', 4) + ->orderBy('t1.last_update', 'desc') + ->orderBy('t1.post_date', 'desc') + ->limit(10) + ->get(); + + return view('web.home', compact( + 'page_title', + 'page_meta_description', + 'page_meta_keywords', + 'featured', + 'memberFeatured', + 'latestUploads', + 'forumNews', + 'ourNews', + 'latestForumActivity' + )); + } +} diff --git a/app/Http/Requests/AvatarUploadRequest.php b/app/Http/Requests/AvatarUploadRequest.php new file mode 100644 index 00000000..cbc1e2c3 --- /dev/null +++ b/app/Http/Requests/AvatarUploadRequest.php @@ -0,0 +1,27 @@ +user() !== null; + } + + public function rules(): array + { + return [ + 'avatar' => [ + 'required', + 'file', + 'image', + 'max:2048', + 'mimes:jpg,jpeg,png,webp', + 'mimetypes:image/jpeg,image/png,image/webp', + ], + ]; + } +} diff --git a/app/Http/Requests/Manage/ManageArtworkUpdateRequest.php b/app/Http/Requests/Manage/ManageArtworkUpdateRequest.php index 186d8054..ade76dfb 100644 --- a/app/Http/Requests/Manage/ManageArtworkUpdateRequest.php +++ b/app/Http/Requests/Manage/ManageArtworkUpdateRequest.php @@ -40,7 +40,7 @@ final class ManageArtworkUpdateRequest extends FormRequest public function rules(): array { return [ - 'name' => 'required|string|max:255', + 'title' => 'required|string|max:255', 'section' => 'nullable|integer', 'description' => 'nullable|string', 'artwork' => 'nullable|file|image', diff --git a/app/Http/Requests/ProfileUpdateRequest.php b/app/Http/Requests/ProfileUpdateRequest.php index 588d90dd..d4815405 100644 --- a/app/Http/Requests/ProfileUpdateRequest.php +++ b/app/Http/Requests/ProfileUpdateRequest.php @@ -37,7 +37,7 @@ class ProfileUpdateRequest extends FormRequest 'about' => ['nullable', 'string'], 'signature' => ['nullable', 'string'], 'description' => ['nullable', 'string'], - 'avatar' => ['nullable', 'image', 'max:2048', 'mimes:jpg,jpeg,png,webp'], + 'avatar' => ['nullable', 'file', 'image', 'max:2048', 'mimes:jpg,jpeg,png,webp', 'mimetypes:image/jpeg,image/png,image/webp'], 'emoticon' => ['nullable', 'image', 'max:2048', 'mimes:jpg,jpeg,png,webp'], 'photo' => ['nullable', 'image', 'max:2048', 'mimes:jpg,jpeg,png,webp'], ]; diff --git a/app/Models/User.php b/app/Models/User.php index fc76f6cf..d6799291 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -4,6 +4,7 @@ namespace App\Models; // use Illuminate\Contracts\Auth\MustVerifyEmail; use Illuminate\Database\Eloquent\Factories\HasFactory; +use Illuminate\Database\Eloquent\Relations\HasOne; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Foundation\Auth\User as Authenticatable; @@ -55,6 +56,11 @@ class User extends Authenticatable return $this->hasMany(Artwork::class); } + public function profile(): HasOne + { + return $this->hasOne(UserProfile::class, 'user_id'); + } + public function hasRole(string $role): bool { return strtolower((string) ($this->role ?? '')) === strtolower($role); diff --git a/app/Models/UserProfile.php b/app/Models/UserProfile.php index 46c06ce4..7bb3de69 100644 --- a/app/Models/UserProfile.php +++ b/app/Models/UserProfile.php @@ -4,7 +4,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; -use Illuminate\Support\Facades\Storage; +use App\Support\AvatarUrl; class UserProfile extends Model { @@ -18,7 +18,7 @@ class UserProfile extends Model 'about', 'signature', 'description', - 'avatar', + 'avatar_legacy', 'avatar_hash', 'avatar_mime', 'avatar_updated_at', @@ -43,27 +43,12 @@ class UserProfile extends Model return $this->belongsTo(User::class, 'user_id'); } - /** - * Return a public URL for the avatar when stored on the `public` disk under `avatars/`. - */ public function getAvatarUrlAttribute(): ?string { - if (empty($this->avatar)) { + if (empty($this->user_id)) { return null; } - // If the stored value already looks like a full URL, return it. - if (preg_match('#^https?://#i', $this->avatar)) { - return $this->avatar; - } - - // Prefer `public` disk and avatars folder. - $path = 'avatars/' . ltrim($this->avatar, '/'); - if (Storage::disk('public')->exists($path)) { - return Storage::disk('public')->url($path); - } - - // Fallback: return null if not found - return null; + return AvatarUrl::forUser((int) $this->user_id, $this->avatar_hash, 128); } } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 1155fb19..8a4f9edd 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -35,7 +35,7 @@ class AppServiceProvider extends ServiceProvider // Provide toolbar counts and user info to layout views (port of legacy toolbar logic) View::composer(['layouts.nova', 'layouts.nova.*'], function ($view) { $uploadCount = $favCount = $msgCount = $noticeCount = 0; - $avatar = null; + $avatarHash = null; $displayName = null; $userId = null; @@ -72,15 +72,15 @@ class AppServiceProvider extends ServiceProvider try { $profile = DB::table('user_profiles')->where('user_id', $userId)->first(); - $avatar = $profile->avatar ?? null; + $avatarHash = $profile->avatar_hash ?? null; } catch (\Throwable $e) { - $avatar = null; + $avatarHash = null; } $displayName = Auth::user()->name ?: (Auth::user()->username ?? ''); } - $view->with(compact('userId','uploadCount', 'favCount', 'msgCount', 'noticeCount', 'avatar', 'displayName')); + $view->with(compact('userId','uploadCount', 'favCount', 'msgCount', 'noticeCount', 'avatarHash', 'displayName')); }); } diff --git a/app/Services/AvatarService.php b/app/Services/AvatarService.php index 1430ab98..643dddd1 100644 --- a/app/Services/AvatarService.php +++ b/app/Services/AvatarService.php @@ -2,15 +2,22 @@ namespace App\Services; -use Illuminate\Support\Facades\Storage; -use Illuminate\Support\Facades\DB; -use Intervention\Image\ImageManagerStatic as Image; -use RuntimeException; +use App\Models\UserProfile; use Carbon\Carbon; use Illuminate\Http\UploadedFile; +use Illuminate\Support\Facades\Storage; +use Intervention\Image\Drivers\Gd\Driver as GdDriver; +use Intervention\Image\Drivers\Imagick\Driver as ImagickDriver; +use Intervention\Image\Encoders\WebpEncoder; +use Intervention\Image\ImageManager; +use RuntimeException; class AvatarService { + private const ALLOWED_EXTENSIONS = ['jpg', 'jpeg', 'png', 'webp']; + + private const ALLOWED_MIME_TYPES = ['image/jpeg', 'image/png', 'image/webp']; + protected $sizes = [ 'xs' => 32, 'sm' => 64, @@ -21,149 +28,234 @@ class AvatarService protected $quality = 85; + private ?ImageManager $manager = null; + public function __construct() { - // Guard: if Intervention Image is not installed, defer error until actual use - if (class_exists(\Intervention\Image\ImageManagerStatic::class)) { - try { - Image::configure(['driver' => extension_loaded('gd') ? 'gd' : 'imagick']); - $this->imageAvailable = true; - } catch (\Throwable $e) { - // If configuration fails, treat as unavailable and log for diagnostics - logger()->warning('Intervention Image present but configuration failed: '.$e->getMessage()); - $this->imageAvailable = false; - } - } else { - $this->imageAvailable = false; + $configuredSizes = array_values(array_filter((array) config('avatars.sizes', [32, 64, 128, 256, 512]), static fn ($size) => (int) $size > 0)); + if ($configuredSizes !== []) { + $this->sizes = array_fill_keys(array_map('strval', $configuredSizes), null); + $this->sizes = array_combine(array_keys($this->sizes), $configuredSizes); + } + + $this->quality = (int) config('avatars.quality', 85); + + try { + $this->manager = extension_loaded('gd') + ? new ImageManager(new GdDriver()) + : new ImageManager(new ImagickDriver()); + } catch (\Throwable $e) { + logger()->warning('Avatar image manager configuration failed: ' . $e->getMessage()); + $this->manager = null; } } - /** - * Process an uploaded file for a user and store webp sizes. - * Returns the computed sha1 hash. - * - * @param int $userId - * @param UploadedFile $file - * @return string sha1 hash - */ public function storeFromUploadedFile(int $userId, UploadedFile $file): string { - if (! $this->imageAvailable) { - throw new RuntimeException('Intervention Image is not available. If you just installed the package, restart your PHP process (php artisan serve or PHP-FPM) and run `composer dump-autoload -o`.'); + $this->assertImageManagerAvailable(); + $this->assertStorageIsAllowed(); + $this->assertSecureImageUpload($file); + + $binary = file_get_contents($file->getRealPath()); + if ($binary === false || $binary === '') { + throw new RuntimeException('Uploaded avatar file is empty or unreadable.'); } - // Load image and re-encode to webp after validating - try { - $img = Image::make($file->getRealPath()); - } catch (\Throwable $e) { - throw new RuntimeException('Failed to read uploaded image: '.$e->getMessage()); - } - - // Ensure square center crop per spec - $max = max($img->width(), $img->height()); - $img->fit($max, $max); - - $basePath = "avatars/{$userId}"; - Storage::disk('public')->makeDirectory($basePath); - - // Save original as webp - $originalData = (string) $img->encode('webp', $this->quality); - Storage::disk('public')->put($basePath . '/original.webp', $originalData); - - // Generate sizes - foreach ($this->sizes as $name => $size) { - $resized = $img->resize($size, $size, function ($constraint) { - $constraint->upsize(); - })->encode('webp', $this->quality); - Storage::disk('public')->put("{$basePath}/{$size}.webp", (string)$resized); - } - - $hash = sha1($originalData); - $mime = 'image/webp'; - - // Persist metadata to user_profiles if exists, otherwise users table fallbacks - if (SchemaHasTable('user_profiles')) { - DB::table('user_profiles')->where('user_id', $userId)->update([ - 'avatar_hash' => $hash, - 'avatar_updated_at' => Carbon::now(), - 'avatar_mime' => $mime, - ]); - } else { - DB::table('users')->where('id', $userId)->update([ - 'avatar_hash' => $hash, - 'avatar_updated_at' => Carbon::now(), - 'avatar_mime' => $mime, - ]); - } - - return $hash; + return $this->storeFromBinary($userId, $binary); } - /** - * Process a legacy file path for a user (path-to-file). - * Returns sha1 or null when missing. - * - * @param int $userId - * @param string $path Absolute filesystem path - * @return string|null - */ public function storeFromLegacyFile(int $userId, string $path): ?string { + $this->assertImageManagerAvailable(); + $this->assertStorageIsAllowed(); + if (!file_exists($path) || !is_readable($path)) { return null; } - try { - $img = Image::make($path); - } catch (\Exception $e) { + $binary = file_get_contents($path); + if ($binary === false || $binary === '') { return null; } - $max = max($img->width(), $img->height()); - $img->fit($max, $max); + return $this->storeFromBinary($userId, $binary); + } + private function storeFromBinary(int $userId, string $binary): string + { + $image = $this->readImageFromBinary($binary); + $image = $this->normalizeImage($image); + + $diskName = (string) config('avatars.disk', 's3'); + $disk = Storage::disk($diskName); $basePath = "avatars/{$userId}"; - Storage::disk('public')->makeDirectory($basePath); - $originalData = (string) $img->encode('webp', $this->quality); - Storage::disk('public')->put($basePath . '/original.webp', $originalData); + $hashSeed = ''; + foreach ($this->sizes as $size) { + $variant = $image->cover($size, $size); + $encoded = (string) $variant->encode(new WebpEncoder($this->quality)); + $disk->put("{$basePath}/{$size}.webp", $encoded, [ + 'visibility' => 'public', + 'CacheControl' => 'public, max-age=31536000, immutable', + 'ContentType' => 'image/webp', + ]); - foreach ($this->sizes as $name => $size) { - $resized = $img->resize($size, $size, function ($constraint) { - $constraint->upsize(); - })->encode('webp', $this->quality); - Storage::disk('public')->put("{$basePath}/{$size}.webp", (string)$resized); + if ($size === 128) { + $hashSeed = $encoded; + } } - $hash = sha1($originalData); - $mime = 'image/webp'; - - if (SchemaHasTable('user_profiles')) { - DB::table('user_profiles')->where('user_id', $userId)->update([ - 'avatar_hash' => $hash, - 'avatar_updated_at' => Carbon::now(), - 'avatar_mime' => $mime, - ]); - } else { - DB::table('users')->where('id', $userId)->update([ - 'avatar_hash' => $hash, - 'avatar_updated_at' => Carbon::now(), - 'avatar_mime' => $mime, - ]); + if ($hashSeed === '') { + throw new RuntimeException('Avatar processing failed to generate a hash seed.'); } + $hash = hash('sha256', $hashSeed); + $this->updateProfileMetadata($userId, $hash); + return $hash; } -} -/** - * Helper: check for table existence without importing Schema facade repeatedly - */ -function SchemaHasTable(string $name): bool -{ - try { - return \Illuminate\Support\Facades\Schema::hasTable($name); - } catch (\Throwable $e) { - return false; + private function normalizeImage($image) + { + try { + $core = $image->getCore(); + $isImagickCore = is_object($core) && strtolower(get_class($core)) === 'imagick'; + if ($isImagickCore) { + try { + $core->stripImage(); + } catch (\Throwable $_) { + } + + try { + $colorSpaceRgb = defined('\\Imagick::COLORSPACE_RGB') ? constant('\\Imagick::COLORSPACE_RGB') : null; + $colorSpaceSRgb = defined('\\Imagick::COLORSPACE_SRGB') ? constant('\\Imagick::COLORSPACE_SRGB') : null; + if (is_int($colorSpaceRgb)) { + $core->setImageColorspace($colorSpaceRgb); + } elseif (is_int($colorSpaceSRgb)) { + $core->setImageColorspace($colorSpaceSRgb); + } + } catch (\Throwable $_) { + } + + try { + $alphaRemove = defined('\\Imagick::ALPHACHANNEL_REMOVE') ? constant('\\Imagick::ALPHACHANNEL_REMOVE') : null; + if (is_int($alphaRemove)) { + $core->setImageAlphaChannel($alphaRemove); + } + } catch (\Throwable $_) { + } + + try { + $core->setBackgroundColor('white'); + $layerFlatten = defined('\\Imagick::LAYERMETHOD_FLATTEN') ? constant('\\Imagick::LAYERMETHOD_FLATTEN') : null; + $flattened = is_int($layerFlatten) ? $core->mergeImageLayers($layerFlatten) : null; + if (is_object($flattened) && strtolower(get_class($flattened)) === 'imagick') { + $core->clear(); + $core->destroy(); + $image = $this->manager->read((string) $flattened->getImageBlob()); + } + } catch (\Throwable $_) { + } + + return $image; + } + + $isGdCore = is_resource($core) || (is_object($core) && strtolower(get_class($core)) === 'gdimage'); + if ($isGdCore) { + $width = imagesx($core); + $height = imagesy($core); + if ($width > 0 && $height > 0) { + $flattened = imagecreatetruecolor($width, $height); + if ($flattened !== false) { + $white = imagecolorallocate($flattened, 255, 255, 255); + imagefilledrectangle($flattened, 0, 0, $width, $height, $white); + imagecopy($flattened, $core, 0, 0, 0, 0, $width, $height); + + ob_start(); + imagepng($flattened); + $pngBinary = (string) ob_get_clean(); + imagedestroy($flattened); + + if ($pngBinary !== '') { + return $this->manager->read($pngBinary); + } + } + } + } + } catch (\Throwable $_) { + } + + return $image; + } + + private function readImageFromBinary(string $binary) + { + try { + return $this->manager->read($binary); + } catch (\Throwable $e) { + throw new RuntimeException('Failed to decode uploaded image.'); + } + } + + private function updateProfileMetadata(int $userId, string $hash): void + { + UserProfile::query()->updateOrCreate( + ['user_id' => $userId], + [ + 'avatar_hash' => $hash, + 'avatar_mime' => 'image/webp', + 'avatar_updated_at' => Carbon::now(), + ] + ); + } + + private function assertImageManagerAvailable(): void + { + if ($this->manager !== null) { + return; + } + + throw new RuntimeException('Avatar image processing is not available on this environment.'); + } + + private function assertStorageIsAllowed(): void + { + if (!app()->environment('production')) { + return; + } + + $diskName = (string) config('avatars.disk', 's3'); + if (in_array($diskName, ['local', 'public'], true)) { + throw new RuntimeException('Production avatar storage must use object storage, not local/public disks.'); + } + } + + private function assertSecureImageUpload(UploadedFile $file): void + { + $extension = strtolower((string) $file->getClientOriginalExtension()); + if (!in_array($extension, self::ALLOWED_EXTENSIONS, true)) { + throw new RuntimeException('Unsupported avatar file extension.'); + } + + $detectedMime = (string) $file->getMimeType(); + if (!in_array($detectedMime, self::ALLOWED_MIME_TYPES, true)) { + throw new RuntimeException('Unsupported avatar MIME type.'); + } + + $binary = file_get_contents($file->getRealPath()); + if ($binary === false || $binary === '') { + throw new RuntimeException('Unable to read uploaded avatar data.'); + } + + $finfo = new \finfo(FILEINFO_MIME_TYPE); + $finfoMime = (string) $finfo->buffer($binary); + if (!in_array($finfoMime, self::ALLOWED_MIME_TYPES, true)) { + throw new RuntimeException('Avatar content did not match allowed image MIME types.'); + } + + $dimensions = @getimagesizefromstring($binary); + if (!is_array($dimensions) || ($dimensions[0] ?? 0) < 1 || ($dimensions[1] ?? 0) < 1) { + throw new RuntimeException('Uploaded avatar is not a valid image.'); + } } } diff --git a/app/Support/AvatarUrl.php b/app/Support/AvatarUrl.php new file mode 100644 index 00000000..2b460415 --- /dev/null +++ b/app/Support/AvatarUrl.php @@ -0,0 +1,50 @@ +where('user_id', $userId) + ->value('avatar_hash'); + } catch (\Throwable $e) { + $value = null; + } + + self::$hashCache[$userId] = $value ? (string) $value : null; + + return self::$hashCache[$userId]; + } +} diff --git a/avatar_patch.diff b/avatar_patch.diff new file mode 100644 index 00000000..8dcc5337 --- /dev/null +++ b/avatar_patch.diff @@ -0,0 +1,1185 @@ +diff --git a/app/Console/Commands/AvatarsMigrate.php b/app/Console/Commands/AvatarsMigrate.php +index 45f893d..6267e3c 100644 +--- a/app/Console/Commands/AvatarsMigrate.php ++++ b/app/Console/Commands/AvatarsMigrate.php +@@ -2,82 +2,124 @@ + + namespace App\Console\Commands; + ++use App\Services\AvatarService; + use Illuminate\Console\Command; + use Illuminate\Support\Facades\DB; +-use App\Services\AvatarService; + + class AvatarsMigrate extends Command + { +- /** +- * The name and signature of the console command. +- * +- * @var string +- */ +- protected $signature = 'avatars:migrate {--force}'; +- +- /** +- * The console command description. +- * +- * @var string +- */ +- protected $description = 'Migrate legacy avatars to new WebP avatar storage'; +- +- protected $service; +- +- public function __construct(AvatarService $service) ++ protected $signature = 'avatars:migrate {--force : Reprocess avatars even when avatar_hash is already present} {--limit=0 : Limit number of users processed}'; ++ ++ protected $description = 'Migrate legacy avatars into CDN-ready WebP variants and avatar_hash metadata'; ++ ++ public function __construct(private readonly AvatarService $service) + { + parent::__construct(); +- $this->service = $service; + } + +- public function handle() ++ public function handle(): int + { ++ $force = (bool) $this->option('force'); ++ $limit = max(0, (int) $this->option('limit')); ++ + $this->info('Starting avatar migration...'); + +- // Try to read legacy data from user_profiles.avatar_legacy or users.avatar_legacy or users.icon +- $rows = DB::table('user_profiles')->select('user_id', 'avatar_legacy')->whereNotNull('avatar_legacy')->get(); ++ $rows = DB::table('user_profiles as p') ++ ->leftJoin('users as u', 'u.id', '=', 'p.user_id') ++ ->select([ ++ 'p.user_id', ++ 'p.avatar_hash', ++ 'p.avatar_legacy', ++ 'u.icon as user_icon', ++ ]) ++ ->when(!$force, fn ($query) => $query->whereNull('p.avatar_hash')) ++ ->where(function ($query) { ++ $query->whereNotNull('p.avatar_legacy') ++ ->orWhereNotNull('u.icon'); ++ }) ++ ->orderBy('p.user_id') ++ ->when($limit > 0, fn ($query) => $query->limit($limit)) ++ ->get(); + + if ($rows->isEmpty()) { +- // fallback to users table +- $rows = DB::table('users')->select('user_id', 'icon as avatar_legacy')->whereNotNull('icon')->get(); ++ $this->info('No avatars require migration.'); ++ ++ return self::SUCCESS; + } + +- $count = 0; ++ $migrated = 0; ++ $skipped = 0; ++ $failed = 0; ++ + foreach ($rows as $row) { +- $userId = $row->user_id; +- $legacy = $row->avatar_legacy ?? null; +- if (!$legacy) { ++ $userId = (int) $row->user_id; ++ $legacyName = $this->normalizeLegacyName($row->avatar_legacy ?: $row->user_icon); ++ ++ if ($legacyName === null) { ++ $skipped++; ++ continue; ++ } ++ ++ $path = $this->locateLegacyAvatarPath($userId, $legacyName); ++ if ($path === null) { ++ $failed++; ++ $this->warn("User {$userId}: legacy avatar not found ({$legacyName})"); + continue; + } + +- // Try common legacy paths +- $candidates = [ +- public_path('user-picture/' . $legacy), +- public_path('avatar/' . $userId . '/' . $legacy), +- storage_path('app/public/user-picture/' . $legacy), +- storage_path('app/public/avatar/' . $userId . '/' . $legacy), +- ]; +- +- $found = false; +- foreach ($candidates as $p) { +- if (file_exists($p) && is_readable($p)) { +- $this->info("Processing user {$userId} from {$p}"); +- $hash = $this->service->storeFromLegacyFile($userId, $p); +- if ($hash) { +- $this->info(" -> migrated, hash={$hash}"); +- $count++; +- $found = true; +- break; +- } ++ try { ++ $hash = $this->service->storeFromLegacyFile($userId, $path); ++ if (!$hash) { ++ $failed++; ++ $this->warn("User {$userId}: unable to process legacy avatar ({$legacyName})"); ++ continue; + } ++ ++ $migrated++; ++ $this->line("User {$userId}: migrated ({$hash})"); ++ } catch (\Throwable $e) { ++ $failed++; ++ $this->warn("User {$userId}: migration failed ({$e->getMessage()})"); + } ++ } ++ ++ $this->info("Avatar migration complete. Migrated={$migrated}, Skipped={$skipped}, Failed={$failed}"); ++ ++ return $failed > 0 ? self::FAILURE : self::SUCCESS; ++ } ++ ++ private function normalizeLegacyName(?string $value): ?string ++ { ++ if (!$value) { ++ return null; ++ } ++ ++ $trimmed = trim($value); ++ if ($trimmed === '') { ++ return null; ++ } ++ ++ return basename(urldecode($trimmed)); ++ } ++ ++ private function locateLegacyAvatarPath(int $userId, string $legacyName): ?string ++ { ++ $candidates = [ ++ public_path('avatar/' . $legacyName), ++ public_path('avatar/' . $userId . '/' . $legacyName), ++ public_path('user-picture/' . $legacyName), ++ storage_path('app/public/avatar/' . $legacyName), ++ storage_path('app/public/avatar/' . $userId . '/' . $legacyName), ++ storage_path('app/public/user-picture/' . $legacyName), ++ base_path('oldSite/www/files/usericons/' . $legacyName), ++ ]; + +- if (!$found) { +- $this->warn("Legacy file not found for user {$userId}, filename={$legacy}"); ++ foreach ($candidates as $candidate) { ++ if (is_string($candidate) && is_file($candidate) && is_readable($candidate)) { ++ return $candidate; + } + } + +- $this->info("Migration complete. Processed: {$count}"); +- return 0; ++ return null; + } + } +diff --git a/app/Http/Controllers/AvatarController.php b/app/Http/Controllers/AvatarController.php +index b80150d..f6c1c23 100644 +--- a/app/Http/Controllers/AvatarController.php ++++ b/app/Http/Controllers/AvatarController.php +@@ -2,10 +2,9 @@ + + namespace App\Http\Controllers; + ++use App\Http\Requests\AvatarUploadRequest; + use App\Services\AvatarService; +-use Illuminate\Http\Request; +-use Illuminate\Support\Facades\Auth; +-use Illuminate\Support\Facades\Validator; ++use Illuminate\Http\JsonResponse; + + class AvatarController + { +@@ -19,22 +18,13 @@ public function __construct(AvatarService $service) + /** + * Handle avatar upload request. + */ +- public function upload(Request $request) ++ public function upload(AvatarUploadRequest $request): JsonResponse + { +- $user = Auth::user(); ++ $user = $request->user(); + if (!$user) { + return response()->json(['error' => 'Unauthorized'], 401); + } + +- $rules = [ +- 'avatar' => 'required|image|max:2048|mimes:jpg,jpeg,png,webp', +- ]; +- +- $validator = Validator::make($request->all(), $rules); +- if ($validator->fails()) { +- return response()->json(['errors' => $validator->errors()], 422); +- } +- + $file = $request->file('avatar'); + + try { +diff --git a/app/Http/Controllers/Legacy/AvatarController.php b/app/Http/Controllers/Legacy/AvatarController.php +index eb322a0..391c514 100644 +--- a/app/Http/Controllers/Legacy/AvatarController.php ++++ b/app/Http/Controllers/Legacy/AvatarController.php +@@ -4,64 +4,15 @@ + + use App\Http\Controllers\Controller; + use Illuminate\Http\Request; +-use Illuminate\Support\Facades\DB; +-use Illuminate\Support\Facades\Storage; ++use App\Support\AvatarUrl; + + class AvatarController extends Controller + { + public function show(Request $request, $id, $name = null) + { +- $user_id = (int) $id; ++ $userId = (int) $id; ++ $target = AvatarUrl::forUser($userId, null, 128); + +- // default avatar in project public gfx +- $defaultAvatar = public_path('gfx/avatar.jpg'); +- +- try { +- $icon = DB::table('users')->where('user_id', $user_id)->value('icon'); +- } catch (\Throwable $e) { +- $icon = null; +- } +- +- $candidates = []; +- if (!empty($icon)) { +- // common legacy locations to check +- $candidates[] = base_path('oldSite/www/files/usericons/' . $icon); +- $candidates[] = base_path('oldSite/www/files/usericons/' . rawurlencode($icon)); +- $candidates[] = base_path('oldSite/www/files/usericons/' . basename($icon)); +- $candidates[] = public_path('avatar/' . $user_id . '/' . $icon); +- $candidates[] = public_path('avatar/' . $user_id . '/' . basename($icon)); +- $candidates[] = storage_path('app/public/usericons/' . $icon); +- $candidates[] = storage_path('app/public/usericons/' . basename($icon)); +- } +- +- // find first readable file +- $found = null; +- foreach ($candidates as $path) { +- if ($path && file_exists($path) && is_readable($path)) { +- $found = $path; +- break; +- } +- } +- +- if ($found) { +- $type = @exif_imagetype($found); +- if ($type) { +- $mime = image_type_to_mime_type($type); +- } else { +- $f = finfo_open(FILEINFO_MIME_TYPE); +- $mime = finfo_file($f, $found) ?: 'application/octet-stream'; +- finfo_close($f); +- } +- +- return response()->file($found, ['Content-Type' => $mime]); +- } +- +- // fallback to default +- if (file_exists($defaultAvatar) && is_readable($defaultAvatar)) { +- return response()->file($defaultAvatar, ['Content-Type' => 'image/jpeg']); +- } +- +- // final fallback: 404 +- abort(404); ++ return redirect()->away($target, 301); + } + } +diff --git a/app/Http/Controllers/Legacy/BuddiesController.php b/app/Http/Controllers/Legacy/BuddiesController.php +index cfb3b04..d1ec9cc 100644 +--- a/app/Http/Controllers/Legacy/BuddiesController.php ++++ b/app/Http/Controllers/Legacy/BuddiesController.php +@@ -22,7 +22,7 @@ public function index(Request $request) + ->leftJoin('users as t2', 't1.user_id', '=', 't2.id') + ->leftJoin('user_profiles as p', 'p.user_id', '=', 't2.id') + ->where('t1.friend_id', $user->id) +- ->select('t1.id', 't1.user_id', 't1.friend_id', 't2.name as uname', 'p.avatar as icon', 't1.date_added') ++ ->select('t1.id', 't1.user_id', 't1.friend_id', 't2.name as uname', 'p.avatar_hash as icon', 't1.date_added') + ->orderByDesc('t1.date_added'); + + $followers = $query->paginate($perPage)->withQueryString(); +diff --git a/app/Http/Controllers/Legacy/LatestCommentsController.php b/app/Http/Controllers/Legacy/LatestCommentsController.php +index eb091e2..02db175 100644 +--- a/app/Http/Controllers/Legacy/LatestCommentsController.php ++++ b/app/Http/Controllers/Legacy/LatestCommentsController.php +@@ -7,6 +7,7 @@ + use App\Models\ArtworkComment; + use Illuminate\Support\Facades\Storage; + use Illuminate\Support\Str; ++use Illuminate\Support\Facades\DB; + + class LatestCommentsController extends Controller + { +@@ -36,7 +37,7 @@ public function index(Request $request) + 'comment_description' => $c->content, + 'commenter_id' => $c->user_id, + 'country' => $user->country ?? null, +- 'icon' => $user->avatar ?? null, ++ 'icon' => $user ? DB::table('user_profiles')->where('user_id', $user->id)->value('avatar_hash') : null, + 'uname' => $user->username ?? $user->name ?? 'User', + 'signature' => $user->signature ?? null, + 'user_type' => $user->role ?? null, +diff --git a/app/Http/Controllers/Legacy/MyBuddiesController.php b/app/Http/Controllers/Legacy/MyBuddiesController.php +index 3ff2f96..9ab8db4 100644 +--- a/app/Http/Controllers/Legacy/MyBuddiesController.php ++++ b/app/Http/Controllers/Legacy/MyBuddiesController.php +@@ -23,7 +23,7 @@ public function index(Request $request) + ->leftJoin('users as t2', 't1.friend_id', '=', 't2.id') + ->leftJoin('user_profiles as p', 'p.user_id', '=', 't2.id') + ->where('t1.user_id', $user->id) +- ->select('t1.id', 't1.friend_id', 't1.user_id', 't2.name as uname', 'p.avatar as icon', 't1.date_added') ++ ->select('t1.id', 't1.friend_id', 't1.user_id', 't2.name as uname', 'p.avatar_hash as icon', 't1.date_added') + ->orderByDesc('t1.date_added'); + + $buddies = $query->paginate($perPage)->withQueryString(); +diff --git a/app/Http/Controllers/Legacy/ProfileController.php b/app/Http/Controllers/Legacy/ProfileController.php +index dfe911c..5d3b149 100644 +--- a/app/Http/Controllers/Legacy/ProfileController.php ++++ b/app/Http/Controllers/Legacy/ProfileController.php +@@ -10,6 +10,7 @@ + use App\Models\Artwork; + use Illuminate\Support\Facades\Storage; + use Illuminate\Support\Facades\Auth; ++use Illuminate\Support\Facades\DB; + + class ProfileController extends Controller + { +@@ -63,7 +64,7 @@ public function show(Request $request, ?int $id = null, ?string $slug = null) + 'user_id' => $user->id, + 'uname' => $user->name, + 'real_name' => $user->name, +- 'icon' => $user->avatar ?? null, ++ 'icon' => DB::table('user_profiles')->where('user_id', $user->id)->value('avatar_hash'), + 'about_me' => $user->bio ?? null, + ]; + +diff --git a/app/Http/Controllers/Legacy/UserController.php b/app/Http/Controllers/Legacy/UserController.php +index a8a3546..e7286a8 100644 +--- a/app/Http/Controllers/Legacy/UserController.php ++++ b/app/Http/Controllers/Legacy/UserController.php +@@ -4,11 +4,10 @@ + + use App\Http\Controllers\Controller; + use Illuminate\Http\Request; +-use Illuminate\Support\Facades\Storage; + use Illuminate\Support\Facades\Hash; + use Illuminate\Support\Facades\DB; + use Illuminate\Support\Facades\Schema; +-use App\Models\User; ++use App\Services\AvatarService; + use Carbon\Carbon; + + class UserController extends Controller +@@ -72,12 +71,12 @@ public function index(Request $request) + + // Files: avatar/photo/emoticon + if ($request->hasFile('avatar')) { +- $f = $request->file('avatar'); +- $name = $user->id . '.' . $f->getClientOriginalExtension(); +- $f->move(public_path('avatar'), $name); +- // store filename in profile avatar (legacy field) ÔÇö modern avatar pipeline will later migrate +- $profileUpdates['avatar'] = $name; +- $user->icon = $name; ++ try { ++ $hash = app(AvatarService::class)->storeFromUploadedFile((int) $user->id, $request->file('avatar')); ++ $user->icon = $hash; ++ } catch (\Throwable $e) { ++ $request->session()->flash('error', 'Avatar upload failed.'); ++ } + } + + if ($request->hasFile('personal_picture')) { +@@ -141,7 +140,7 @@ public function index(Request $request) + if (isset($profile->birthdate)) $user->birth = $profile->birthdate; + if (isset($profile->gender)) $user->gender = $profile->gender; + if (isset($profile->country_code)) $user->country_code = $profile->country_code; +- if (isset($profile->avatar)) $user->icon = $profile->avatar; ++ if (isset($profile->avatar_hash)) $user->icon = $profile->avatar_hash; + if (isset($profile->cover_image)) $user->picture = $profile->cover_image; + if (isset($profile->signature)) $user->signature = $profile->signature; + if (isset($profile->description)) $user->description = $profile->description; +diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php +index d2d80cb..542b27d 100644 +--- a/app/Http/Controllers/ProfileController.php ++++ b/app/Http/Controllers/ProfileController.php +@@ -95,11 +95,7 @@ public function update(ProfileUpdateRequest $request, \App\Services\AvatarServic + // Files: avatar -> use AvatarService, emoticon and photo -> store to public disk + if ($request->hasFile('avatar')) { + try { +- $hash = $avatarService->storeFromUploadedFile($user->id, $request->file('avatar')); +- // store returned hash into profile avatar column +- if (!empty($hash)) { +- $profileUpdates['avatar'] = $hash; +- } ++ $avatarService->storeFromUploadedFile($user->id, $request->file('avatar')); + } catch (\Exception $e) { + return Redirect::back()->with('error', 'Avatar processing failed: ' . $e->getMessage()); + } +diff --git a/app/Http/Requests/ProfileUpdateRequest.php b/app/Http/Requests/ProfileUpdateRequest.php +index 588d90d..d481540 100644 +--- a/app/Http/Requests/ProfileUpdateRequest.php ++++ b/app/Http/Requests/ProfileUpdateRequest.php +@@ -37,7 +37,7 @@ public function rules(): array + 'about' => ['nullable', 'string'], + 'signature' => ['nullable', 'string'], + 'description' => ['nullable', 'string'], +- 'avatar' => ['nullable', 'image', 'max:2048', 'mimes:jpg,jpeg,png,webp'], ++ 'avatar' => ['nullable', 'file', 'image', 'max:2048', 'mimes:jpg,jpeg,png,webp', 'mimetypes:image/jpeg,image/png,image/webp'], + 'emoticon' => ['nullable', 'image', 'max:2048', 'mimes:jpg,jpeg,png,webp'], + 'photo' => ['nullable', 'image', 'max:2048', 'mimes:jpg,jpeg,png,webp'], + ]; +diff --git a/app/Models/User.php b/app/Models/User.php +index fc76f6c..d679929 100644 +--- a/app/Models/User.php ++++ b/app/Models/User.php +@@ -4,6 +4,7 @@ + + // use Illuminate\Contracts\Auth\MustVerifyEmail; + use Illuminate\Database\Eloquent\Factories\HasFactory; ++use Illuminate\Database\Eloquent\Relations\HasOne; + use Illuminate\Database\Eloquent\Relations\HasMany; + use Illuminate\Database\Eloquent\SoftDeletes; + use Illuminate\Foundation\Auth\User as Authenticatable; +@@ -55,6 +56,11 @@ public function artworks(): HasMany + return $this->hasMany(Artwork::class); + } + ++ public function profile(): HasOne ++ { ++ return $this->hasOne(UserProfile::class, 'user_id'); ++ } ++ + public function hasRole(string $role): bool + { + return strtolower((string) ($this->role ?? '')) === strtolower($role); +diff --git a/app/Models/UserProfile.php b/app/Models/UserProfile.php +index 46c06ce..7bb3de6 100644 +--- a/app/Models/UserProfile.php ++++ b/app/Models/UserProfile.php +@@ -4,7 +4,7 @@ + + use Illuminate\Database\Eloquent\Model; + use Illuminate\Database\Eloquent\Relations\BelongsTo; +-use Illuminate\Support\Facades\Storage; ++use App\Support\AvatarUrl; + + class UserProfile extends Model + { +@@ -18,7 +18,7 @@ class UserProfile extends Model + 'about', + 'signature', + 'description', +- 'avatar', ++ 'avatar_legacy', + 'avatar_hash', + 'avatar_mime', + 'avatar_updated_at', +@@ -43,27 +43,12 @@ public function user(): BelongsTo + return $this->belongsTo(User::class, 'user_id'); + } + +- /** +- * Return a public URL for the avatar when stored on the `public` disk under `avatars/`. +- */ + public function getAvatarUrlAttribute(): ?string + { +- if (empty($this->avatar)) { ++ if (empty($this->user_id)) { + return null; + } + +- // If the stored value already looks like a full URL, return it. +- if (preg_match('#^https?://#i', $this->avatar)) { +- return $this->avatar; +- } +- +- // Prefer `public` disk and avatars folder. +- $path = 'avatars/' . ltrim($this->avatar, '/'); +- if (Storage::disk('public')->exists($path)) { +- return Storage::disk('public')->url($path); +- } +- +- // Fallback: return null if not found +- return null; ++ return AvatarUrl::forUser((int) $this->user_id, $this->avatar_hash, 128); + } + } +diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php +index 1155fb1..8a4f9ed 100644 +--- a/app/Providers/AppServiceProvider.php ++++ b/app/Providers/AppServiceProvider.php +@@ -35,7 +35,7 @@ public function boot(): void + // Provide toolbar counts and user info to layout views (port of legacy toolbar logic) + View::composer(['layouts.nova', 'layouts.nova.*'], function ($view) { + $uploadCount = $favCount = $msgCount = $noticeCount = 0; +- $avatar = null; ++ $avatarHash = null; + $displayName = null; + $userId = null; + +@@ -72,15 +72,15 @@ public function boot(): void + + try { + $profile = DB::table('user_profiles')->where('user_id', $userId)->first(); +- $avatar = $profile->avatar ?? null; ++ $avatarHash = $profile->avatar_hash ?? null; + } catch (\Throwable $e) { +- $avatar = null; ++ $avatarHash = null; + } + + $displayName = Auth::user()->name ?: (Auth::user()->username ?? ''); + } + +- $view->with(compact('userId','uploadCount', 'favCount', 'msgCount', 'noticeCount', 'avatar', 'displayName')); ++ $view->with(compact('userId','uploadCount', 'favCount', 'msgCount', 'noticeCount', 'avatarHash', 'displayName')); + }); + } + +diff --git a/app/Services/AvatarService.php b/app/Services/AvatarService.php +index 1430ab9..2fb38dd 100644 +--- a/app/Services/AvatarService.php ++++ b/app/Services/AvatarService.php +@@ -2,15 +2,22 @@ + + namespace App\Services; + +-use Illuminate\Support\Facades\Storage; +-use Illuminate\Support\Facades\DB; +-use Intervention\Image\ImageManagerStatic as Image; +-use RuntimeException; ++use App\Models\UserProfile; + use Carbon\Carbon; + use Illuminate\Http\UploadedFile; ++use Illuminate\Support\Facades\Storage; ++use Intervention\Image\Drivers\Gd\Driver as GdDriver; ++use Intervention\Image\Drivers\Imagick\Driver as ImagickDriver; ++use Intervention\Image\Encoders\WebpEncoder; ++use Intervention\Image\ImageManager; ++use RuntimeException; + + class AvatarService + { ++ private const ALLOWED_EXTENSIONS = ['jpg', 'jpeg', 'png', 'webp']; ++ ++ private const ALLOWED_MIME_TYPES = ['image/jpeg', 'image/png', 'image/webp']; ++ + protected $sizes = [ + 'xs' => 32, + 'sm' => 64, +@@ -21,149 +28,160 @@ class AvatarService + + protected $quality = 85; + ++ private ?ImageManager $manager = null; ++ + public function __construct() + { +- // Guard: if Intervention Image is not installed, defer error until actual use +- if (class_exists(\Intervention\Image\ImageManagerStatic::class)) { +- try { +- Image::configure(['driver' => extension_loaded('gd') ? 'gd' : 'imagick']); +- $this->imageAvailable = true; +- } catch (\Throwable $e) { +- // If configuration fails, treat as unavailable and log for diagnostics +- logger()->warning('Intervention Image present but configuration failed: '.$e->getMessage()); +- $this->imageAvailable = false; +- } +- } else { +- $this->imageAvailable = false; ++ $configuredSizes = array_values(array_filter((array) config('avatars.sizes', [32, 64, 128, 256, 512]), static fn ($size) => (int) $size > 0)); ++ if ($configuredSizes !== []) { ++ $this->sizes = array_fill_keys(array_map('strval', $configuredSizes), null); ++ $this->sizes = array_combine(array_keys($this->sizes), $configuredSizes); + } +- } + +- /** +- * Process an uploaded file for a user and store webp sizes. +- * Returns the computed sha1 hash. +- * +- * @param int $userId +- * @param UploadedFile $file +- * @return string sha1 hash +- */ +- public function storeFromUploadedFile(int $userId, UploadedFile $file): string +- { +- if (! $this->imageAvailable) { +- throw new RuntimeException('Intervention Image is not available. If you just installed the package, restart your PHP process (php artisan serve or PHP-FPM) and run `composer dump-autoload -o`.'); +- } ++ $this->quality = (int) config('avatars.quality', 85); + +- // Load image and re-encode to webp after validating + try { +- $img = Image::make($file->getRealPath()); ++ $this->manager = extension_loaded('gd') ++ ? new ImageManager(new GdDriver()) ++ : new ImageManager(new ImagickDriver()); + } catch (\Throwable $e) { +- throw new RuntimeException('Failed to read uploaded image: '.$e->getMessage()); +- } +- +- // Ensure square center crop per spec +- $max = max($img->width(), $img->height()); +- $img->fit($max, $max); +- +- $basePath = "avatars/{$userId}"; +- Storage::disk('public')->makeDirectory($basePath); +- +- // Save original as webp +- $originalData = (string) $img->encode('webp', $this->quality); +- Storage::disk('public')->put($basePath . '/original.webp', $originalData); +- +- // Generate sizes +- foreach ($this->sizes as $name => $size) { +- $resized = $img->resize($size, $size, function ($constraint) { +- $constraint->upsize(); +- })->encode('webp', $this->quality); +- Storage::disk('public')->put("{$basePath}/{$size}.webp", (string)$resized); ++ logger()->warning('Avatar image manager configuration failed: ' . $e->getMessage()); ++ $this->manager = null; + } ++ } + +- $hash = sha1($originalData); +- $mime = 'image/webp'; ++ public function storeFromUploadedFile(int $userId, UploadedFile $file): string ++ { ++ $this->assertImageManagerAvailable(); ++ $this->assertStorageIsAllowed(); ++ $this->assertSecureImageUpload($file); + +- // Persist metadata to user_profiles if exists, otherwise users table fallbacks +- if (SchemaHasTable('user_profiles')) { +- DB::table('user_profiles')->where('user_id', $userId)->update([ +- 'avatar_hash' => $hash, +- 'avatar_updated_at' => Carbon::now(), +- 'avatar_mime' => $mime, +- ]); +- } else { +- DB::table('users')->where('id', $userId)->update([ +- 'avatar_hash' => $hash, +- 'avatar_updated_at' => Carbon::now(), +- 'avatar_mime' => $mime, +- ]); ++ $binary = file_get_contents($file->getRealPath()); ++ if ($binary === false || $binary === '') { ++ throw new RuntimeException('Uploaded avatar file is empty or unreadable.'); + } + +- return $hash; ++ return $this->storeFromBinary($userId, $binary); + } + +- /** +- * Process a legacy file path for a user (path-to-file). +- * Returns sha1 or null when missing. +- * +- * @param int $userId +- * @param string $path Absolute filesystem path +- * @return string|null +- */ + public function storeFromLegacyFile(int $userId, string $path): ?string + { ++ $this->assertImageManagerAvailable(); ++ $this->assertStorageIsAllowed(); ++ + if (!file_exists($path) || !is_readable($path)) { + return null; + } + +- try { +- $img = Image::make($path); +- } catch (\Exception $e) { ++ $binary = file_get_contents($path); ++ if ($binary === false || $binary === '') { + return null; + } + +- $max = max($img->width(), $img->height()); +- $img->fit($max, $max); ++ return $this->storeFromBinary($userId, $binary); ++ } ++ ++ private function storeFromBinary(int $userId, string $binary): string ++ { ++ $image = $this->readImageFromBinary($binary); + ++ $diskName = (string) config('avatars.disk', 'public'); ++ $disk = Storage::disk($diskName); + $basePath = "avatars/{$userId}"; +- Storage::disk('public')->makeDirectory($basePath); + +- $originalData = (string) $img->encode('webp', $this->quality); +- Storage::disk('public')->put($basePath . '/original.webp', $originalData); ++ $hashSeed = ''; ++ foreach ($this->sizes as $size) { ++ $variant = $image->cover($size, $size); ++ $encoded = (string) $variant->encode(new WebpEncoder($this->quality)); ++ $disk->put("{$basePath}/{$size}.webp", $encoded, [ ++ 'visibility' => 'public', ++ 'CacheControl' => 'public, max-age=31536000, immutable', ++ 'ContentType' => 'image/webp', ++ ]); + +- foreach ($this->sizes as $name => $size) { +- $resized = $img->resize($size, $size, function ($constraint) { +- $constraint->upsize(); +- })->encode('webp', $this->quality); +- Storage::disk('public')->put("{$basePath}/{$size}.webp", (string)$resized); ++ if ($size === 128) { ++ $hashSeed = $encoded; ++ } + } + +- $hash = sha1($originalData); +- $mime = 'image/webp'; ++ if ($hashSeed === '') { ++ throw new RuntimeException('Avatar processing failed to generate a hash seed.'); ++ } + +- if (SchemaHasTable('user_profiles')) { +- DB::table('user_profiles')->where('user_id', $userId)->update([ +- 'avatar_hash' => $hash, +- 'avatar_updated_at' => Carbon::now(), +- 'avatar_mime' => $mime, +- ]); +- } else { +- DB::table('users')->where('id', $userId)->update([ ++ $hash = hash('sha256', $hashSeed); ++ $this->updateProfileMetadata($userId, $hash); ++ ++ return $hash; ++ } ++ ++ private function readImageFromBinary(string $binary) ++ { ++ try { ++ return $this->manager->read($binary); ++ } catch (\Throwable $e) { ++ throw new RuntimeException('Failed to decode uploaded image.'); ++ } ++ } ++ ++ private function updateProfileMetadata(int $userId, string $hash): void ++ { ++ UserProfile::query()->updateOrCreate( ++ ['user_id' => $userId], ++ [ + 'avatar_hash' => $hash, ++ 'avatar_mime' => 'image/webp', + 'avatar_updated_at' => Carbon::now(), +- 'avatar_mime' => $mime, +- ]); ++ ] ++ ); ++ } ++ ++ private function assertImageManagerAvailable(): void ++ { ++ if ($this->manager !== null) { ++ return; + } + +- return $hash; ++ throw new RuntimeException('Avatar image processing is not available on this environment.'); + } +-} + +-/** +- * Helper: check for table existence without importing Schema facade repeatedly +- */ +-function SchemaHasTable(string $name): bool +-{ +- try { +- return \Illuminate\Support\Facades\Schema::hasTable($name); +- } catch (\Throwable $e) { +- return false; ++ private function assertStorageIsAllowed(): void ++ { ++ if (!app()->environment('production')) { ++ return; ++ } ++ ++ $diskName = (string) config('avatars.disk', 's3'); ++ if (in_array($diskName, ['local', 'public'], true)) { ++ throw new RuntimeException('Production avatar storage must use object storage, not local/public disks.'); ++ } ++ } ++ ++ private function assertSecureImageUpload(UploadedFile $file): void ++ { ++ $extension = strtolower((string) $file->getClientOriginalExtension()); ++ if (!in_array($extension, self::ALLOWED_EXTENSIONS, true)) { ++ throw new RuntimeException('Unsupported avatar file extension.'); ++ } ++ ++ $detectedMime = (string) $file->getMimeType(); ++ if (!in_array($detectedMime, self::ALLOWED_MIME_TYPES, true)) { ++ throw new RuntimeException('Unsupported avatar MIME type.'); ++ } ++ ++ $binary = file_get_contents($file->getRealPath()); ++ if ($binary === false || $binary === '') { ++ throw new RuntimeException('Unable to read uploaded avatar data.'); ++ } ++ ++ $finfo = new \finfo(FILEINFO_MIME_TYPE); ++ $finfoMime = (string) $finfo->buffer($binary); ++ if (!in_array($finfoMime, self::ALLOWED_MIME_TYPES, true)) { ++ throw new RuntimeException('Avatar content did not match allowed image MIME types.'); ++ } ++ ++ $dimensions = @getimagesizefromstring($binary); ++ if (!is_array($dimensions) || ($dimensions[0] ?? 0) < 1 || ($dimensions[1] ?? 0) < 1) { ++ throw new RuntimeException('Uploaded avatar is not a valid image.'); ++ } + } + } +diff --git a/config/cdn.php b/config/cdn.php +index b1b1cd0..9c70607 100644 +--- a/config/cdn.php ++++ b/config/cdn.php +@@ -4,4 +4,5 @@ + + return [ + 'files_url' => env('FILES_CDN_URL', 'https://files.skinbase.org'), ++ 'avatar_url' => env('AVATAR_CDN_URL', 'https://file.skinbase.org'), + ]; +diff --git a/resources/views/components/avatar.blade.php b/resources/views/components/avatar.blade.php +index 0b90950..bae1a02 100644 +--- a/resources/views/components/avatar.blade.php ++++ b/resources/views/components/avatar.blade.php +@@ -3,9 +3,7 @@ + $size = $size ?? 128; + $profile = $user->profile ?? null; + $hash = $profile->avatar_hash ?? null; +- $src = $hash +- ? asset("storage/avatars/{$user->id}/{$size}.webp?v={$hash}") +- : asset('img/default-avatar.webp'); ++ $src = \App\Support\AvatarUrl::forUser((int) $user->id, $hash, (int) $size); + $alt = $alt ?? ($user->username ?? 'avatar'); + $class = $class ?? 'rounded-full'; + @endphp +diff --git a/resources/views/layouts/nova/toolbar.blade.php b/resources/views/layouts/nova/toolbar.blade.php +index 3833458..77b3c55 100644 +--- a/resources/views/layouts/nova/toolbar.blade.php ++++ b/resources/views/layouts/nova/toolbar.blade.php +@@ -121,7 +121,7 @@ class="w-full h-10 rounded-lg bg-black/20 border border-sb-line pl-4 pr-12 text- +
+
+ +
+- Avatar ++ Avatar +

{{ $artwork->name }}

+

By {{ $artwork->uname }}

+
+@@ -30,7 +30,7 @@ +
+
+ +- {{ $comment->uname }} ++ {{ $comment->uname }} + +
+
+@@ -53,7 +53,7 @@ +
+
+ +- ++ + +
+ {{ auth()->user()->name }} +diff --git a/resources/views/legacy/buddies.blade.php b/resources/views/legacy/buddies.blade.php +index 1d91897..6b15b25 100644 +--- a/resources/views/legacy/buddies.blade.php ++++ b/resources/views/legacy/buddies.blade.php +@@ -27,7 +27,7 @@ + + +
+diff --git a/resources/views/legacy/forum/posts.blade.php b/resources/views/legacy/forum/posts.blade.php +index d497a79..28e9f66 100644 +--- a/resources/views/legacy/forum/posts.blade.php ++++ b/resources/views/legacy/forum/posts.blade.php +@@ -28,7 +28,7 @@ +
+
+ @if (!empty($post->user_id) && !empty($post->icon)) +- {{ $post->uname }} ++ {{ $post->uname }} + @else +
+ @endif +diff --git a/resources/views/legacy/gallery.blade.php b/resources/views/legacy/gallery.blade.php +index 7c4c7c3..327e583 100644 +--- a/resources/views/legacy/gallery.blade.php ++++ b/resources/views/legacy/gallery.blade.php +@@ -34,7 +34,7 @@ +
+
User
+
+- {{ $user->uname ?? $user->name }} ++ {{ $user->uname ?? $user->name }} +

{{ $user->uname ?? $user->name }}

+

{{ $user->about_me ?? '' }}

+
+diff --git a/resources/views/legacy/interview.blade.php b/resources/views/legacy/interview.blade.php +index af1364f..2bb59b6 100644 +--- a/resources/views/legacy/interview.blade.php ++++ b/resources/views/legacy/interview.blade.php +@@ -32,7 +32,7 @@ + + + @if(!empty($comment->user_id) && !empty($comment->icon)) +-
++
+ @endif +
Posted by: {{ $comment->author }}
+ Posts: {{ $postCounts[$comment->author] ?? 0 }} +diff --git a/resources/views/legacy/interviews.blade.php b/resources/views/legacy/interviews.blade.php +index a9650a4..b78d76a 100644 +--- a/resources/views/legacy/interviews.blade.php ++++ b/resources/views/legacy/interviews.blade.php +@@ -22,7 +22,7 @@ + + @if(!empty($interview->icon)) + +- ++ + + @else + +diff --git a/resources/views/legacy/latest-comments.blade.php b/resources/views/legacy/latest-comments.blade.php +index ed99954..2e33899 100644 +--- a/resources/views/legacy/latest-comments.blade.php ++++ b/resources/views/legacy/latest-comments.blade.php +@@ -15,7 +15,7 @@ +
+
+ +- {{ $comment->uname }} ++ {{ $comment->uname }} + +
+ +diff --git a/resources/views/legacy/monthly-commentators.blade.php b/resources/views/legacy/monthly-commentators.blade.php +index 28b7921..7066d11 100644 +--- a/resources/views/legacy/monthly-commentators.blade.php ++++ b/resources/views/legacy/monthly-commentators.blade.php +@@ -27,7 +27,7 @@ + + + +- {{ $row->uname }} ++ {{ $row->uname }} + + + +diff --git a/resources/views/legacy/mybuddies.blade.php b/resources/views/legacy/mybuddies.blade.php +index 13fd2c6..c91f446 100644 +--- a/resources/views/legacy/mybuddies.blade.php ++++ b/resources/views/legacy/mybuddies.blade.php +@@ -28,7 +28,7 @@ + + + +diff --git a/resources/views/legacy/news.blade.php b/resources/views/legacy/news.blade.php +index 7c87583..0d87945 100644 +--- a/resources/views/legacy/news.blade.php ++++ b/resources/views/legacy/news.blade.php +@@ -36,7 +36,7 @@ + @if(!empty($ar->icon)) + + @endif +diff --git a/resources/views/legacy/profile.blade.php b/resources/views/legacy/profile.blade.php +index 87239b6..f3e9453 100644 +--- a/resources/views/legacy/profile.blade.php ++++ b/resources/views/legacy/profile.blade.php +@@ -34,7 +34,7 @@ +
+
User
+
+- {{ $user->uname }} ++ {{ $user->uname }} +

{{ $user->uname }}

+

{{ $user->about_me ?? '' }}

+
+diff --git a/resources/views/legacy/received-comments.blade.php b/resources/views/legacy/received-comments.blade.php +index 75f08fd..855bd95 100644 +--- a/resources/views/legacy/received-comments.blade.php ++++ b/resources/views/legacy/received-comments.blade.php +@@ -21,7 +21,7 @@ +
+
+ +- {{ $author->name ?? $author->uname ?? '' }} ++ {{ $author->name ?? $author->uname ?? '' }} + +
+ +diff --git a/resources/views/legacy/toolbar.blade.php b/resources/views/legacy/toolbar.blade.php +index 5dcbf97..0cefc74 100644 +--- a/resources/views/legacy/toolbar.blade.php ++++ b/resources/views/legacy/toolbar.blade.php +@@ -119,9 +119,9 @@ + } + try { + $profile = \Illuminate\Support\Facades\DB::table('user_profiles')->where('user_id', $userId)->first(); +- $avatar = $profile->avatar ?? null; ++ $avatarHash = $profile->avatar_hash ?? null; + } catch (\Throwable $e) { +- $avatar = null; ++ $avatarHash = null; + } + $displayName = auth()->user()->name ?: (auth()->user()->username ?? ''); + @endphp +@@ -141,9 +141,7 @@ + +
  • + +- @if($avatar) +- {{ $displayName }}   +- @endif ++ {{ $displayName }}   + {{ $displayName }} +   + +diff --git a/resources/views/legacy/top-authors.blade.php b/resources/views/legacy/top-authors.blade.php +index febb459..ed4513b 100644 +--- a/resources/views/legacy/top-authors.blade.php ++++ b/resources/views/legacy/top-authors.blade.php +@@ -27,7 +27,7 @@ + + + +- {{ $u->uname }} ++ {{ $u->uname }} + + + +@@ -60,7 +60,7 @@ + + + +- {{ $f->uname }} ++ {{ $f->uname }} + + + +@@ -92,7 +92,7 @@ + + + +- {{ $c->uname }} ++ {{ $c->uname }} + + + +diff --git a/tests/Feature/AvatarUploadTest.php b/tests/Feature/AvatarUploadTest.php +index aafbf67..3928cbf 100644 +--- a/tests/Feature/AvatarUploadTest.php ++++ b/tests/Feature/AvatarUploadTest.php +@@ -1,15 +1,64 @@ + set('avatars.disk', 'public'); ++ Storage::fake('public'); ++ } ++ + public function test_upload_requires_authentication() + { + $response = $this->postJson(route('avatar.upload')); + $response->assertStatus(401); + } ++ ++ public function test_upload_rejects_invalid_avatar_type(): void ++ { ++ $user = User::factory()->create(); ++ ++ $response = $this->actingAs($user)->postJson(route('avatar.upload'), [ ++ 'avatar' => UploadedFile::fake()->create('avatar.txt', 50, 'text/plain'), ++ ]); ++ ++ $response->assertStatus(422); ++ } ++ ++ public function test_upload_processes_avatar_and_stores_webp_variants(): void ++ { ++ $user = User::factory()->create(); ++ ++ $response = $this->actingAs($user)->postJson(route('avatar.upload'), [ ++ 'avatar' => UploadedFile::fake()->image('avatar.png', 300, 180), ++ ]); ++ ++ $response->assertOk()->assertJson(['success' => true]); ++ ++ $payload = $response->json(); ++ $this->assertMatchesRegularExpression('/^[a-f0-9]{64}$/', (string) ($payload['hash'] ?? '')); ++ ++ $this->assertTrue(Storage::disk('public')->exists("avatars/{$user->id}/32.webp")); ++ $this->assertTrue(Storage::disk('public')->exists("avatars/{$user->id}/64.webp")); ++ $this->assertTrue(Storage::disk('public')->exists("avatars/{$user->id}/128.webp")); ++ $this->assertTrue(Storage::disk('public')->exists("avatars/{$user->id}/256.webp")); ++ $this->assertTrue(Storage::disk('public')->exists("avatars/{$user->id}/512.webp")); ++ ++ $record = DB::table('user_profiles')->where('user_id', $user->id)->first(); ++ $this->assertNotNull($record); ++ $this->assertSame('image/webp', $record->avatar_mime); ++ $this->assertSame($payload['hash'], $record->avatar_hash); ++ $this->assertNotNull($record->avatar_updated_at); ++ } + } diff --git a/composer.json b/composer.json index be0ee1f0..ac00bae8 100644 --- a/composer.json +++ b/composer.json @@ -10,10 +10,12 @@ "license": "MIT", "require": { "php": "^8.2", - "intervention/image": "^3.11", "inertiajs/inertia-laravel": "^1.0", + "intervention/image": "^3.11", "laravel/framework": "^12.0", - "laravel/tinker": "^2.10.1" + "laravel/scout": "^10.24", + "laravel/tinker": "^2.10.1", + "meilisearch/meilisearch-php": "^1.16" }, "require-dev": { "fakerphp/faker": "^1.23", diff --git a/composer.lock b/composer.lock index 67542c77..06a14f38 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2c96d87d3df9f5da68d6593ba44cb150", + "content-hash": "d725824144ac43bf1938e16a5653dcf4", "packages": [ { "name": "brick/math", @@ -1546,6 +1546,86 @@ }, "time": "2026-02-06T12:17:10+00:00" }, + { + "name": "laravel/scout", + "version": "v10.24.0", + "source": { + "type": "git", + "url": "https://github.com/laravel/scout.git", + "reference": "f9864d9a727a0c0d6b95e08ed92df8c301ae6d2c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/scout/zipball/f9864d9a727a0c0d6b95e08ed92df8c301ae6d2c", + "reference": "f9864d9a727a0c0d6b95e08ed92df8c301ae6d2c", + "shasum": "" + }, + "require": { + "illuminate/bus": "^9.0|^10.0|^11.0|^12.0|^13.0", + "illuminate/contracts": "^9.0|^10.0|^11.0|^12.0|^13.0", + "illuminate/database": "^9.0|^10.0|^11.0|^12.0|^13.0", + "illuminate/http": "^9.0|^10.0|^11.0|^12.0|^13.0", + "illuminate/pagination": "^9.0|^10.0|^11.0|^12.0|^13.0", + "illuminate/queue": "^9.0|^10.0|^11.0|^12.0|^13.0", + "illuminate/support": "^9.0|^10.0|^11.0|^12.0|^13.0", + "php": "^8.0", + "symfony/console": "^6.0|^7.0|^8.0" + }, + "conflict": { + "algolia/algoliasearch-client-php": "<3.2.0|>=5.0.0" + }, + "require-dev": { + "algolia/algoliasearch-client-php": "^3.2|^4.0", + "meilisearch/meilisearch-php": "^1.0", + "mockery/mockery": "^1.0", + "orchestra/testbench": "^7.31|^8.36|^9.15|^10.8|^11.0", + "php-http/guzzle7-adapter": "^1.0", + "phpstan/phpstan": "^1.10", + "typesense/typesense-php": "^4.9.3" + }, + "suggest": { + "algolia/algoliasearch-client-php": "Required to use the Algolia engine (^3.2).", + "meilisearch/meilisearch-php": "Required to use the Meilisearch engine (^1.0).", + "typesense/typesense-php": "Required to use the Typesense engine (^4.9)." + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Laravel\\Scout\\ScoutServiceProvider" + ] + }, + "branch-alias": { + "dev-master": "10.x-dev" + } + }, + "autoload": { + "psr-4": { + "Laravel\\Scout\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "Laravel Scout provides a driver based solution to searching your Eloquent models.", + "keywords": [ + "algolia", + "laravel", + "search" + ], + "support": { + "issues": "https://github.com/laravel/scout/issues", + "source": "https://github.com/laravel/scout" + }, + "time": "2026-02-10T18:44:39+00:00" + }, { "name": "laravel/serializable-closure", "version": "v2.0.9", @@ -2232,6 +2312,86 @@ ], "time": "2026-01-15T06:54:53+00:00" }, + { + "name": "meilisearch/meilisearch-php", + "version": "v1.16.1", + "source": { + "type": "git", + "url": "https://github.com/meilisearch/meilisearch-php.git", + "reference": "f9f63e0e7d12ffaae54f7317fa8f4f4dfa8ae7b6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/meilisearch/meilisearch-php/zipball/f9f63e0e7d12ffaae54f7317fa8f4f4dfa8ae7b6", + "reference": "f9f63e0e7d12ffaae54f7317fa8f4f4dfa8ae7b6", + "shasum": "" + }, + "require": { + "ext-json": "*", + "php": "^7.4 || ^8.0", + "php-http/discovery": "^1.7", + "psr/http-client": "^1.0", + "symfony/polyfill-php81": "^1.33" + }, + "require-dev": { + "http-interop/http-factory-guzzle": "^1.2.0", + "php-cs-fixer/shim": "^3.59.3", + "phpstan/phpstan": "^2.0", + "phpstan/phpstan-deprecation-rules": "^2.0", + "phpstan/phpstan-phpunit": "^2.0", + "phpstan/phpstan-strict-rules": "^2.0", + "phpunit/phpunit": "^9.5 || ^10.5", + "symfony/http-client": "^5.4|^6.0|^7.0" + }, + "suggest": { + "guzzlehttp/guzzle": "Use Guzzle ^7 as HTTP client", + "http-interop/http-factory-guzzle": "Factory for guzzlehttp/guzzle", + "symfony/http-client": "Use Symfony Http client" + }, + "type": "library", + "autoload": { + "psr-4": { + "MeiliSearch\\": "src/", + "Meilisearch\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Clémentine Urquizar", + "email": "clementine@meilisearch.com" + }, + { + "name": "Bruno Casali", + "email": "bruno@meilisearch.com" + }, + { + "name": "Laurent Cazanove", + "email": "lau.cazanove@gmail.com" + }, + { + "name": "Tomas Norkūnas", + "email": "norkunas.tom@gmail.com" + } + ], + "description": "PHP wrapper for the Meilisearch API", + "keywords": [ + "api", + "client", + "instant", + "meilisearch", + "php", + "search" + ], + "support": { + "issues": "https://github.com/meilisearch/meilisearch-php/issues", + "source": "https://github.com/meilisearch/meilisearch-php/tree/v1.16.1" + }, + "time": "2025-09-18T10:15:45+00:00" + }, { "name": "monolog/monolog", "version": "3.10.0", @@ -2739,6 +2899,85 @@ ], "time": "2025-11-20T02:34:59+00:00" }, + { + "name": "php-http/discovery", + "version": "1.20.0", + "source": { + "type": "git", + "url": "https://github.com/php-http/discovery.git", + "reference": "82fe4c73ef3363caed49ff8dd1539ba06044910d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-http/discovery/zipball/82fe4c73ef3363caed49ff8dd1539ba06044910d", + "reference": "82fe4c73ef3363caed49ff8dd1539ba06044910d", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0|^2.0", + "php": "^7.1 || ^8.0" + }, + "conflict": { + "nyholm/psr7": "<1.0", + "zendframework/zend-diactoros": "*" + }, + "provide": { + "php-http/async-client-implementation": "*", + "php-http/client-implementation": "*", + "psr/http-client-implementation": "*", + "psr/http-factory-implementation": "*", + "psr/http-message-implementation": "*" + }, + "require-dev": { + "composer/composer": "^1.0.2|^2.0", + "graham-campbell/phpspec-skip-example-extension": "^5.0", + "php-http/httplug": "^1.0 || ^2.0", + "php-http/message-factory": "^1.0", + "phpspec/phpspec": "^5.1 || ^6.1 || ^7.3", + "sebastian/comparator": "^3.0.5 || ^4.0.8", + "symfony/phpunit-bridge": "^6.4.4 || ^7.0.1" + }, + "type": "composer-plugin", + "extra": { + "class": "Http\\Discovery\\Composer\\Plugin", + "plugin-optional": true + }, + "autoload": { + "psr-4": { + "Http\\Discovery\\": "src/" + }, + "exclude-from-classmap": [ + "src/Composer/Plugin.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com" + } + ], + "description": "Finds and installs PSR-7, PSR-17, PSR-18 and HTTPlug implementations", + "homepage": "http://php-http.org", + "keywords": [ + "adapter", + "client", + "discovery", + "factory", + "http", + "message", + "psr17", + "psr7" + ], + "support": { + "issues": "https://github.com/php-http/discovery/issues", + "source": "https://github.com/php-http/discovery/tree/1.20.0" + }, + "time": "2024-10-02T11:20:13+00:00" + }, { "name": "phpoption/phpoption", "version": "1.9.5", @@ -5005,6 +5244,86 @@ ], "time": "2025-01-02T08:10:11+00:00" }, + { + "name": "symfony/polyfill-php81", + "version": "v1.33.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php81.git", + "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c", + "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "type": "library", + "extra": { + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php81\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php81/tree/v1.33.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-09T11:45:10+00:00" + }, { "name": "symfony/polyfill-php83", "version": "v1.33.0", diff --git a/config/avatars.php b/config/avatars.php new file mode 100644 index 00000000..b7580e14 --- /dev/null +++ b/config/avatars.php @@ -0,0 +1,7 @@ + env('AVATAR_DISK', env('APP_ENV') === 'production' ? 's3' : 'public'), + 'sizes' => [32, 64, 128, 256, 512], + 'quality' => (int) env('AVATAR_WEBP_QUALITY', 85), +]; diff --git a/config/cdn.php b/config/cdn.php index b1b1cd0c..9c706075 100644 --- a/config/cdn.php +++ b/config/cdn.php @@ -4,4 +4,5 @@ declare(strict_types=1); return [ 'files_url' => env('FILES_CDN_URL', 'https://files.skinbase.org'), + 'avatar_url' => env('AVATAR_CDN_URL', 'https://file.skinbase.org'), ]; diff --git a/database/migrations/2026_02_15_000100_finalize_avatar_schema_for_cdn.php b/database/migrations/2026_02_15_000100_finalize_avatar_schema_for_cdn.php new file mode 100644 index 00000000..431ab000 --- /dev/null +++ b/database/migrations/2026_02_15_000100_finalize_avatar_schema_for_cdn.php @@ -0,0 +1,61 @@ +string('avatar_legacy', 255)->nullable(); + } + + if (!Schema::hasColumn('user_profiles', 'avatar_hash')) { + $table->char('avatar_hash', 64)->nullable()->index(); + } + + if (!Schema::hasColumn('user_profiles', 'avatar_mime')) { + $table->string('avatar_mime', 50)->nullable(); + } + + if (!Schema::hasColumn('user_profiles', 'avatar_updated_at')) { + $table->dateTime('avatar_updated_at')->nullable(); + } + }); + + if (Schema::hasColumn('user_profiles', 'avatar_hash')) { + try { + DB::statement('ALTER TABLE `user_profiles` MODIFY COLUMN `avatar_hash` CHAR(64) NULL'); + } catch (\Throwable $e) { + } + } + } + + public function down(): void + { + if (!Schema::hasTable('user_profiles')) { + return; + } + + if (Schema::hasColumn('user_profiles', 'avatar_hash')) { + try { + DB::statement('ALTER TABLE `user_profiles` MODIFY COLUMN `avatar_hash` CHAR(40) NULL'); + } catch (\Throwable $e) { + } + } + } +}; diff --git a/database/migrations/2026_02_15_120500_finalize_avatar_metadata_schema.php b/database/migrations/2026_02_15_120500_finalize_avatar_metadata_schema.php new file mode 100644 index 00000000..431ab000 --- /dev/null +++ b/database/migrations/2026_02_15_120500_finalize_avatar_metadata_schema.php @@ -0,0 +1,61 @@ +string('avatar_legacy', 255)->nullable(); + } + + if (!Schema::hasColumn('user_profiles', 'avatar_hash')) { + $table->char('avatar_hash', 64)->nullable()->index(); + } + + if (!Schema::hasColumn('user_profiles', 'avatar_mime')) { + $table->string('avatar_mime', 50)->nullable(); + } + + if (!Schema::hasColumn('user_profiles', 'avatar_updated_at')) { + $table->dateTime('avatar_updated_at')->nullable(); + } + }); + + if (Schema::hasColumn('user_profiles', 'avatar_hash')) { + try { + DB::statement('ALTER TABLE `user_profiles` MODIFY COLUMN `avatar_hash` CHAR(64) NULL'); + } catch (\Throwable $e) { + } + } + } + + public function down(): void + { + if (!Schema::hasTable('user_profiles')) { + return; + } + + if (Schema::hasColumn('user_profiles', 'avatar_hash')) { + try { + DB::statement('ALTER TABLE `user_profiles` MODIFY COLUMN `avatar_hash` CHAR(40) NULL'); + } catch (\Throwable $e) { + } + } + } +}; diff --git a/docs/avatar-cdn-config-notes.md b/docs/avatar-cdn-config-notes.md new file mode 100644 index 00000000..87edffde --- /dev/null +++ b/docs/avatar-cdn-config-notes.md @@ -0,0 +1,32 @@ +# Avatar CDN Config Notes + +This project serves avatars from the avatar CDN domain. + +## Required env variables + +- `AVATAR_CDN_URL=https://file.skinbase.org` +- `AVATAR_DISK=s3` (production) +- `AVATAR_WEBP_QUALITY=85` + +## Delivery format + +Avatars are rendered via: + +- `https://file.skinbase.org/avatars/{user_id}/{size}.webp?v={avatar_hash}` + +Sizes generated server-side: + +- `32`, `64`, `128`, `256`, `512` + +## Cache policy + +Storage writes must set: + +- `Cache-Control: public, max-age=31536000, immutable` + +Hash-based query versioning (`?v={avatar_hash}`) handles cache busting. + +## Production rule + +- Production avatar storage must use object storage (`s3` / R2-compatible disk). +- Local/public disks are for development only. diff --git a/package-lock.json b/package-lock.json index b7069052..af85ed7b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,6 +12,7 @@ "react-dom": "^19.2.4" }, "devDependencies": { + "@playwright/test": "^1.40.0", "@tailwindcss/forms": "^0.5.2", "@tailwindcss/vite": "^4.0.0", "@testing-library/react": "^16.1.0", @@ -1073,6 +1074,22 @@ "url": "https://opencollective.com/parcel" } }, + "node_modules/@playwright/test": { + "version": "1.58.2", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.58.2.tgz", + "integrity": "sha512-akea+6bHYBBfA9uQqSYmlJXn61cTa+jbO87xVLCWbTqbWadRVmhxlXATaOjOgcBaWU4ePo0wB41KMFv3o35IXA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "playwright": "1.58.2" + }, + "bin": { + "playwright": "cli.js" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/@rollup/rollup-android-arm-eabi": { "version": "4.57.1", "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.57.1.tgz", @@ -3802,6 +3819,53 @@ "node": ">= 6" } }, + "node_modules/playwright": { + "version": "1.58.2", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.58.2.tgz", + "integrity": "sha512-vA30H8Nvkq/cPBnNw4Q8TWz1EJyqgpuinBcHET0YVJVFldr8JDNiU9LaWAE1KqSkRYazuaBhTpB5ZzShOezQ6A==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "playwright-core": "1.58.2" + }, + "bin": { + "playwright": "cli.js" + }, + "engines": { + "node": ">=18" + }, + "optionalDependencies": { + "fsevents": "2.3.2" + } + }, + "node_modules/playwright-core": { + "version": "1.58.2", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.58.2.tgz", + "integrity": "sha512-yZkEtftgwS8CsfYo7nm0KE8jsvm6i/PTgVtB8DL726wNf6H2IMsDuxCpJj59KDaxCtSnrWan2AeDqM7JBaultg==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "playwright-core": "cli.js" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/playwright/node_modules/fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, "node_modules/postcss": { "version": "8.5.6", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", diff --git a/package.json b/package.json index 02c4dc52..dca569ab 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,9 @@ "scripts": { "build": "vite build", "dev": "vite", - "test:ui": "vitest run" + "test:ui": "vitest run", + "test:e2e": "playwright test", + "playwright:install": "npx playwright install" }, "devDependencies": { "@tailwindcss/forms": "^0.5.2", @@ -22,7 +24,8 @@ "sass": "^1.70.0", "tailwindcss": "^3.1.0", "vite": "^7.0.7", - "vitest": "^2.1.8" + "vitest": "^2.1.8", + "@playwright/test": "^1.40.0" }, "dependencies": { "@inertiajs/core": "^1.0.4", diff --git a/playwright.config.ts b/playwright.config.ts new file mode 100644 index 00000000..1348c242 --- /dev/null +++ b/playwright.config.ts @@ -0,0 +1,19 @@ +import { defineConfig, devices } from '@playwright/test'; + +export default defineConfig({ + testDir: './tests/e2e', + timeout: 30000, + expect: { timeout: 5000 }, + use: { + baseURL: process.env.PLAYWRIGHT_BASE_URL || 'http://skinbase26.test', + headless: true, + viewport: { width: 1280, height: 720 }, + ignoreHTTPSErrors: true, + }, + projects: [ + { + name: 'chromium', + use: { ...devices['Desktop Chrome'] }, + }, + ], +}); diff --git a/public/gfx/sb_logo.png b/public/gfx/sb_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..eb7aee10f1ab17442075c87e6e34daee8e66c736 GIT binary patch literal 14045 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�-I!;Brb! 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 P00000NkvXXu0mjfud*na literal 0 HcmV?d00001 diff --git a/public/gfx/sb_logo2.png b/public/gfx/sb_logo2.png new file mode 100644 index 0000000000000000000000000000000000000000..8b23573eee8dc1a9f9ecce14147524180ef32be2 GIT binary patch literal 10611 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 N002ovPDHLkV1gN%xk>;4 literal 0 HcmV?d00001 diff --git a/public/gfx/sb_logo_white.png b/public/gfx/sb_logo_white.png new file mode 100644 index 0000000000000000000000000000000000000000..c44c2036d3328b96bc0abdd647bc2fa951e361e6 GIT binary patch literal 8904 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 { + const uploadUrl = element.getAttribute('data-upload-url') || ''; + const initialSrc = element.getAttribute('data-initial-src') || ''; + const csrfToken = document.querySelector('meta[name="csrf-token"]')?.getAttribute('content') || ''; + + createRoot(element).render( + React.createElement(AvatarUploader, { + uploadUrl, + initialSrc, + csrfToken, + }) + ); +}); diff --git a/resources/js/components/profile/AvatarUploader.jsx b/resources/js/components/profile/AvatarUploader.jsx new file mode 100644 index 00000000..2866a205 --- /dev/null +++ b/resources/js/components/profile/AvatarUploader.jsx @@ -0,0 +1,198 @@ +import React, { useMemo, useRef, useState } from 'react'; +import axios from 'axios'; + +const MAX_BYTES = 2 * 1024 * 1024; +const ALLOWED_TYPES = new Set(['image/jpeg', 'image/png', 'image/webp']); + +function readImage(file) { + return new Promise((resolve, reject) => { + const reader = new FileReader(); + reader.onerror = () => reject(new Error('Failed to read avatar file.')); + reader.onload = () => { + const image = new Image(); + image.onerror = () => reject(new Error('Invalid image data.')); + image.onload = () => resolve(image); + image.src = String(reader.result || ''); + }; + reader.readAsDataURL(file); + }); +} + +function canvasToBlob(canvas, mimeType, quality) { + return new Promise((resolve, reject) => { + canvas.toBlob((blob) => { + if (!blob) { + reject(new Error('Failed to prepare avatar preview.')); + return; + } + resolve(blob); + }, mimeType, quality); + }); +} + +async function cropToSquareWebp(file) { + const image = await readImage(file); + const side = Math.min(image.width, image.height); + const sourceX = Math.floor((image.width - side) / 2); + const sourceY = Math.floor((image.height - side) / 2); + + const outputSize = Math.min(1024, side); + const canvas = document.createElement('canvas'); + canvas.width = outputSize; + canvas.height = outputSize; + + const context = canvas.getContext('2d', { alpha: false }); + if (!context) { + throw new Error('Browser canvas is unavailable.'); + } + + context.fillStyle = '#ffffff'; + context.fillRect(0, 0, outputSize, outputSize); + context.drawImage(image, sourceX, sourceY, side, side, 0, 0, outputSize, outputSize); + + const blob = await canvasToBlob(canvas, 'image/webp', 0.9); + return new File([blob], 'avatar.webp', { type: 'image/webp' }); +} + +export default function AvatarUploader({ uploadUrl, initialSrc, csrfToken }) { + const inputRef = useRef(null); + const [error, setError] = useState(''); + const [isDragging, setIsDragging] = useState(false); + const [isUploading, setIsUploading] = useState(false); + const [progress, setProgress] = useState(0); + const [avatarSrc, setAvatarSrc] = useState(initialSrc || ''); + + const helperText = useMemo(() => { + if (isUploading) { + return `Uploading ${progress}%...`; + } + return 'JPG, PNG, or WebP up to 2MB. Image is center-cropped to square.'; + }, [isUploading, progress]); + + const validateClientFile = (file) => { + if (!file) { + throw new Error('No file selected.'); + } + + if (!ALLOWED_TYPES.has(file.type)) { + throw new Error('Only JPG, PNG, and WebP are allowed.'); + } + + if (file.size > MAX_BYTES) { + throw new Error('Avatar file must be 2MB or smaller.'); + } + }; + + const upload = async (file) => { + validateClientFile(file); + + setError(''); + setProgress(0); + setIsUploading(true); + + try { + const squaredFile = await cropToSquareWebp(file); + const previewUrl = URL.createObjectURL(squaredFile); + setAvatarSrc(previewUrl); + + const formData = new FormData(); + formData.append('avatar', squaredFile); + + const response = await axios.post(uploadUrl, formData, { + headers: { + 'X-CSRF-TOKEN': csrfToken, + Accept: 'application/json', + 'Content-Type': 'multipart/form-data', + }, + onUploadProgress: (event) => { + if (!event.total) { + return; + } + + const next = Math.round((event.loaded * 100) / event.total); + setProgress(next); + }, + }); + + const data = response?.data || {}; + if (typeof data.url === 'string' && data.url.length > 0) { + setAvatarSrc(data.url); + } + } catch (uploadError) { + const message = uploadError?.response?.data?.message || uploadError?.message || 'Avatar upload failed.'; + setError(message); + } finally { + setIsUploading(false); + } + }; + + const onDrop = async (event) => { + event.preventDefault(); + setIsDragging(false); + + const file = event.dataTransfer?.files?.[0]; + if (file) { + await upload(file); + } + }; + + const onPick = async (event) => { + const file = event.target.files?.[0]; + if (file) { + await upload(file); + } + + if (event.target) { + event.target.value = ''; + } + }; + + return ( +
    +

    Avatar

    +
    + Current avatar preview + +
    { + event.preventDefault(); + setIsDragging(true); + }} + onDragLeave={() => setIsDragging(false)} + onDrop={onDrop} + onClick={() => inputRef.current?.click()} + onKeyDown={(event) => { + if (event.key === 'Enter' || event.key === ' ') { + event.preventDefault(); + inputRef.current?.click(); + } + }} + className={`w-full rounded-lg border-2 border-dashed p-4 text-sm transition ${isDragging ? 'border-indigo-500 bg-indigo-50' : 'border-gray-300 bg-white'}`} + aria-label="Upload avatar" + > +

    Drag & drop avatar here, or click to choose a file.

    +

    {helperText}

    + +
    +
    + + {error ?

    {error}

    : null} +
    + ); +} diff --git a/resources/views/legacy/chat.blade.php b/resources/views/community/chat.blade.php similarity index 98% rename from resources/views/legacy/chat.blade.php rename to resources/views/community/chat.blade.php index ac942e2a..7f4d9e0f 100644 --- a/resources/views/legacy/chat.blade.php +++ b/resources/views/community/chat.blade.php @@ -30,4 +30,4 @@
    • -@endsection +@endsection \ No newline at end of file diff --git a/resources/views/components/avatar.blade.php b/resources/views/components/avatar.blade.php index 0b909507..bae1a020 100644 --- a/resources/views/components/avatar.blade.php +++ b/resources/views/components/avatar.blade.php @@ -3,9 +3,7 @@ $size = $size ?? 128; $profile = $user->profile ?? null; $hash = $profile->avatar_hash ?? null; - $src = $hash - ? asset("storage/avatars/{$user->id}/{$size}.webp?v={$hash}") - : asset('img/default-avatar.webp'); + $src = \App\Support\AvatarUrl::forUser((int) $user->id, $hash, (int) $size); $alt = $alt ?? ($user->username ?? 'avatar'); $class = $class ?? 'rounded-full'; @endphp diff --git a/resources/views/layouts/_legacy.blade.php b/resources/views/layouts/_legacy.blade.php new file mode 100644 index 00000000..bc5a849b --- /dev/null +++ b/resources/views/layouts/_legacy.blade.php @@ -0,0 +1,50 @@ + + + + {{ $page_title ?? 'Skinbase' }} + + + + + + @isset($page_canonical) + + @endisset + + + + + @vite(['resources/css/app.css','resources/scss/nova.scss','resources/js/nova.js']) + @stack('head') + + + +
    +@include('layouts.nova.toolbar') + +
    +
    + @hasSection('sidebar') +
    +
    + @yield('content') +
    + +
    + @else +
    + @yield('content') +
    + @endif +
    +
    + +@include('layouts.nova.footer') + +@stack('toolbar') +@stack('scripts') + + + diff --git a/resources/views/layouts/legacy.blade.php b/resources/views/layouts/legacy.blade.php deleted file mode 100644 index 206576a6..00000000 --- a/resources/views/layouts/legacy.blade.php +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - {{ $page_title ?? 'Skinbase' }} - - - - - - - - - - - - - - - @stack('head') - - -
    - @include('legacy.toolbar') -
    -
    -
    - @yield('content') -
    - - {{-- Right sidebar placeholder (legacy layout) --}} -
    - @yield('sidebar') -
    - -
    -
    -
    - - {{-- Toolbar placeholder --}} - @stack('toolbar') - - - - - - - - - - - - - @stack('scripts') - - - diff --git a/resources/views/layouts/nova/toolbar.blade.php b/resources/views/layouts/nova/toolbar.blade.php index 3833458b..83c83ade 100644 --- a/resources/views/layouts/nova/toolbar.blade.php +++ b/resources/views/layouts/nova/toolbar.blade.php @@ -1,213 +1,240 @@
    -
    - - - - - - Skinbase.org - Skinbase.org - - - - + + +
    +
    + + +
    -
    -
    - - - + - -
    -
    - - -
    + + + + + +
    + + + +
    +
    + @else + + + @endauth
    - - @auth - - - @else - - - @endauth -
    diff --git a/resources/views/legacy/_artwork_card.blade.php b/resources/views/legacy/_artwork_card.blade.php index 1d7d1fa7..98dbd6e5 100644 --- a/resources/views/legacy/_artwork_card.blade.php +++ b/resources/views/legacy/_artwork_card.blade.php @@ -1,115 +1,2 @@ -@php - // If a Collection or array was passed accidentally, pick the first item. - if (isset($art) && (is_array($art) || $art instanceof Illuminate\Support\Collection || $art instanceof Illuminate\Database\Eloquent\Collection)) { - $first = null; - if (is_array($art)) { - $first = reset($art); - } elseif ($art instanceof Illuminate\Support\Collection || $art instanceof Illuminate\Database\Eloquent\Collection) { - $first = $art->first(); - } - if ($first) { - $art = $first; - } - } - - $title = trim((string) ($art->name ?? $art->title ?? 'Untitled artwork')); - $author = trim((string) ($art->uname ?? $art->author_name ?? $art->author ?? 'Skinbase')); - $category = trim((string) ($art->category_name ?? $art->category ?? 'General')); - $license = trim((string) ($art->license ?? 'Standard')); - $resolution = trim((string) ($art->resolution ?? ((isset($art->width, $art->height) && $art->width && $art->height) ? ($art->width . '×' . $art->height) : ''))); - // Safe integer extractor: handle numeric, arrays, Collections, or relations - $safeInt = function ($v, $fallback = 0) { - if (is_numeric($v)) return (int) $v; - if (is_array($v)) return count($v); - if (is_object($v)) { - // Eloquent Collections implement Countable and have count() - if (method_exists($v, 'count')) return (int) $v->count(); - if ($v instanceof Countable) return (int) count($v); - } - return (int) $fallback; - }; - - $likes = $safeInt($art->likes ?? $art->favourites ?? 0); - $downloads = $safeInt($art->downloads ?? $art->downloaded ?? 0); - - $img_src = (string) ($art->thumb ?? $art->thumbnail_url ?? '/images/placeholder.jpg'); - $img_srcset = (string) ($art->thumb_srcset ?? $art->thumbnail_srcset ?? $img_src); - $img_avif_srcset = (string) ($art->thumb_avif_srcset ?? $img_srcset); - $img_webp_srcset = (string) ($art->thumb_webp_srcset ?? $img_srcset); - - // Width/height may be stored directly or as a related object; handle safely - $resolveDimension = function ($val, $fallback) { - if (is_numeric($val)) return (int) $val; - if (is_array($val)) { - $v = reset($val); - return is_numeric($v) ? (int) $v : (int) $fallback; - } - if (is_object($val)) { - if (method_exists($val, 'first')) { - $f = $val->first(); - if (is_object($f) && isset($f->width)) return (int) ($f->width ?: $fallback); - if (is_object($f) && isset($f->height)) return (int) ($f->height ?: $fallback); - } - // Try numeric cast otherwise - if (isset($val->width)) return (int) $val->width; - if (isset($val->height)) return (int) $val->height; - } - return (int) $fallback; - }; - - $img_width = max(1, $resolveDimension($art->width ?? null, 800)); - $img_height = max(1, $resolveDimension($art->height ?? null, 600)); - - $contentUrl = $img_src; - $cardUrl = (string) ($art->url ?? '#'); -@endphp - - +{{-- Shim for legacy artwork card includes. Points to new web partial. --}} +@include('web.partials._artwork_card') diff --git a/resources/views/legacy/forum/posts.blade.php b/resources/views/legacy/forum/posts.blade.php index d497a798..28e9f66f 100644 --- a/resources/views/legacy/forum/posts.blade.php +++ b/resources/views/legacy/forum/posts.blade.php @@ -28,7 +28,7 @@
    @if (!empty($post->user_id) && !empty($post->icon)) - {{ $post->uname }} + {{ $post->uname }} @else
    @endif diff --git a/resources/views/legacy/interview.blade.php b/resources/views/legacy/interview.blade.php index af1364fe..2bb59b65 100644 --- a/resources/views/legacy/interview.blade.php +++ b/resources/views/legacy/interview.blade.php @@ -32,7 +32,7 @@ @if(!empty($comment->user_id) && !empty($comment->icon)) -
    +
    @endif
    Posted by: {{ $comment->author }}
    Posts: {{ $postCounts[$comment->author] ?? 0 }} diff --git a/resources/views/legacy/interviews.blade.php b/resources/views/legacy/interviews.blade.php index a9650a42..b78d76ad 100644 --- a/resources/views/legacy/interviews.blade.php +++ b/resources/views/legacy/interviews.blade.php @@ -22,7 +22,7 @@ @if(!empty($interview->icon)) - + @else diff --git a/resources/views/legacy/latest-comments.blade.php b/resources/views/legacy/latest-comments.blade.php index ed99954f..2e33899c 100644 --- a/resources/views/legacy/latest-comments.blade.php +++ b/resources/views/legacy/latest-comments.blade.php @@ -15,7 +15,7 @@
    - {{ $comment->uname }} + {{ $comment->uname }}
    diff --git a/resources/views/legacy/monthly-commentators.blade.php b/resources/views/legacy/monthly-commentators.blade.php index 28b7921e..7066d119 100644 --- a/resources/views/legacy/monthly-commentators.blade.php +++ b/resources/views/legacy/monthly-commentators.blade.php @@ -27,7 +27,7 @@ - {{ $row->uname }} + {{ $row->uname }} diff --git a/resources/views/legacy/mybuddies.blade.php b/resources/views/legacy/mybuddies.blade.php index 13fd2c60..c91f446c 100644 --- a/resources/views/legacy/mybuddies.blade.php +++ b/resources/views/legacy/mybuddies.blade.php @@ -28,7 +28,7 @@ diff --git a/resources/views/legacy/news.blade.php b/resources/views/legacy/news.blade.php index 7c875833..0d87945c 100644 --- a/resources/views/legacy/news.blade.php +++ b/resources/views/legacy/news.blade.php @@ -36,7 +36,7 @@ @if(!empty($ar->icon)) @endif diff --git a/resources/views/legacy/profile.blade.php b/resources/views/legacy/profile.blade.php index 87239b6d..f3e9453c 100644 --- a/resources/views/legacy/profile.blade.php +++ b/resources/views/legacy/profile.blade.php @@ -34,7 +34,7 @@
    User
    - {{ $user->uname }} + {{ $user->uname }}

    {{ $user->uname }}

    {{ $user->about_me ?? '' }}

    diff --git a/resources/views/legacy/received-comments.blade.php b/resources/views/legacy/received-comments.blade.php index 75f08fdb..855bd955 100644 --- a/resources/views/legacy/received-comments.blade.php +++ b/resources/views/legacy/received-comments.blade.php @@ -21,7 +21,7 @@
    - {{ $author->name ?? $author->uname ?? '' }} + {{ $author->name ?? $author->uname ?? '' }}
    diff --git a/resources/views/legacy/toolbar.blade.php b/resources/views/legacy/toolbar.blade.php index 5dcbf970..0cefc747 100644 --- a/resources/views/legacy/toolbar.blade.php +++ b/resources/views/legacy/toolbar.blade.php @@ -119,9 +119,9 @@ } try { $profile = \Illuminate\Support\Facades\DB::table('user_profiles')->where('user_id', $userId)->first(); - $avatar = $profile->avatar ?? null; + $avatarHash = $profile->avatar_hash ?? null; } catch (\Throwable $e) { - $avatar = null; + $avatarHash = null; } $displayName = auth()->user()->name ?: (auth()->user()->username ?? ''); @endphp @@ -141,9 +141,7 @@
  • - @if($avatar) - {{ $displayName }}   - @endif + {{ $displayName }}   {{ $displayName }}   diff --git a/resources/views/legacy/top-authors.blade.php b/resources/views/legacy/top-authors.blade.php index febb459c..ed4513b4 100644 --- a/resources/views/legacy/top-authors.blade.php +++ b/resources/views/legacy/top-authors.blade.php @@ -27,7 +27,7 @@ - {{ $u->uname }} + {{ $u->uname }} @@ -60,7 +60,7 @@ - {{ $f->uname }} + {{ $f->uname }} @@ -92,7 +92,7 @@ - {{ $c->uname }} + {{ $c->uname }} diff --git a/resources/views/manage/edit.blade.php b/resources/views/manage/edit.blade.php index 19b4ce88..49f5587b 100644 --- a/resources/views/manage/edit.blade.php +++ b/resources/views/manage/edit.blade.php @@ -2,15 +2,15 @@ @section('content')
    -

    Edit Artwork: {{ $artwork->name }}

    +

    Edit Artwork: {{ $artwork->title }}

    @csrf
    - - + +