From 08295d7b04b29519519c4c1965757ac435a09c7f Mon Sep 17 00:00:00 2001
From: Liam <liam@fascinated.cc>
Date: Wed, 23 Oct 2024 08:13:07 +0100
Subject: [PATCH] make the score improvement text smaller and show a previous
 pp inaccuracy warning

---
 projects/website/src/common/change.tsx        | 10 ++++-
 .../components/score/badges/hand-accuracy.tsx |  6 ++-
 .../score/badges/score-accuracy.tsx           |  2 +-
 .../components/score/badges/score-misses.tsx  |  8 ++--
 .../src/components/score/badges/score-pp.tsx  | 39 +++++++++++++------
 .../components/score/badges/score-score.tsx   |  2 +-
 projects/website/src/components/tooltip.tsx   |  4 +-
 projects/website/src/components/warning.tsx   | 23 +++++++++++
 8 files changed, 74 insertions(+), 20 deletions(-)
 create mode 100644 projects/website/src/components/warning.tsx

diff --git a/projects/website/src/common/change.tsx b/projects/website/src/common/change.tsx
index 888929a..9e12830 100644
--- a/projects/website/src/common/change.tsx
+++ b/projects/website/src/common/change.tsx
@@ -1,5 +1,6 @@
 import React from "react";
 import { formatNumberWithCommas, formatPp } from "@ssr/common/utils/number-utils";
