Merge pull request #11831 from nanaya/contest-mania-others

Support non-4k/7k mania variant in "best of" contests
ppy · Jan 31, 2025 · 64d9d99 · 64d9d99
2 parents baaac3e + 4542693
commit 64d9d99
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/app/Models/Contest.php b/app/Models/Contest.php
@@ -314,11 +314,15 @@ public function entriesByType($user = null, array $preloads = [])
                             });
 
                         if ($ruleset === 'mania' && isset($options['variant'])) {
-                            $keys = match ($options['variant']) {
-                                '4k' => 4,
-                                '7k' => 7,
-                            };
-                            $query->where('osu_beatmaps.diff_size', $keys);
+                            if ($options['variant'] === 'nk') {
+                                $query->whereNotIn('osu_beatmaps.diff_size', [4, 7]);
+                            } else {
+                                $keys = match ($options['variant']) {
+                                    '4k' => 4,
+                                    '7k' => 7,
+                                };
+                                $query->where('osu_beatmaps.diff_size', $keys);
+                            }
                         }
                     })->get();
             }