Use new parameters for online score attributes endpoint

Rian8337 · Sep 14, 2024 · ca6af28 · ca6af28
1 parent d5e3ff6
commit ca6af28
Show file tree

Hide file tree

Showing 11 changed files with 72 additions and 39 deletions.
diff --git a/src/database/utils/elainaDb/UserBind.ts b/src/database/utils/elainaDb/UserBind.ts
@@ -631,10 +631,10 @@ export class UserBind extends Manager {
                 continue;
             }
 
-            const scoreId = score instanceof Score ? score.scoreID : score.id;
             const liveAttribs =
                 await DPPProcessorRESTManager.getOnlineScoreAttributes(
-                    scoreId,
+                    score.uid,
+                    score.hash,
                     Modes.droid,
                     PPCalculationMethod.live,
                 );
@@ -645,7 +645,8 @@ export class UserBind extends Manager {
 
             const rebalAttribs =
                 await DPPProcessorRESTManager.getOnlineScoreAttributes(
-                    scoreId,
+                    score.uid,
+                    score.hash,
                     Modes.droid,
                     PPCalculationMethod.rebalance,
                 );

diff --git a/src/interactions/buttons/Onboarding/onboardingShowMostRecentPlay.ts b/src/interactions/buttons/Onboarding/onboardingShowMostRecentPlay.ts
@@ -63,6 +63,8 @@ export const run: ButtonCommand["run"] = async (_, interaction) => {
             ? player.recentPlays
             : await DroidHelper.getRecentScores(player.id, 1, undefined, [
                   "id",
+                  "uid",
+                  "hash",
                   "score",
                   "filename",
                   "hash",
@@ -85,10 +87,10 @@ export const run: ButtonCommand["run"] = async (_, interaction) => {
     }
 
     const score = recentPlays[0];
-    const scoreId = score instanceof Score ? score.scoreID : score.id;
 
     const scoreAttribs = await DPPProcessorRESTManager.getOnlineScoreAttributes(
-        scoreId,
+        score.uid,
+        score.hash,
         Modes.droid,
         PPCalculationMethod.live,
     );

diff --git a/src/interactions/commands/osu! and osu!droid/compare/compare.ts b/src/interactions/commands/osu! and osu!droid/compare/compare.ts
@@ -11,7 +11,7 @@ import { EmbedCreator } from "@alice-utils/creators/EmbedCreator";
 import { MessageCreator } from "@alice-utils/creators/MessageCreator";
 import { BeatmapManager } from "@alice-utils/managers/BeatmapManager";
 import { GuildMember } from "discord.js";
-import { Player, Score } from "@rian8337/osu-droid-utilities";
+import { Player } from "@rian8337/osu-droid-utilities";
 import { CompareLocalization } from "@alice-localization/interactions/commands/osu! and osu!droid/compare/CompareLocalization";
 import { CommandHelper } from "@alice-utils/helpers/CommandHelper";
 import { InteractionHelper } from "@alice-utils/helpers/InteractionHelper";
@@ -70,7 +70,8 @@ export const run: SlashCommand["run"] = async (_, interaction) => {
         case !!uid:
             player = await DroidHelper.getPlayer(uid!, ["id", "username"]);
 
-            uid ??= player instanceof Player ? player.uid : player?.id ?? null;
+            uid ??=
+                player instanceof Player ? player.uid : (player?.id ?? null);
 
             break;
         case !!username:
@@ -84,7 +85,8 @@ export const run: SlashCommand["run"] = async (_, interaction) => {
 
             player = await DroidHelper.getPlayer(username, ["id", "username"]);
 
-            uid ??= player instanceof Player ? player.uid : player?.id ?? null;
+            uid ??=
+                player instanceof Player ? player.uid : (player?.id ?? null);
 
             break;
         default:
@@ -131,6 +133,7 @@ export const run: SlashCommand["run"] = async (_, interaction) => {
 
     const score = await DroidHelper.getScore(uid, cachedBeatmapHash, [
         "id",
+        "uid",
         "filename",
         "hash",
         "mode",
@@ -156,10 +159,9 @@ export const run: SlashCommand["run"] = async (_, interaction) => {
         });
     }
 
-    const scoreId = score instanceof Score ? score.scoreID : score.id;
-
     const scoreAttribs = await DPPProcessorRESTManager.getOnlineScoreAttributes(
-        scoreId,
+        score.uid,
+        score.hash,
         Modes.droid,
         PPCalculationMethod.live,
     );

diff --git a/src/interactions/commands/osu! and osu!droid/fetchreplay/fetchreplay.ts b/src/interactions/commands/osu! and osu!droid/fetchreplay/fetchreplay.ts
@@ -76,6 +76,8 @@ export const run: SlashCommand["run"] = async (_, interaction) => {
 
     const score = await DroidHelper.getScore(uid, hash, [
         "id",
+        "uid",
+        "hash",
         "score",
         "combo",
         "mark",
@@ -240,7 +242,8 @@ export const run: SlashCommand["run"] = async (_, interaction) => {
     }
 
     const droidAttribs = await DPPProcessorRESTManager.getOnlineScoreAttributes(
-        scoreId,
+        score.uid,
+        score.hash,
         Modes.droid,
         PPCalculationMethod.live,
         true,
@@ -266,7 +269,8 @@ export const run: SlashCommand["run"] = async (_, interaction) => {
     }
 
     const osuAttribs = await DPPProcessorRESTManager.getOnlineScoreAttributes(
-        scoreId,
+        score.uid,
+        score.hash,
         Modes.osu,
         PPCalculationMethod.live,
     );

diff --git a/...su!droid/profile/subcommandGroups/profile-customize/subcommands/subcommands/claimBadge.ts b/...su!droid/profile/subcommandGroups/profile-customize/subcommands/subcommands/claimBadge.ts
@@ -8,7 +8,6 @@ import { BeatmapManager } from "@alice-utils/managers/BeatmapManager";
 import { EmbedCreator } from "@alice-utils/creators/EmbedCreator";
 import { SelectMenuCreator } from "@alice-utils/creators/SelectMenuCreator";
 import { Modes, RankedStatus } from "@rian8337/osu-base";
-import { Score } from "@rian8337/osu-droid-utilities";
 import { ProfileLocalization } from "@alice-localization/interactions/commands/osu! and osu!droid/profile/ProfileLocalization";
 import { CommandHelper } from "@alice-utils/helpers/CommandHelper";
 import { ConstantsLocalization } from "@alice-localization/core/constants/ConstantsLocalization";
@@ -193,7 +192,7 @@ export const run: SlashSubcommand<false>["run"] = async (_, interaction) => {
                 const score = await DroidHelper.getScore(
                     uid,
                     beatmapInfo.hash,
-                    ["id"],
+                    ["uid", "hash"],
                 );
 
                 if (!score) {
@@ -202,7 +201,8 @@ export const run: SlashSubcommand<false>["run"] = async (_, interaction) => {
 
                 const attribs =
                     await DPPProcessorRESTManager.getOnlineScoreAttributes(
-                        score instanceof Score ? score.scoreID : score.id,
+                        score.uid,
+                        score.hash,
                         Modes.osu,
                         PPCalculationMethod.live,
                     );

diff --git a/src/interactions/commands/osu! and osu!droid/recent/recent.ts b/src/interactions/commands/osu! and osu!droid/recent/recent.ts
@@ -124,6 +124,7 @@ export const run: SlashCommand["run"] = async (_, interaction) => {
         | Pick<
               OfficialDatabaseScore,
               | "id"
+              | "uid"
               | "hash"
               | "score"
               | "filename"
@@ -161,6 +162,7 @@ export const run: SlashCommand["run"] = async (_, interaction) => {
             undefined,
             [
                 "id",
+                "uid",
                 "hash",
                 "score",
                 "filename",
@@ -203,10 +205,11 @@ export const run: SlashCommand["run"] = async (_, interaction) => {
 
     const scoreAttribs =
         score instanceof RecentPlay
-            ? score.droidAttribs ?? null
+            ? (score.droidAttribs ?? null)
             : (
                   await DPPProcessorRESTManager.getOnlineScoreAttributes(
-                      score instanceof Score ? score.scoreID : score.id,
+                      score.uid,
+                      score.hash,
                       Modes.droid,
                       PPCalculationMethod.live,
                   )
@@ -219,7 +222,7 @@ export const run: SlashCommand["run"] = async (_, interaction) => {
             : DroidHelper.getAvatarURL(player.id),
         (<GuildMember | null>interaction.member)?.displayColor,
         scoreAttribs,
-        score instanceof RecentPlay ? score.osuAttribs ?? null : undefined,
+        score instanceof RecentPlay ? (score.osuAttribs ?? null) : undefined,
         localization.language,
     );
 

diff --git a/src/interactions/commands/osu! and osu!droid/simulate/simulate.ts b/src/interactions/commands/osu! and osu!droid/simulate/simulate.ts
@@ -197,6 +197,8 @@ export const run: SlashCommand["run"] = async (_, interaction) => {
         beatmap.hash,
         [
             "id",
+            "uid",
+            "hash",
             "combo",
             "mark",
             "mode",

diff --git a/src/interactions/contextmenus/message/compareScore.ts b/src/interactions/contextmenus/message/compareScore.ts
@@ -9,7 +9,7 @@ import { CommandHelper } from "@alice-utils/helpers/CommandHelper";
 import { InteractionHelper } from "@alice-utils/helpers/InteractionHelper";
 import { BeatmapManager } from "@alice-utils/managers/BeatmapManager";
 import { Modes } from "@rian8337/osu-base";
-import { Player, Score } from "@rian8337/osu-droid-utilities";
+import { Player } from "@rian8337/osu-droid-utilities";
 import { GuildMember, InteractionReplyOptions } from "discord.js";
 import { MessageButtonCreator } from "@alice-utils/creators/MessageButtonCreator";
 import { PPCalculationMethod } from "@alice-enums/utils/PPCalculationMethod";
@@ -89,6 +89,8 @@ export const run: MessageContextMenuCommand["run"] = async (_, interaction) => {
         beatmapInfo.hash,
         [
             "id",
+            "uid",
+            "hash",
             "score",
             "filename",
             "hash",
@@ -117,7 +119,8 @@ export const run: MessageContextMenuCommand["run"] = async (_, interaction) => {
     );
 
     const scoreAttribs = await DPPProcessorRESTManager.getOnlineScoreAttributes(
-        score instanceof Score ? score.scoreID : score.id,
+        score.uid,
+        score.hash,
         Modes.droid,
         PPCalculationMethod.live,
     );

diff --git a/src/utils/creators/EmbedCreator.ts b/src/utils/creators/EmbedCreator.ts
@@ -500,6 +500,8 @@ export abstract class EmbedCreator {
             | Pick<
                   OfficialDatabaseScore,
                   | "id"
+                  | "uid"
+                  | "hash"
                   | "score"
                   | "combo"
                   | "mark"
@@ -554,7 +556,8 @@ export abstract class EmbedCreator {
                     ? score.droidAttribs
                     : (
                           await DPPProcessorRESTManager.getOnlineScoreAttributes(
-                              score instanceof Score ? score.scoreID : score.id,
+                              score.uid,
+                              score.hash,
                               Modes.droid,
                               PPCalculationMethod.live,
                           )
@@ -567,7 +570,8 @@ export abstract class EmbedCreator {
                     ? score.osuAttribs
                     : (
                           await DPPProcessorRESTManager.getOnlineScoreAttributes(
-                              score instanceof Score ? score.scoreID : score.id,
+                              score.uid,
+                              score.hash,
                               Modes.osu,
                               PPCalculationMethod.live,
                           )

diff --git a/src/utils/helpers/ScoreDisplayHelper.ts b/src/utils/helpers/ScoreDisplayHelper.ts
@@ -281,27 +281,29 @@ export abstract class ScoreDisplayHelper {
             ]
         > => {
             const droidAttribs = beatmapInfo
-                ? droidAttribsCache.get(score.scoreID) ??
+                ? (droidAttribsCache.get(score.scoreID) ??
                   (
                       await DPPProcessorRESTManager.getOnlineScoreAttributes(
-                          score.scoreID,
+                          score.uid,
+                          score.hash,
                           Modes.droid,
                           PPCalculationMethod.live,
                       )
                   )?.attributes ??
-                  null
+                  null)
                 : null;
 
             const osuAttribs = beatmapInfo
-                ? osuAttribsCache.get(score.scoreID) ??
+                ? (osuAttribsCache.get(score.scoreID) ??
                   (
                       await DPPProcessorRESTManager.getOnlineScoreAttributes(
-                          score.scoreID,
+                          score.uid,
+                          score.hash,
                           Modes.osu,
                           PPCalculationMethod.live,
                       )
                   )?.attributes ??
-                  null
+                  null)
                 : null;
 
             if (!droidAttribsCache.has(score.scoreID)) {

diff --git a/src/utils/managers/DPPProcessorRESTManager.ts b/src/utils/managers/DPPProcessorRESTManager.ts
@@ -416,14 +416,16 @@ export abstract class DPPProcessorRESTManager extends RESTManager {
     /**
      * Gets the difficulty and performance attributes of a score.
      *
-     * @param scoreId The ID of the score.
+     * @param uid The uid of the player in the score.
+     * @param hash The MD5 hash of the beatmap in the score.
      * @param mode The gamemode to calculate.
      * @param calculationMethod The calculation method to use.
      * @param generateStrainChart Whether to generate a strain chart.
      * @returns The difficulty and performance attributes, `null` if the attributes cannot be retrieved.
      */
     static async getOnlineScoreAttributes<THasStrainChart extends boolean>(
-        scoreId: number,
+        uid: number,
+        hash: string,
         mode: Modes.droid,
         calculationMethod: PPCalculationMethod.live,
         generateStrainChart?: THasStrainChart,
@@ -438,14 +440,16 @@ export abstract class DPPProcessorRESTManager extends RESTManager {
     /**
      * Gets the difficulty and performance attributes of a score.
      *
-     * @param scoreId The ID of the score.
+     * @param uid The uid of the player in the score.
+     * @param hash The MD5 hash of the beatmap in the score.
      * @param mode The gamemode to calculate.
      * @param calculationMethod The calculation method to use.
      * @param generateStrainChart Whether to generate a strain chart.
      * @returns The difficulty and performance attributes, `null` if the attributes cannot be retrieved.
      */
     static async getOnlineScoreAttributes<THasStrainChart extends boolean>(
-        scoreId: number,
+        uid: number,
+        hash: string,
         mode: Modes.droid,
         calculationMethod: PPCalculationMethod.rebalance,
         generateStrainChart?: THasStrainChart,
@@ -460,14 +464,16 @@ export abstract class DPPProcessorRESTManager extends RESTManager {
     /**
      * Gets the difficulty and performance attributes of a score.
      *
-     * @param scoreId The ID of the score.
+     * @param uid The uid of the player in the score.
+     * @param hash The MD5 hash of the beatmap in the score.
      * @param mode The gamemode to calculate.
      * @param calculationMethod The calculation method to use.
      * @param generateStrainChart Whether to generate a strain chart.
      * @returns The difficulty and performance attributes, `null` if the attributes cannot be retrieved.
      */
     static async getOnlineScoreAttributes<THasStrainChart extends boolean>(
-        scoreId: number,
+        uid: number,
+        hash: string,
         mode: Modes.osu,
         calculationMethod: PPCalculationMethod.live,
         generateStrainChart?: THasStrainChart,
@@ -482,14 +488,16 @@ export abstract class DPPProcessorRESTManager extends RESTManager {
     /**
      * Gets the difficulty and performance attributes of a score.
      *
-     * @param scoreId The ID of the score.
+     * @param uid The uid of the player in the score.
+     * @param hash The MD5 hash of the beatmap in the score.
      * @param mode The gamemode to calculate.
      * @param calculationMethod The calculation method to use.
      * @param generateStrainChart Whether to generate a strain chart.
      * @returns The difficulty and performance attributes, `null` if the attributes cannot be retrieved.
      */
     static async getOnlineScoreAttributes<THasStrainChart extends boolean>(
-        scoreId: number,
+        uid: number,
+        hash: string,
         mode: Modes.osu,
         calculationMethod: PPCalculationMethod.rebalance,
         generateStrainChart?: THasStrainChart,
@@ -502,7 +510,8 @@ export abstract class DPPProcessorRESTManager extends RESTManager {
     > | null>;
 
     static async getOnlineScoreAttributes<THasStrainChart extends boolean>(
-        scoreId: number,
+        uid: number,
+        hash: string,
         mode: Modes,
         calculationMethod: PPCalculationMethod,
         generateStrainChart?: THasStrainChart,
@@ -516,7 +525,8 @@ export abstract class DPPProcessorRESTManager extends RESTManager {
         const url = new URL(`${this.endpoint}get-online-score-attributes`);
 
         url.searchParams.set("key", process.env.DROID_SERVER_INTERNAL_KEY!);
-        url.searchParams.set("scoreid", scoreId.toString());
+        url.searchParams.set("uid", uid.toString());
+        url.searchParams.set("hash", hash);
         url.searchParams.set("gamemode", mode);
         url.searchParams.set("calculationmethod", calculationMethod.toString());
-Original file line number
+Diff line change
@@ Expand Up @@
             beatmap.hash,
             [
                 "id",
+                "uid",
+                "hash",
                 "combo",
                 "mark",
                 "mode",
@@ Expand Down @@