Add seasonal leaderboards #11804

venix12 · 2025-01-20T22:31:10Z

Depends on #11768.
Part of #8736.

This adds per-season rankings to current seasons page, including seasonal total score (as of #11768) and assigned division display (calculation of which is part of this PR).

image_url column of divisions table isn't currently being utilized for purpose of the ranking display, but will be used for user profile division display in the future.

peppy · 2025-01-24T05:52:54Z

@venix12 able to add some screenshots showing what we're adding here? 😄

venix12 · 2025-01-25T12:57:10Z

@venix12 able to add some screenshots showing what we're adding here? 😄

updated the opening message accordingly 👁️

venix12 · 2025-01-28T08:30:47Z

app/Models/Season.php

+    {
+        return cache_remember_mutexed(
+            "divisions:{$this->id}",
+            $GLOBALS['cfg']['osu']['seasons']['divisions_cache_duration'],


recently saw the duration being pulled from config/env in other places (tags) so just mimicked that, but wondering if this is actually needed here to begin with 🤔

no it's not. the other place involves some aggregation and stuff

by "it's not" I mean the whole caching...

nanaya · 2025-02-05T11:32:10Z

what's this division/threshold/absolute threshold thing here? What's the difference between absolute and not?

venix12 · 2025-02-05T11:55:19Z

Divisions are tiers that are assigned to each of season's players based on their rank.

The divsisions (set per-season) are assigned for top x% of season players, therefore:

threshold is a (0-1) fraction meant to represent top amount of season's playerbase that should be assigned the division (e.g. 0.05, so 5%), it's stored in divisions table
absolute threshold is amount actual amount of players that will be assigned said division, aka. threshold * season players count, dynamically calculated based on current player count (e.g. Division with threshold=0.05 will be assigned to top 5 players of season with 100 participants)

threshold column should probably use decimal(4,3) or so instead of float now that i think about this 🤔

database/migrations/2025_01_06_203319_create_divisions_table.php

resources/views/seasons/_rankings_table.blade.php

app/Models/Season.php

nanaya · 2025-02-05T12:31:47Z

app/Models/Season.php

+    public function divisionsWithAbsoluteThresholds(): array
+    {
+        $divisions = $this->divisions()->orderBy('threshold')->get();
+        $userCount = $this->userScores()->count();


I believe this should have forRanking filter just like the actual table

also the value is already queried by the pagination thing...

nanaya · 2025-02-05T12:41:40Z

resources/views/seasons/_rankings_table.blade.php

+                    @if (isset($currentDivision))
+                        {{ $currentDivision['division']->name }}
+                    @endif


just use ?->name and skip the null check

that will throw error on trying to access division key on null, won't it? 🤔

oh I was trying it on a different thing before where the variable is assigned actual model. an ?? '' at the end works

resources/views/seasons/_rankings_table.blade.php

app/Models/UserSeasonScoreAggregate.php

nanaya · 2025-02-06T13:14:19Z

database/migrations/2025_01_06_203319_create_season_divisions_table.php

@@ -0,0 +1,37 @@
+<?php


migration date needs an update

nanaya · 2025-02-06T13:30:31Z

database/migrations/2025_01_06_203319_create_season_divisions_table.php

+            $table->integer('season_id')->unsigned();
+            $table->string('name');
+            $table->string('image_url');
+            $table->decimal('threshold', 4, 3);


this results in string (including when casted as decimal) which isn't wanted. Operating on it properly is also a bit verbose. And then the result is rounded anyway...

A double is probably fine (or cast to double)

nanaya · 2025-02-06T13:39:18Z

app/Models/SeasonDivision.php

+ * @property string $image_url
+ * @property string $name
+ * @property int $season_id
+ * @property int $threshold


nanaya · 2025-02-06T13:46:44Z

app/Models/Season.php

+        foreach ($divisions as $division) {
+            $divisionsWithMaxRanks[] = [
+                'division' => $division,
+                'max_rank' => $division->threshold * $userCount,


can use an explicit rounding and casting to int

nanaya · 2025-02-07T10:35:57Z

app/Models/SeasonDivision.php

+ * @property string $image_url
+ * @property string $name
+ * @property int $season_id
+ * @property double $threshold


it's all float in php

nanaya · 2025-02-07T10:36:03Z

app/Models/Season.php

+        foreach ($divisions as $division) {
+            $divisionsWithMaxRanks[] = [
+                'division' => $division,
+                'max_rank' => get_int($division->threshold * $userCount),


it works but it's not quite what get_int is for... ಠ_ಠ (it's more for validating unknown variable/string, not a known float)

nanaya · 2025-02-07T10:36:33Z

resources/views/seasons/_rankings_table.blade.php

+
+            <tr class="{{ class_with_modifiers('ranking-page-table__row', ['inactive' => !$score->user->isActive()]) }}">
+                <td class="ranking-page-table__column ranking-page-table__column--rank">
+                    #{{ $rank }}


can use i18n formatting

nanaya · 2025-02-07T10:38:40Z

resources/views/seasons/_rankings_table.blade.php

+    <tbody>
+        @foreach ($scores as $index => $score)
+            @php
+                $rank = $scores->firstItem() + $index;


minor thing but maybe store the firstItem value beforehand

nanaya · 2025-02-07T10:54:10Z

resources/views/seasons/show.blade.php

@@ -34,6 +34,10 @@ class="btn-osu-big btn-osu-big--rounded-thin"
    <div class="js-react--seasons-show"></div>
 @endsection

+@section('scores')
+    @include('seasons._rankings_table', [$divisions, $scores])


that's not how passing variable works. It should be ['var' => $thing] to access it as $var in the included view. It only seemed to work because all variables from current context are passed through.

add seasonal leaderboards

c6ce540

venix12 changed the title ~~Seasons leaderboards~~ Add seasonal leaderboards Jan 20, 2025

add divisions cache key to .env

d9c26a3

venix12 mentioned this pull request Jan 20, 2025

Extending flexibility of playlist system to better support spotlights evolving #8736

Open

3 tasks

venix12 added 2 commits January 20, 2025 23:57

proper return type

866501e

add missing property-reads

0bb20d7

venix12 added 2 commits January 28, 2025 09:03

Merge branch 'master' into seasons-leaderboards

f1a46a6

missing css class

f4b7ffd

venix12 commented Jan 28, 2025

View reviewed changes

venix12 added 4 commits February 5, 2025 10:58

don't pull cache duration from config

b538fe6

improved divisions frontend handling

cf25b76

Merge branch 'master' into seasons-leaderboards

3f165cf

don't cache divisions

f176de3

nanaya requested changes Feb 5, 2025

View reviewed changes

venix12 added 7 commits February 6, 2025 12:47

various frontend improvements

e30c8fd

use decimal for threshold instead

677d2c9

absolute threshold -> max rank

1cf5f36

use fn shorthand

de9d6e5

allow usercount overwrite

1ccf916

simplify division null check

aed0ccc

division -> season division

3b57395

nanaya requested changes Feb 6, 2025

View reviewed changes

venix12 added 4 commits February 7, 2025 01:26

cast threshold to double

1ebbc0f

cast max rank to int

f7ce2d7

default null for userCount argument

6a72b25

redate migration

369c87a

actually just use double column for threshold

e319827

nanaya requested changes Feb 7, 2025

View reviewed changes

venix12 added 4 commits February 7, 2025 12:05

cast to int properly

67df481

use float for property instead

098c4ef

view clean-ups

6c72589

proper variable passing

145234b

nanaya approved these changes Feb 7, 2025

View reviewed changes

Merge branch 'master' into seasons-leaderboards

5df9523

nanaya enabled auto-merge February 7, 2025 12:05

nanaya merged commit 1e92697 into ppy:master Feb 7, 2025
3 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add seasonal leaderboards #11804

Add seasonal leaderboards #11804

venix12 commented Jan 20, 2025 •

edited

Loading

peppy commented Jan 24, 2025 •

edited

Loading

venix12 commented Jan 25, 2025

venix12 Jan 28, 2025 •

edited

Loading

nanaya Feb 5, 2025

nanaya Feb 5, 2025

nanaya commented Feb 5, 2025

venix12 commented Feb 5, 2025 •

edited

Loading

nanaya Feb 5, 2025

nanaya Feb 5, 2025

venix12 Feb 6, 2025

nanaya Feb 6, 2025

nanaya Feb 6, 2025

nanaya Feb 6, 2025

nanaya Feb 6, 2025

nanaya Feb 6, 2025

nanaya Feb 7, 2025

nanaya Feb 7, 2025

nanaya Feb 7, 2025

nanaya Feb 7, 2025

nanaya Feb 7, 2025

Add seasonal leaderboards #11804

Add seasonal leaderboards #11804

Conversation

venix12 commented Jan 20, 2025 • edited Loading

peppy commented Jan 24, 2025 • edited Loading

venix12 commented Jan 25, 2025

venix12 Jan 28, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nanaya commented Feb 5, 2025

venix12 commented Feb 5, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

venix12 commented Jan 20, 2025 •

edited

Loading

peppy commented Jan 24, 2025 •

edited

Loading

venix12 Jan 28, 2025 •

edited

Loading

venix12 commented Feb 5, 2025 •

edited

Loading