messages implemented

app/Http/Controllers/User/FavouritesController.php

@@ -3,17 +3,17 @@
 namespace App\Http\Controllers\User;
 
 use App\Http\Controllers\Controller;
+use App\Services\UserStatsService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Str;
-use App\Models\UserFavorite;
+use App\Models\ArtworkFavourite;
 
 class FavouritesController extends Controller
 {
     public function index(Request $request, $userId = null, $username = null)
     {
-        $userId = $userId ? (int)$userId : ($request->user()->id ?? null);
+        $userId = $userId ? (int) $userId : ($request->user()->id ?? null);
 
         $page = max(1, (int) $request->query('page', 1));
         $hits = 20;
@@ -23,99 +23,39 @@ class FavouritesController extends Controller
         $results = collect();
 
         try {
-            $schema = DB::getSchemaBuilder();
+            $query = ArtworkFavourite::with(['artwork.user'])
+                ->where('user_id', $userId)
+                ->orderByDesc('created_at')
+                ->orderByDesc('artwork_id');
+
+            $total = (int) $query->count();
+
+            $favorites = $query->skip($start)->take($hits)->get();
+
+            $results = $favorites->map(function ($fav) {
+                $art = $fav->artwork;
+                if (! $art) {
+                    return null;
+                }
+                $item = (object) $art->toArray();
+                $item->uname = $art->user?->username ?? $art->user?->name ?? null;
+                $item->datum = $fav->created_at;
+                return $item;
+            })->filter();
         } catch (\Throwable $e) {
-            $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();
-                }
-            }
+            $total = 0;
+            $results = collect();
         }
 
         $results = collect($results)->filter()->values()->transform(function ($row) {
-            $row->name = $row->name ?? '';
+            $row->name = $row->name ?? $row->title ?? '';
             $row->slug = $row->slug ?? Str::slug($row->name);
-            $row->encoded = isset($row->id) ? app(\App\Helpers\Thumb::class)::encodeId((int)$row->id) : null;
+            $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';
+        $displayName = $username ?: (DB::table('users')->where('id', $userId)->value('username') ?? '');
+        $page_title = $displayName . ' Favourites';
 
         return view('user.favourites', [
             'results' => $results,
@@ -134,9 +74,13 @@ class FavouritesController extends Controller
             abort(403);
         }
 
-        $favTable = Schema::hasTable('user_favorites') ? 'user_favorites' : (Schema::hasTable('artworks_favourites') ? 'artworks_favourites' : 'favourites');
+        $creatorId = (int) DB::table('artworks')->where('id', (int) $artworkId)->value('user_id');
 
-        DB::table($favTable)->where('user_id', (int)$userId)->where('artwork_id', (int)$artworkId)->delete();
+        DB::table('artwork_favourites')->where('user_id', (int) $userId)->where('artwork_id', (int) $artworkId)->delete();
+
+        if ($creatorId) {
+            app(UserStatsService::class)->decrementFavoritesReceived($creatorId);
+        }
 
         return redirect()->route('legacy.favourites', ['id' => $userId])->with('status', 'Removed from favourites');
     }

app/Http/Controllers/User/ProfileController.php

@@ -8,9 +8,11 @@ use App\Models\Artwork;
 use App\Models\ProfileComment;
 use App\Models\User;
 use App\Services\ArtworkService;
+use App\Services\FollowService;
 use App\Services\ThumbnailPresenter;
 use App\Services\ThumbnailService;
 use App\Services\UsernameApprovalService;
+use App\Services\UserStatsService;
 use App\Support\AvatarUrl;
 use App\Support\UsernamePolicy;
 use Illuminate\Http\JsonResponse;
@@ -29,6 +31,8 @@ class ProfileController extends Controller
     public function __construct(
         private readonly ArtworkService $artworkService,
         private readonly UsernameApprovalService $usernameApprovalService,
+        private readonly FollowService $followService,
+        private readonly UserStatsService $userStats,
     )
     {
     }
@@ -73,35 +77,15 @@ class ProfileController extends Controller
     public function toggleFollow(Request $request, string $username): JsonResponse
     {
         $normalized = UsernamePolicy::normalize($username);
-        $target = User::query()->whereRaw('LOWER(username) = ?', [$normalized])->firstOrFail();
+        $target     = User::query()->whereRaw('LOWER(username) = ?', [$normalized])->firstOrFail();
+        $actorId    = (int) Auth::id();
 
-        $viewerId = Auth::id();
-
-        if ($viewerId === $target->id) {
+        if ($actorId === $target->id) {
             return response()->json(['error' => 'Cannot follow yourself.'], 422);
         }
 
-        $exists = DB::table('user_followers')
-            ->where('user_id', $target->id)
-            ->where('follower_id', $viewerId)
-            ->exists();
-
-        if ($exists) {
-            DB::table('user_followers')
-                ->where('user_id', $target->id)
-                ->where('follower_id', $viewerId)
-                ->delete();
-            $following = false;
-        } else {
-            DB::table('user_followers')->insertOrIgnore([
-                'user_id'    => $target->id,
-                'follower_id'=> $viewerId,
-                'created_at' => now(),
-            ]);
-            $following = true;
-        }
-
-        $count = DB::table('user_followers')->where('user_id', $target->id)->count();
+        $following = $this->followService->toggle($actorId, (int) $target->id);
+        $count     = $this->followService->followersCount((int) $target->id);
 
         return response()->json([
             'following'      => $following,
@@ -510,11 +494,7 @@ class ProfileController extends Controller
         // ── Increment profile views (async-safe, ignore errors) ──────────────
         if (! $isOwner) {
             try {
-                DB::table('user_statistics')
-                    ->updateOrInsert(
-                        ['user_id' => $user->id],
-                        ['profile_views' => DB::raw('COALESCE(profile_views, 0) + 1'), 'updated_at' => now()]
-                    );
+                $this->userStats->incrementProfileViews($user->id);
             } catch (\Throwable) {}
         }
 

app/Http/Controllers/User/TodayInHistoryController.php

@@ -3,51 +3,87 @@
 namespace App\Http\Controllers\User;
 
 use App\Http\Controllers\Controller;
+use App\Models\Artwork;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
 
 class TodayInHistoryController extends Controller
 {
     public function index(Request $request)
     {
-        $hits = 39;
+        $perPage   = 36;
+        $artworks  = null;
+        $today     = now();
 
-        try {
-            $base = DB::table('featured_works as t0')
-                ->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'));
+        // ── Strategy 1: legacy featured_works table (historical data from old site) ─
+        $hasFeaturedWorks = false;
+        try { $hasFeaturedWorks = Schema::hasTable('featured_works'); } catch (\Throwable) {}
 
-            $artworks = $base->orderBy('t0.post_date','desc')->paginate($hits);
-        } catch (\Throwable $e) {
-            $artworks = null;
+        if ($hasFeaturedWorks) {
+            try {
+                $artworks = DB::table('featured_works as f')
+                    ->join('artworks as a', 'f.artwork_id', '=', 'a.id')
+                    ->where('a.is_approved', true)
+                    ->where('a.is_public', true)
+                    ->whereNull('a.deleted_at')
+                    ->whereRaw('MONTH(f.post_date) = ?', [$today->month])
+                    ->whereRaw('DAY(f.post_date) = ?',   [$today->day])
+                    ->select('a.id', 'a.title as name', 'a.slug', 'a.hash', 'a.thumb_ext',
+                             DB::raw('f.post_date as featured_date'))
+                    ->orderBy('f.post_date', 'desc')
+                    ->paginate($perPage);
+            } 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'];
+        // ── Strategy 2: new artwork_features table ───────────────────────────────
+        if (!$artworks || $artworks->total() === 0) {
+            try {
+                $artworks = DB::table('artwork_features as f')
+                    ->join('artworks as a', 'f.artwork_id', '=', 'a.id')
+                    ->where('f.is_active', true)
+                    ->where('a.is_approved', true)
+                    ->where('a.is_public', true)
+                    ->whereNull('a.deleted_at')
+                    ->whereNotNull('a.published_at')
+                    ->whereRaw('MONTH(f.featured_at) = ?', [$today->month])
+                    ->whereRaw('DAY(f.featured_at) = ?',   [$today->day])
+                    ->select('a.id', 'a.title as name', 'a.slug', 'a.hash', 'a.thumb_ext',
+                             DB::raw('f.featured_at as featured_date'))
+                    ->orderBy('f.featured_at', 'desc')
+                    ->paginate($perPage);
+            } catch (\Throwable $e) {
+                $artworks = null;
+            }
+        }
+
+        // ── Enrich with CDN thumbnails (batch load to avoid N+1) ─────────────────
+        if ($artworks && method_exists($artworks, 'getCollection') && $artworks->count() > 0) {
+            $ids        = $artworks->getCollection()->pluck('id')->all();
+            $modelsById = Artwork::whereIn('id', $ids)->get()->keyBy('id');
+
+            $artworks->getCollection()->transform(function ($row) use ($modelsById) {
+                /** @var ?Artwork $art */
+                $art = $modelsById->get($row->id);
+                if ($art) {
+                    $row->thumb_url = $art->thumbUrl('md') ?? '/gfx/sb_join.jpg';
+                    $row->art_url   = '/art/' . $art->id . '/' . $art->slug;
+                    $row->name      = $art->title ?: ($row->name ?? 'Untitled');
+                } else {
+                    $row->thumb_url = '/gfx/sb_join.jpg';
+                    $row->art_url   = '/art/' . $row->id;
+                    $row->name      = $row->name ?? 'Untitled';
                 }
-                $row->gid_num = ((int)($row->category ?? 0) % 5) * 5;
                 return $row;
             });
         }
 
         return view('legacy::today-in-history', [
-            'artworks' => $artworks,
+            'artworks'   => $artworks,
             'page_title' => 'Popular on this day in history',
+            'todayLabel' => $today->format('F j'),
         ]);
     }
 }

app/Http/Controllers/User/TopFavouritesController.php

@@ -15,11 +15,11 @@ class TopFavouritesController extends Controller
         $hits = 21;
         $page = max(1, (int) $request->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');
+        $base = DB::table('artwork_favourites as t1')
+            ->join('artworks as t2', 't1.artwork_id', '=', 't2.id')
+            ->whereNotNull('t2.published_at')
+            ->select('t2.id', 't2.title as name', 't2.slug', DB::raw('NULL as picture'), DB::raw('NULL as category'), DB::raw('COUNT(*) as num'))
+            ->groupBy('t2.id', 't2.title', 't2.slug');
 
         try {
             $paginator = (clone $base)->orderBy('num', 'desc')->paginate($hits)->withQueryString();