+import { clsx } from "clsx";
 
 type ChangeProps = {
   /**
@@ -13,6 +14,11 @@ type ChangeProps = {
    */
   formatValue?: (value: number) => string;
 
+  /**
+   * The additional class names
+   */
+  className?: string;
+
   /**
    * Whether the number is a pp number
    */
@@ -24,7 +30,7 @@ type ChangeProps = {
   showColors?: boolean;
 };
 
-export function Change({ change, formatValue, isPp, showColors }: ChangeProps) {
+export function Change({ change, formatValue, className, isPp, showColors }: ChangeProps) {
   if (change === 0 || (change && change > 0 && change < 0.01) || change === undefined) {
     return null;
   }
@@ -38,7 +44,7 @@ export function Change({ change, formatValue, isPp, showColors }: ChangeProps) {
   }
 
   return (
-    <p className={`text-sm ${showColors && (change > 0 ? "text-green-400" : "text-red-400")}`}>
+    <p className={clsx("text-sm", showColors && (change > 0 ? "text-green-400" : "text-red-400"), className)}>
       {change > 0 ? "+" : ""}
       {`${formatValue(change)}${isPp ? "pp" : ""}`}
     </p>
diff --git a/projects/website/src/components/score/badges/hand-accuracy.tsx b/projects/website/src/components/score/badges/hand-accuracy.tsx
index 3c8e423..74bd2ee 100644
--- a/projects/website/src/components/score/badges/hand-accuracy.tsx
+++ b/projects/website/src/components/score/badges/hand-accuracy.tsx
@@ -26,7 +26,11 @@ export function HandAccuracyBadge({ score, hand }: HandAccuracyProps) {
       </Tooltip>
       {scoreImprovement && previousHandAccuracy && (
         <Tooltip display={`Previous ${formattedHand} Hand Accuracy: ${previousHandAccuracy.toFixed(2)}`}>
-          <Change change={scoreImprovement.handAccuracy[hand]} formatValue={num => num.toFixed(2)} />
+          <Change
+            className="text-xs"
+            change={scoreImprovement.handAccuracy[hand]}
+            formatValue={num => num.toFixed(2)}
+          />
         </Tooltip>
       )}
     </div>
diff --git a/projects/website/src/components/score/badges/score-accuracy.tsx b/projects/website/src/components/score/badges/score-accuracy.tsx
index 715a59f..8ba2707 100644
--- a/projects/website/src/components/score/badges/score-accuracy.tsx
+++ b/projects/website/src/components/score/badges/score-accuracy.tsx
@@ -58,7 +58,7 @@ export function ScoreAccuracyBadge({ score, leaderboard }: ScoreAccuracyProps) {
         </Tooltip>
         {scoreImprovement && previousAccuracy && (
           <Tooltip display={`Previous Accuracy: ${previousAccuracy.toFixed(2)}%`}>
-            <Change change={scoreImprovement.accuracy} formatValue={num => `${num.toFixed(2)}%`} />
+            <Change className="text-xs" change={scoreImprovement.accuracy} formatValue={num => `${num.toFixed(2)}%`} />
           </Tooltip>
         )}
       </div>
diff --git a/projects/website/src/components/score/badges/score-misses.tsx b/projects/website/src/components/score/badges/score-misses.tsx
index 722dfda..98b7b2e 100644
--- a/projects/website/src/components/score/badges/score-misses.tsx
+++ b/projects/website/src/components/score/badges/score-misses.tsx
@@ -27,6 +27,8 @@ export default function ScoreMissesBadge({ score, hideXMark }: ScoreMissesBadgeP
       wallsHit: (scoreImprovement.misses.wallsHit - misses.wallsHit) * -1,
     };
   const previousScoreFc = previousScoreMisses?.misses == 0;
+  const isMissImprovement =
+    previousScoreMisses && scoreImprovement && previousScoreMisses.misses > scoreImprovement.misses.misses;
 
   return (
     <div className="flex flex-col justify-center items-center">
@@ -42,7 +44,7 @@ export default function ScoreMissesBadge({ score, hideXMark }: ScoreMissesBadgeP
           {!hideXMark && <XMarkIcon className={clsx("w-5 h-5", score.fullCombo ? "hidden" : "text-red-400")} />}
         </div>
       </ScoreMissesTooltip>
-      {additionalData && previousScoreMisses && scoreImprovement && misses && (
+      {additionalData && previousScoreMisses && scoreImprovement && misses && isMissImprovement && (
         <div className="flex gap-2 items-center justify-center">
           <ScoreMissesTooltip
             missedNotes={previousScoreMisses.missedNotes}
@@ -51,7 +53,7 @@ export default function ScoreMissesBadge({ score, hideXMark }: ScoreMissesBadgeP
             wallsHit={previousScoreMisses.wallsHit}
             fullCombo={previousScoreFc}
           >
-            <div className="flex gap-1 items-center">
+            <div className="flex gap-1 items-center text-xs">
               {previousScoreFc ? (
                 <p className="text-green-400">FC</p>
               ) : (
@@ -67,7 +69,7 @@ export default function ScoreMissesBadge({ score, hideXMark }: ScoreMissesBadgeP
             wallsHit={misses.wallsHit}
             fullCombo={additionalData.fullCombo}
           >
-            <div className="flex gap-1 items-center">
+            <div className="flex gap-1 items-center text-xs">
               {additionalData.fullCombo ? <p className="text-green-400">FC</p> : formatNumberWithCommas(misses.misses)}
             </div>
           </ScoreMissesTooltip>
diff --git a/projects/website/src/components/score/badges/score-pp.tsx b/projects/website/src/components/score/badges/score-pp.tsx
index 93200d6..18789df 100644
--- a/projects/website/src/components/score/badges/score-pp.tsx
+++ b/projects/website/src/components/score/badges/score-pp.tsx
@@ -1,9 +1,10 @@
 import { ScoreBadgeProps } from "@/components/score/badges/badge-props";
 import ScoreSaberLeaderboard from "@ssr/common/leaderboard/impl/scoresaber-leaderboard";
 import Tooltip from "@/components/tooltip";
-import { formatPp } from "@ssr/common/utils/number-utils";
+import { ensurePositiveNumber, formatPp } from "@ssr/common/utils/number-utils";
 import { scoresaberService } from "@ssr/common/service/impl/scoresaber";
 import { Change } from "@/common/change";
+import { Warning } from "@/components/warning";
 
 type ScorePpProps = ScoreBadgeProps & {
   /**
@@ -22,26 +23,42 @@ export function ScorePpBadge({ score, leaderboard }: ScorePpProps) {
     return undefined;
   }
   const weightedPp = pp * weight;
-  const previousPp = fcAccuracy ? scoresaberService.getPp(leaderboard.stars, fcAccuracy).toFixed(0) : undefined;
-  const isSamePp = previousPp === pp.toFixed(0);
+  const fcPp =
+    !score.fullCombo && fcAccuracy ? scoresaberService.getPp(leaderboard.stars, fcAccuracy).toFixed(0) : undefined;
 
   return (
     <>
       <Tooltip
         display={
-          <div>
-            <p className="font-semibold">Performance Points</p>
-            <p>Raw: {formatPp(pp)}pp</p>
-            <p>
-              Weighted: {formatPp(weightedPp)}pp ({(100 * weight).toFixed(2)}%)
-            </p>
-            {previousPp && !isSamePp && <p>Full Combo: {previousPp}pp</p>}
+          <div className="flex flex-col gap-2">
+            <div>
+              <p className="font-semibold">Performance Points</p>
+              <p>Raw: {formatPp(pp)}pp</p>
+              <p>
+                Weighted: {formatPp(weightedPp)}pp ({(100 * weight).toFixed(2)}%)
+              </p>
+              {fcPp && <p>Full Combo: {fcPp}pp</p>}
+            </div>
+
+            {previousAccuracy && (
+              <Warning>
+                <p className="text-red-700">
+                  The previous pp may not be 100% accurate due to ScoreSaber API limitations.
+                </p>
+              </Warning>
+            )}
           </div>
         }
       >
         <div className="flex flex-col items-center justify-center cursor-default">
           <p>{formatPp(pp)}pp</p>
-          {previousAccuracy && <Change change={previousAccuracy} isPp />}
+          {previousAccuracy && (
+            <Change
+              className="text-xs"
+              change={ensurePositiveNumber(pp - scoresaberService.getPp(leaderboard.stars, previousAccuracy))}
+              isPp
+            />
+          )}
         </div>
       </Tooltip>
     </>
diff --git a/projects/website/src/components/score/badges/score-score.tsx b/projects/website/src/components/score/badges/score-score.tsx
index 2b653f5..977f73e 100644
--- a/projects/website/src/components/score/badges/score-score.tsx
+++ b/projects/website/src/components/score/badges/score-score.tsx
@@ -8,7 +8,7 @@ export function ScoreScoreBadge({ score }: ScoreBadgeProps) {
   return (
     <div className="flex flex-col items-center justify-center">
       <p>{formatNumberWithCommas(Number(score.score.toFixed(0)))}</p>
-      {scoreImprovement && <Change change={scoreImprovement.score} />}
+      {scoreImprovement && <Change className="text-xs" change={scoreImprovement.score} />}
     </div>
   );
 }
diff --git a/projects/website/src/components/tooltip.tsx b/projects/website/src/components/tooltip.tsx
index 610b650..5052bd1 100644
--- a/projects/website/src/components/tooltip.tsx
+++ b/projects/website/src/components/tooltip.tsx
@@ -48,7 +48,9 @@ export default function Tooltip({ children, display, asChild = true, side = "top
           {children}
         </button>
       </TooltipTrigger>
-      <TooltipContent side={side}>{display}</TooltipContent>
+      <TooltipContent className="max-w-[350px]" side={side}>
+        {display}
+      </TooltipContent>
     </ShadCnTooltip>
   );
 }
diff --git a/projects/website/src/components/warning.tsx b/projects/website/src/components/warning.tsx
new file mode 100644
index 0000000..505d323
--- /dev/null
+++ b/projects/website/src/components/warning.tsx
@@ -0,0 +1,23 @@
+import { ExclamationTriangleIcon } from "@heroicons/react/24/solid";
+import { ReactNode } from "react";
+
+type WarningProps = {
+  /**
+   * The size of the warning icon.
+   */
+  size?: number;
+
+  /**
+   * The children to display.
+   */
+  children: ReactNode;
+};
+
+export function Warning({ size = 32, children }: WarningProps) {
+  return (
+    <div className="flex gap-2 items-center justify-center">
+      <ExclamationTriangleIcon width={size} height={size} className={`w-[${size}px] h-[${size}px]`} />
+      {children}
+    </div>
+  );
+}