Remove bot-scope droid pp from profile card

Rian8337 · Nov 4, 2024 · d26acdc · d26acdc
1 parent cb011c7
commit d26acdc
Show file tree

Hide file tree

Showing 12 changed files with 94 additions and 81 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/database/official/schema/OfficialDatabaseUser.ts b/src/database/official/schema/OfficialDatabaseUser.ts
@@ -8,6 +8,7 @@ export interface OfficialDatabaseUser {
     readonly email: string;
     readonly deviceid: string;
     readonly score: number;
+    readonly pp: number;
     readonly playcount: number;
     readonly accuracy: number;
     readonly regist_time: Date;

diff --git a/src/interactions/buttons/Onboarding/onboardingPlayerProfileAction.ts b/src/interactions/buttons/Onboarding/onboardingPlayerProfileAction.ts
@@ -43,6 +43,7 @@ export const run: ButtonCommand["run"] = async (_, interaction) => {
         "playcount",
         "accuracy",
         "region",
+        "pp",
     ]);
 
     if (!player) {

diff --git a/src/interactions/commands/osu! and osu!droid/profile/subcommands/profile-view.ts b/src/interactions/commands/osu! and osu!droid/profile/subcommands/profile-view.ts
@@ -50,6 +50,7 @@ export const run: SlashSubcommand<true>["run"] = async (_, interaction) => {
               | "accuracy"
               | "region"
               | "email"
+              | "pp"
           >
         | Player
         | null = null;
@@ -64,6 +65,7 @@ export const run: SlashSubcommand<true>["run"] = async (_, interaction) => {
                 "accuracy",
                 "region",
                 "email",
+                "pp",
             ]);
 
             uid ??=
@@ -95,6 +97,7 @@ export const run: SlashSubcommand<true>["run"] = async (_, interaction) => {
                 "accuracy",
                 "region",
                 "email",
+                "pp",
             ]);
 
             uid ??=
@@ -148,6 +151,7 @@ export const run: SlashSubcommand<true>["run"] = async (_, interaction) => {
         "accuracy",
         "region",
         "email",
+        "pp",
     ]);
 
     if (!player) {

diff --git a/src/interactions/contextmenus/user/viewDroidProfile.ts b/src/interactions/contextmenus/user/viewDroidProfile.ts
@@ -51,6 +51,7 @@ export const run: UserContextMenuCommand["run"] = async (_, interaction) => {
         "playcount",
         "accuracy",
         "region",
+        "pp",
     ]);
 
     if (!player) {

diff --git a/src/localization/utils/creators/ProfileCardCreator/ProfileCardCreatorLocalization.ts b/src/localization/utils/creators/ProfileCardCreator/ProfileCardCreatorLocalization.ts
@@ -9,7 +9,7 @@ export interface ProfileCardCreatorStrings {
     readonly totalScore: string;
     readonly accuracy: string;
     readonly playCount: string;
-    readonly droidPP: string;
+    readonly performancePoints: string;
     readonly clan: string;
     readonly challengePoints: string;
 }

diff --git a/...ization/utils/creators/ProfileCardCreator/translations/ProfileCardCreatorENTranslation.ts b/...ization/utils/creators/ProfileCardCreator/translations/ProfileCardCreatorENTranslation.ts
@@ -9,7 +9,7 @@ export class ProfileCardCreatorENTranslation extends Translation<ProfileCardCrea
         totalScore: "Total Score",
         accuracy: "Accuracy",
         playCount: "Play Count",
-        droidPP: "Droid pp",
+        performancePoints: "Performance Points",
         clan: "Clan",
         challengePoints: "Challenge Points",
     };

diff --git a/...ization/utils/creators/ProfileCardCreator/translations/ProfileCardCreatorESTranslation.ts b/...ization/utils/creators/ProfileCardCreator/translations/ProfileCardCreatorESTranslation.ts
@@ -9,7 +9,7 @@ export class ProfileCardCreatorESTranslation extends Translation<ProfileCardCrea
         totalScore: "Puntaje Total",
         accuracy: "Precisión",
         playCount: "Jugadas",
-        droidPP: "Droid pp",
+        performancePoints: "",
         clan: "Clan",
         challengePoints: "Puntos de desafio",
     };

