rhythia-api 141.0.0 → 143.0.0

package/api/getBadgedUsers.ts

@@ -40,8 +40,7 @@ export async function handler(
 export async function getLeaderboard(badge: string) {
   let { data: queryData, error } = await supabase
     .from("profiles")
-    .select("flag,id,username,badges")
-    .neq("ban", "excluded");
+    .select("flag,id,username,badges");
 
   const users = queryData?.filter((e) =>
     ((e.badges || []) as string[]).includes(badge)

package/api/submitScore.ts

@@ -11,14 +11,10 @@ export const Schema = {
       relayHwid: z.string(),
       songId: z.string(),
       misses: z.number(),
-      squareHits: z.number(),
+      hits: z.number(),
       mapHash: z.string(),
-      mapTitle: z.string(),
-      mapDifficulty: z.number(),
       mapNoteCount: z.number(),
-      mapLength: z.number(),
-      passed: z.boolean(),
-      sspp: z.number(),
+      speed: z.number(),
     }),
   }),
   output: z.object({
@@ -26,6 +22,19 @@ export const Schema = {
   }),
 };
 
+function easeInExpoDeq(x: number) {
+  return x === 0 ? 0 : Math.pow(2, 50 * x - 50);
+}
+
+export function calculatePerformancePoints(
+  starRating: number,
+  accuracy: number
+) {
+  return Math.round(
+    Math.pow((starRating * easeInExpoDeq(accuracy) * 100) / 2, 2) / 1000
+  );
+}
+
 export async function POST(request: Request): Promise<NextResponse> {
   return protectedApi({
     request,
@@ -79,8 +88,6 @@ export async function handler({
     );
   }
 
-  let newPlaycount = 1;
-
   if (!beatmaps) {
     return NextResponse.json(
       {
@@ -90,14 +97,6 @@ export async function handler({
     );
   }
 
-  if (beatmaps.noteCount !== data.mapNoteCount) {
-    return NextResponse.json(
-      {
-        error: "Wrong map",
-      },
-      { status: 500 }
-    );
-  }
   if (beatmaps.noteCount !== data.mapNoteCount) {
     return NextResponse.json(
       {
@@ -107,18 +106,36 @@ export async function handler({
     );
   }
 
-  newPlaycount = (beatmaps.playcount || 1) + 1;
   await supabase.from("beatmaps").upsert({
     beatmapHash: data.mapHash,
-    title: data.mapTitle,
-    playcount: newPlaycount,
-    difficulty: data.mapDifficulty,
-    noteCount: data.mapNoteCount,
-    length: data.mapLength,
+    playcount: (beatmaps.playcount || 1) + 1,
   });
 
+  let passed = true;
+
+  // Pass invalidation
+  if (data.misses + data.hits !== beatmaps.noteCount) {
+    passed = false;
+  }
+
+  const accurracy = data.hits / beatmaps.noteCount;
+  let awarded_sp = 0;
+
+  console.log(
+    data.misses + data.hits == beatmaps.noteCount,
+    data.misses + data.hits,
+    beatmaps.noteCount
+  );
+
+  if (beatmaps.starRating) {
+    awarded_sp = calculatePerformancePoints(
+      data.speed * beatmaps.starRating,
+      accurracy
+    );
+  }
+
   if (beatmapPages.status == "UNRANKED") {
-    data.sspp = 0;
+    awarded_sp = 0;
   }
 
   console.log("p1");
@@ -127,9 +144,10 @@ export async function handler({
     replayHwid: data.relayHwid,
     songId: data.songId,
     userId: userData.id,
-    passed: data.passed,
+    passed,
     misses: data.misses,
-    awarded_sp: Math.round(data.sspp * 100) / 100,
+    awarded_sp: Math.round(awarded_sp * 100) / 100,
+    speed: data.speed,
   });
   console.log("p2");
 
@@ -172,11 +190,9 @@ export async function handler({
     id: userData.id,
     play_count: (userData.play_count || 0) + 1,
     skill_points: Math.round(totalSp * 100) / 100,
-    squares_hit: (userData.squares_hit || 0) + data.squareHits,
+    squares_hit: (userData.squares_hit || 0) + data.hits,
   });
   console.log("p3");
 
-  // await Promise.all([p1, p2, p3]);
-
   return NextResponse.json({});
 }

package/api/updateBeatmapPage.ts

@@ -73,6 +73,7 @@ export async function handler({
       owner: userData.id,
       description,
       tags,
+      nominations: [],
     })
     .select("*")
     .single();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rhythia-api",
-  "version": "141.0.0",
+  "version": "143.0.0",
   "main": "index.ts",
   "scripts": {
     "update": "bun ./scripts/update.ts",