return tags with counts with beatmaps

app/Http/Controllers/BeatmapsetsController.php

@@ -404,6 +404,7 @@ private function showJson($beatmapset)
             'beatmaps.failtimes',
             'beatmaps.max_combo',
             'beatmaps.owners',
+            'beatmaps.tags',
             'converts',
             'converts.failtimes',
             'converts.owners',
@@ -417,7 +418,6 @@ private function showJson($beatmapset)
             'recent_favourites',
             'related_users',
             'user',
-            'user_tags',
         ]);
     }
 }

app/Transformers/BeatmapCompactTransformer.php

@@ -18,6 +18,7 @@ class BeatmapCompactTransformer extends TransformerAbstract
         'failtimes',
         'max_combo',
         'owners',
+        'tags',
         'user',
     ];
 
@@ -83,6 +84,11 @@ public function includeOwners(Beatmap $beatmap)
         ]);
     }
 
+    public function includeTags(Beatmap $beatmap)
+    {
+        return $this->primitive($beatmap->topTagsJson());
+    }
+
     public function includeUser(Beatmap $beatmap)
     {
         return $this->item(

resources/js/beatmapsets-show/controller.ts

@@ -1,6 +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.
 
+import BeatmapJson from 'interfaces/beatmap-json';
 import { BeatmapsetJsonForShow } from 'interfaces/beatmapset-extended-json';
 import UserJson from 'interfaces/user-json';
 import { keyBy } from 'lodash';
@@ -70,6 +71,23 @@ export default class Controller {
     return this.beatmaps.get(this.currentBeatmap.mode) ?? [];
   }
 
+  @computed
+  get tags() {
+    const summedTags: Partial<Record<number, BeatmapJson['tags']>> = {};
+    for (const beatmap of this.beatmapset.beatmaps) {
+      if (beatmap.tags == null) continue;
+      for (const tag of beatmap.tags) {
+        if (summedTags[tag.id] != null) {
+          summedTags[tag.id].count += tag.count;
+        } else {
+          summedTags[tag.id] = tag;
+        }
+      }
+    }
+
+    return summedTags;
+  }
+
   @computed
   get usersById() {
     return keyBy(this.beatmapset.related_users, 'id') as Partial<Record<number, UserJson>>;

resources/js/beatmapsets-show/info.tsx

@@ -66,9 +66,14 @@ export default class Info extends React.Component<Props> {
   }
 
   private get tags() {
+    const sortedTags = Object.values(this.controller.tags).sort((a, b) => {
+      const diff = b.count - a.count;
+      return diff !== 0 ? diff : a.id - b.id;
+    });
+
     return [
-      ...this.controller.beatmapset.user_tags.map((tag) => tag.name),
-      ...this.controller.beatmapset.tags
+      ...sortedTags.map((tag) => tag.name),
+      ...this.controller.beatmapset.tags // TODO: something about duplicate mapper tags
         .split(' ')
         .filter(present),
     ];

resources/js/interfaces/beatmap-json.ts

@@ -4,6 +4,7 @@
 import BeatmapOwnerJson from './beatmap-owner-json';
 import BeatmapsetJson from './beatmapset-json';
 import Ruleset from './ruleset';
+import TagJson from './tag-json';
 import UserJson from './user-json';
 
 interface BeatmapFailTimesArray {
@@ -17,6 +18,7 @@ interface BeatmapJsonAvailableIncludes {
   failtimes: BeatmapFailTimesArray;
   max_combo: number;
   owners: BeatmapOwnerJson[];
+  tags: (TagJson & Required<Pick<TagJson, 'count'>>)[];
   user: UserJson;
 }
 

resources/js/interfaces/beatmapset-extended-json.ts

@@ -57,7 +57,6 @@ type BeatmapsetJsonForShowIncludes = Required<Pick<BeatmapsetExtendedJson,
 | 'recent_favourites'
 | 'related_users'
 | 'user'
-| 'user_tags'
 >>;
 
 export type BeatmapsetJsonForShow =

resources/js/interfaces/tag-json.ts

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 export default interface TagJson {
+  count?: number;
   description: string;
   id: number;
   name: string;