rhythia-api 164.0.0 → 166.0.0

package/api/getLeaderboard.ts

@@ -10,6 +10,7 @@ export const Schema = {
     session: z.string(),
     page: z.number().default(1),
     flag: z.string().optional(),
+    spin: z.boolean().default(false),
   }),
   output: z.object({
     error: z.string().optional(),
@@ -25,6 +26,7 @@ export const Schema = {
           username: z.string().nullable(),
           play_count: z.number().nullable(),
           skill_points: z.number().nullable(),
+          spin_skill_points: z.number().nullable(),
           total_score: z.number().nullable(),
         })
       )
@@ -44,13 +46,23 @@ export async function POST(request: Request): Promise<NextResponse> {
 export async function handler(
   data: (typeof Schema)["input"]["_type"]
 ): Promise<NextResponse<(typeof Schema)["output"]["_type"]>> {
-  const result = await getLeaderboard(data.page, data.session, data.flag);
+  const result = await getLeaderboard(
+    data.page,
+    data.session,
+    data.spin,
+    data.flag
+  );
   return NextResponse.json(result);
 }
 
 const VIEW_PER_PAGE = 50;
 
-export async function getLeaderboard(page = 1, session: string, flag?: string) {
+export async function getLeaderboard(
+  page = 1,
+  session: string,
+  spin: boolean,
+  flag?: string
+) {
   const getUserData = (await getUserBySession(session)) as User;
 
   let leaderPosition = 0;
@@ -86,7 +98,12 @@ export async function getLeaderboard(page = 1, session: string, flag?: string) {
     query.eq("flag", flag);
   }
 
-  query.order("skill_points", { ascending: false });
+  if (spin) {
+    query.order("spin_skill_points", { ascending: false });
+  } else {
+    query.order("skill_points", { ascending: false });
+  }
+
   query.range(startPage, endPage);
 
   let { data: queryData, error } = await query;
@@ -100,6 +117,7 @@ export async function getLeaderboard(page = 1, session: string, flag?: string) {
       id: user.id,
       play_count: user.play_count,
       skill_points: user.skill_points,
+      spin_skill_points: user.spin_skill_points,
       total_score: user.total_score,
       username: user.username,
     })),

package/api/submitScore.ts

@@ -205,10 +205,9 @@ export async function handler({
   });
   console.log("p2");
 
-  let totalSp = 0;
   let { data: scores2, error: errorsp } = await supabase
     .from("scores")
-    .select(`awarded_sp,beatmapHash`)
+    .select(`awarded_sp,beatmapHash,spin`)
     .eq("userId", userData.id)
     .neq("awarded_sp", 0)
     .eq("passed", true)
@@ -216,37 +215,58 @@ export async function handler({
 
   if (scores2 == null) return NextResponse.json({ error: "No scores" });
 
-  let hashMap: Record<string, number> = {};
+  let allHashMap: Record<string, number> = {};
+  let spinHashMap: Record<string, number> = {};
 
   for (const score of scores2) {
     const { beatmapHash, awarded_sp } = score;
 
     if (!beatmapHash || !awarded_sp) continue;
 
-    if (!hashMap[beatmapHash] || hashMap[beatmapHash] < awarded_sp) {
-      hashMap[beatmapHash] = awarded_sp;
+    // Normal Scores
+    if (!allHashMap[beatmapHash] || allHashMap[beatmapHash] < awarded_sp) {
+      allHashMap[beatmapHash] = awarded_sp;
     }
-  }
-  let weight = 100;
-  const values = Object.values(hashMap);
-  values.sort((a, b) => b - a);
-
-  for (const score of values) {
-    totalSp += ((score || 0) * weight) / 100;
-    weight = weight * 0.97;
 
-    if (weight < 5) {
-      break;
+    // Spin Scores
+    if (score.spin) {
+      if (!spinHashMap[beatmapHash] || spinHashMap[beatmapHash] < awarded_sp) {
+        spinHashMap[beatmapHash] = awarded_sp;
+      }
     }
   }
+  // All scores
+  const totalSp = weightCalculate(allHashMap);
+
+  // Only spin scores
+  const spinTotalSp = weightCalculate(spinHashMap);
 
   await supabase.from("profiles").upsert({
     id: userData.id,
     play_count: (userData.play_count || 0) + 1,
     skill_points: Math.round(totalSp * 100) / 100,
+    spin_skill_points: Math.round(spinTotalSp * 100) / 100,
     squares_hit: (userData.squares_hit || 0) + data.hits,
   });
   console.log("p3");
 
   return NextResponse.json({});
 }
+
+export function weightCalculate(hashMap: Record<string, number>) {
+  let totalSp = 0;
+  let weight = 100;
+
+  const values = Object.values(hashMap);
+  values.sort((a, b) => b - a);
+
+  for (const score of values) {
+    totalSp += ((score || 0) * weight) / 100;
+    weight = weight * 0.97;
+
+    if (weight < 5) {
+      break;
+    }
+  }
+  return totalSp;
+}

package/index.ts

@@ -331,6 +331,7 @@ export const Schema = {
     session: z.string(),
     page: z.number().default(1),
     flag: z.string().optional(),
+    spin: z.boolean().default(false),
   }),
   output: z.object({
     error: z.string().optional(),
@@ -346,6 +347,7 @@ export const Schema = {
           username: z.string().nullable(),
           play_count: z.number().nullable(),
           skill_points: z.number().nullable(),
+          spin_skill_points: z.number().nullable(),
           total_score: z.number().nullable(),
         })
       )

package/package.json

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

package/types/database.ts

@@ -210,6 +210,7 @@ export type Database = {
           profile_image: string | null
           sigma_rank: number | null
           skill_points: number | null
+          spin_skill_points: number
           squares_hit: number | null
           total_score: number | null
           uid: string | null
@@ -231,6 +232,7 @@ export type Database = {
           profile_image?: string | null
           sigma_rank?: number | null
           skill_points?: number | null
+          spin_skill_points?: number
           squares_hit?: number | null
           total_score?: number | null
           uid?: string | null
@@ -252,6 +254,7 @@ export type Database = {
           profile_image?: string | null
           sigma_rank?: number | null
           skill_points?: number | null
+          spin_skill_points?: number
           squares_hit?: number | null
           total_score?: number | null
           uid?: string | null