Skip to content

Commit 0d191f0

Browse files
committed
FCEA Ranking now recalculating the whole day.
Fursuit Gallery now orders by event
1 parent 6de839b commit 0d191f0

2 files changed

Lines changed: 19 additions & 9 deletions

File tree

app/Http/Controllers/GALLERY/GalleryController.php

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,29 +79,40 @@ public function index(Request $request): \Inertia\Response|\Illuminate\Http\Redi
7979
switch ($sortBy) {
8080
case 'catches_asc':
8181
if ($isHistoricalEvent) {
82-
$query->orderBy('name', 'asc'); // Fallback to name for historical events
82+
$query->orderBy('name')
83+
->orderByDesc('event_id'); // Fallback to name for historical events
8384
} else {
84-
$query->orderBy('catched_by_users_count', 'asc')->orderBy('name', 'asc');
85+
$query->orderBy('catched_by_users_count')
86+
->orderBy('name')
87+
->orderByDesc('event_id'); // Show newest event first on same name + count
8588
}
8689
break;
8790
case 'name_asc':
88-
$query->orderBy('name', 'asc');
91+
$query->orderBy('name')
92+
->orderByDesc('event_id');
8993
break;
9094
case 'name_desc':
91-
$query->orderBy('name', 'desc');
95+
$query->orderByDesc('name')
96+
->orderByDesc('event_id');
9297
break;
9398
case 'catches_desc':
9499
if ($isHistoricalEvent) {
95-
$query->orderBy('name', 'asc'); // Fallback to name for historical events
100+
$query->orderBy('name')
101+
->orderByDesc('event_id'); // Fallback to name for historical events
96102
} else {
97-
$query->orderBy('catched_by_users_count', 'desc')->orderBy('name', 'asc');
103+
$query->orderByDesc('catched_by_users_count')
104+
->orderBy('name')
105+
->orderByDesc('event_id');
98106
}
99107
break;
100108
default:
101109
if ($isHistoricalEvent) {
102-
$query->orderBy('name', 'asc'); // Default to name for historical events
110+
$query->orderBy('name')
111+
->orderByDesc('event_id'); // Default to name for historical events
103112
} else {
104-
$query->orderBy('catched_by_users_count', 'desc')->orderBy('name', 'asc');
113+
$query->orderByDesc('catched_by_users_count')
114+
->orderBy('name')
115+
->orderByDesc('event_id');
105116
}
106117
break;
107118
}

routes/console.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@
55
// FCEA Rankings - refresh every 15 minutes during convention hours
66
\Illuminate\Support\Facades\Schedule::command('fcea:refresh-rankings')
77
->everyFifteenMinutes()
8-
->between('08:00', '23:00')
98
->withoutOverlapping()
109
->runInBackground();

0 commit comments

Comments
 (0)