Add per-beatmap team ranking

app/Http/Controllers/BeatmapsController.php

@@ -36,7 +36,7 @@ public function __construct()
     private static function assertSupporterOnlyOptions(?User $currentUser, string $type, array $mods): void
     {
         $isSupporter = $currentUser !== null && $currentUser->isSupporter();
-        if ($type !== 'global' && !$isSupporter) {
+        if (!in_array($type, ScoreSearchParams::FREE_TYPES, true) && !$isSupporter) {
             throw new InvariantException(osu_trans('errors.supporter_only'));
         }
         if (!empty($mods) && !is_api_request() && !$isSupporter) {

app/Libraries/Search/ScoreSearch.php

@@ -69,6 +69,9 @@ public function getQuery(): BoolQuery
             case 'friend':
                 $query->filter(['terms' => ['user_id' => $this->params->getFriendIds()]]);
                 break;
+            case 'team':
+                $query->filter(['terms' => ['user_id' => $this->params->getTeamMemberIds()]]);
+                break;
         }
 
         $beforeTotalScore = $this->params->beforeTotalScore;

app/Libraries/Search/ScoreSearchParams.php

@@ -15,8 +15,9 @@
 
 class ScoreSearchParams extends SearchParams
 {
-    const VALID_TYPES = ['global', 'country', 'friend'];
     const DEFAULT_TYPE = 'global';
+    const FREE_TYPES = ['global', 'team'];
+    const VALID_TYPES = ['global', 'country', 'friend', 'team'];
 
     public ?array $beatmapIds = null;
     public ?Score $beforeScore = null;
@@ -103,6 +104,11 @@ public function getFriendIds(): array
         return [...$this->user->friends()->allRelatedIds(), $this->user->getKey()];
     }
 
+    public function getTeamMemberIds(): array
+    {
+        return $this->user?->team?->members()->pluck('user_id')->all() ?? [];
+    }
+
     public function getType(): string
     {
         return $this->type;

resources/js/beatmapsets-show/scoreboard/controller.ts

@@ -65,13 +65,17 @@ export default class Controller {
       return 'unranked';
     }
 
-    if (!core.currentUser?.is_supporter && (this.currentType !== 'global' || this.enabledMods.size > 0)) {
+    if (!core.currentUser?.is_supporter && this.requiresSupporter) {
       return 'supporter_only';
     }
 
     return this.xhrState;
   }
 
+  get requiresSupporter() {
+    return !['global', 'team'].includes(this.currentType) || this.enabledMods.size > 0;
+  }
+
   constructor(private readonly container: HTMLElement, private readonly getBeatmap: () => BeatmapExtendedJson) {
     let storedState: StoredState | null = null;
     try {

resources/js/beatmapsets-show/scoreboard/scoreboard-type.ts

@@ -1,7 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
 // See the LICENCE file in the repository root for full licence text.
 
-export const scoreboardTypes = ['global', 'country', 'friend'] as const;
+export const scoreboardTypes = ['global', 'country', 'friend', 'team'] as const;
 
 type ScoreboardType = typeof scoreboardTypes[number];
 export default ScoreboardType;

resources/js/beatmapsets-show/scoreboard/tab.tsx

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 import { observer } from 'mobx-react';
+import core from 'osu-core-singleton';
 import * as React from 'react';
 import { classWithModifiers } from 'utils/css';
 import { trans } from 'utils/lang';
@@ -15,15 +16,25 @@ interface Props {
 
 @observer
 export default class ScoreboardTab extends React.Component<Props> {
+  private get isVisible() {
+    return this.props.type !== 'team' || core.currentUser?.team != null;
+  }
+
   render() {
+    if (!this.isVisible) return null;
+
+    const label = trans(`beatmapsets.show.scoreboard.${this.props.type}`);
+
     return (
       <div
         className={classWithModifiers('page-tabs__tab', {
           active: this.props.controller.currentType === this.props.type,
         })}
         onClick={this.onClick}
       >
-        {trans(`beatmapsets.show.scoreboard.${this.props.type}`)}
+        <span className='fake-bold' data-content={label}>
+          {label}
+        </span>
       </div>
     );
   }

resources/lang/en/beatmapsets.php

@@ -171,6 +171,7 @@
             'global' => 'Global Ranking',
             'supporter-link' => 'Click <a href=":link">here</a> to see all the fancy features that you get!',
             'supporter-only' => 'You need to be an osu!supporter to access the friend, country, or mod-specific rankings!',
+            'team' => 'Team Ranking',
             'title' => 'Scoreboard',
 
             'headers' => [
@@ -192,6 +193,7 @@
                 'friend' => 'None of your friends have set a score on this map yet!',
                 'global' => 'No scores yet. Maybe you should try setting some?',
                 'loading' => 'Loading scores...',
+                'team' => 'No one from your team has set a score on this map yet!',
                 'unranked' => 'Unranked beatmap.',
             ],
             'score' => [