diff --git a/...ization/utils/creators/ProfileCardCreator/translations/ProfileCardCreatorIDTranslation.ts b/...ization/utils/creators/ProfileCardCreator/translations/ProfileCardCreatorIDTranslation.ts
@@ -9,7 +9,7 @@ export class ProfileCardCreatorIDTranslation extends Translation<ProfileCardCrea
         totalScore: "",
         accuracy: "",
         playCount: "",
-        droidPP: "",
+        performancePoints: "",
         clan: "",
         challengePoints: "",
     };

diff --git a/...ization/utils/creators/ProfileCardCreator/translations/ProfileCardCreatorKRTranslation.ts b/...ization/utils/creators/ProfileCardCreator/translations/ProfileCardCreatorKRTranslation.ts
@@ -9,7 +9,7 @@ export class ProfileCardCreatorKRTranslation extends Translation<ProfileCardCrea
         totalScore: "총 점수",
         accuracy: "정확도",
         playCount: "플레이 횟수",
-        droidPP: "Droid pp",
+        performancePoints: "",
         clan: "클랜",
         challengePoints: "챌린지 포인트",
     };

diff --git a/src/utils/creators/ProfileCardCreator.ts b/src/utils/creators/ProfileCardCreator.ts
@@ -26,7 +26,13 @@ export class ProfileCardCreator {
     private readonly player:
         | Pick<
               OfficialDatabaseUser,
-              "id" | "username" | "score" | "accuracy" | "playcount" | "region"
+              | "id"
+              | "username"
+              | "score"
+              | "accuracy"
+              | "playcount"
+              | "region"
+              | "pp"
           >
         | Player;
 
@@ -82,6 +88,7 @@ export class ProfileCardCreator {
                   | "accuracy"
                   | "playcount"
                   | "region"
+                  | "pp"
               >
             | Player,
         detailed: boolean,
@@ -396,27 +403,17 @@ export class ProfileCardCreator {
             x,
             y + yOffset,
         );
+
         increaseYOffset();
 
-        if (this.bindInfo) {
-            this.context.fillText(
-                `${this.localization.getTranslation("accuracy")}: ${(
-                    this.player.accuracy *
-                    (this.player instanceof Player ? 1 : 100)
-                ).toFixed(2)}% | ${this.bindInfo.weightedAccuracy.toFixed(2)}%`,
-                x,
-                y + yOffset,
-            );
-        } else {
-            this.context.fillText(
-                `${this.localization.getTranslation("accuracy")}: ${(
-                    this.player.accuracy *
-                    (this.player instanceof Player ? 1 : 100)
-                ).toFixed(2)}%`,
-                x,
-                y + yOffset,
-            );
-        }
+        this.context.fillText(
+            `${this.localization.getTranslation("accuracy")}: ${(
+                this.player.accuracy * (this.player instanceof Player ? 1 : 100)
+            ).toFixed(2)}%`,
+            x,
+            y + yOffset,
+        );
+
         increaseYOffset();
 
         this.context.fillText(
@@ -426,31 +423,29 @@ export class ProfileCardCreator {
             x,
             y + yOffset,
         );
+
         increaseYOffset();
 
-        if (this.bindInfo) {
-            const ppRank = await this.getPlayerPPRank(this.bindInfo);
+        this.context.fillText(
+            `${this.localization.getTranslation(
+                "performancePoints",
+            )}: ${this.player.pp.toFixed(2)}pp`,
+            x,
+            y + yOffset,
+        );
+
+        increaseYOffset();
+
+        if (this.bindInfo?.clan) {
             this.context.fillText(
-                `${this.localization.getTranslation(
-                    "droidPP",
-                )}: ${this.bindInfo.pptotal.toFixed(
-                    2,
-                )}pp (#${ppRank.toLocaleString(this.BCP47)})`,
+                `${this.localization.getTranslation("clan")}: ${
+                    this.bindInfo.clan
+                }`,
                 x,
                 y + yOffset,
             );
-            increaseYOffset();
 
-            if (this.bindInfo.clan) {
-                this.context.fillText(
-                    `${this.localization.getTranslation("clan")}: ${
-                        this.bindInfo.clan
-                    }`,
-                    x,
-                    y + yOffset,
-                );
-                increaseYOffset();
-            }
+            increaseYOffset();
         }
 
         this.context.restore();