rhythia-api 85.0.0 → 87.0.0

package/.env

@@ -0,0 +1 @@
+ADMIN_KEY="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InBma2FqbmdibGxjYmR6b3lscnZwIiwicm9sZSI6InNlcnZpY2Vfcm9sZSIsImlhdCI6MTcxODU3NjA3MCwiZXhwIjoyMDM0MTUyMDcwfQ.XKUlQWvzmcYyirM-Zi4nwhiEKcpx1xLS97QUyuR3MoY"

package/api/getLeaderboard.ts

@@ -6,11 +6,12 @@ import { supabase } from "../utils/supabase";
 export const Schema = {
   input: z.strictObject({
     session: z.string(),
-    page: z.number().optional(),
+    page: z.number().default(1),
   }),
   output: z.object({
     error: z.string().optional(),
     total: z.number().optional(),
+    viewPerPage: z.number(),
     leaderboard: z
       .array(
         z.object({
@@ -26,9 +27,9 @@ export const Schema = {
   }),
 };
 
-export async function POST(res: Response): Promise<NextResponse> {
+export async function POST(request: Request): Promise<NextResponse> {
   return protectedApi({
-    response: res,
+    request,
     schema: Schema,
     authorization: validUser,
     activity: handler,
@@ -38,12 +39,16 @@ export async function POST(res: Response): Promise<NextResponse> {
 export async function handler(
   data: (typeof Schema)["input"]["_type"]
 ): Promise<NextResponse<(typeof Schema)["output"]["_type"]>> {
-  const range = [0, 100];
-  if (data.page) {
-    range[0] = 100 * data.page;
-    range[1] = range[0] + 100;
-  }
+  const result = await getLeaderboard(data.page);
+  return NextResponse.json(result);
+}
+
+const VIEW_PER_PAGE = 2;
 
+export async function getLeaderboard(page = 1) {
+  const startPage = (page - 1) * VIEW_PER_PAGE;
+  const endPage = startPage + VIEW_PER_PAGE - 1;
+  console.log(startPage, endPage);
   const countQuery = await supabase
     .from("profiles")
     .select("*", { count: "exact", head: true });
@@ -52,10 +57,11 @@ export async function handler(
     .from("profiles")
     .select("*")
     .order("skill_points", { ascending: false })
-    .range(range[0], range[1]);
+    .range(startPage, endPage);
 
-  return NextResponse.json({
+  return {
     total: countQuery.count || 0,
+    viewPerPage: VIEW_PER_PAGE,
     leaderboard: queryData?.map((user) => ({
       flag: user.flag,
       id: user.id,
@@ -64,5 +70,5 @@ export async function handler(
       total_score: user.total_score,
       username: user.username,
     })),
-  });
+  };
 }

package/api/searchUsers.ts

@@ -32,13 +32,10 @@ export async function POST(request: Request) {
 export async function handler(data: (typeof Schema)["input"]["_type"]) {
   const { data: searchData, error } = await supabase
     .from("profiles")
-    .select()
+    .select("id,username")
     .ilike("username", `%${data.text}%`)
     .limit(10);
   return NextResponse.json({
-    results: (searchData || []).map((data) => ({
-      id: data.id,
-      username: data.username,
-    })),
+    results: searchData || [],
   });
 }

package/api/submitScore.ts

@@ -44,9 +44,10 @@ export async function handler({
   let { data: userData, error: userError } = await supabase
     .from("profiles")
     .select("*")
-    .eq("uid", user.id);
+    .eq("uid", user.id)
+    .single();
 
-  if (!userData?.length)
+  if (!userData)
     return NextResponse.json(
       {
         error: "User doesn't exist",
@@ -56,51 +57,45 @@ export async function handler({
 
   let { data: beatmaps, error } = await supabase
     .from("beatmaps")
-    .select("*")
-    .eq("beatmapHash", data.mapHash);
+    .select("playcount")
+    .eq("beatmapHash", data.mapHash)
+    .single();
 
   let newPlaycount = 1;
 
-  if (beatmaps?.length) {
-    newPlaycount = (beatmaps[0].playcount || 1) + 1;
+  if (beatmaps) {
+    newPlaycount = (beatmaps.playcount || 1) + 1;
   }
 
-  const upsertData = await supabase
-    .from("beatmaps")
-    .upsert({
-      beatmapHash: data.mapHash,
-      title: data.mapTitle,
-      playcount: newPlaycount,
-      difficulty: data.mapDifficulty,
-      noteCount: data.mapNoteCount,
-      length: data.mapLength,
-    })
-    .select();
+  const p1 = supabase.from("beatmaps").upsert({
+    beatmapHash: data.mapHash,
+    title: data.mapTitle,
+    playcount: newPlaycount,
+    difficulty: data.mapDifficulty,
+    noteCount: data.mapNoteCount,
+    length: data.mapLength,
+  });
 
-  const insertData = await supabase
-    .from("scores")
-    .upsert({
-      beatmapHash: data.mapHash,
-      noteResults: data.noteResults,
-      replayHwid: data.relayHwid,
-      songId: data.songId,
-      triggers: data.triggers,
-      userId: userData[0].id,
-      passed: data.mapNoteCount == Object.keys(data.noteResults).length,
-      misses: Object.values(data.noteResults).filter((e) => !e).length,
-    })
-    .select();
+  const p2 = supabase.from("scores").upsert({
+    beatmapHash: data.mapHash,
+    noteResults: data.noteResults,
+    replayHwid: data.relayHwid,
+    songId: data.songId,
+    triggers: data.triggers,
+    userId: userData[0].id,
+    passed: data.mapNoteCount == Object.keys(data.noteResults).length,
+    misses: Object.values(data.noteResults).filter((e) => !e).length,
+  });
 
-  const insertUserData = await supabase
-    .from("profiles")
-    .upsert({
-      id: userData[0].id,
-      play_count: (userData[0].play_count || 0) + 1,
-      squares_hit:
-        (userData[0].squares_hit || 0) +
-        Object.values(data.noteResults).filter((e) => e).length,
-    })
-    .select();
+  const p3 = supabase.from("profiles").upsert({
+    id: userData[0].id,
+    play_count: (userData[0].play_count || 0) + 1,
+    squares_hit:
+      (userData[0].squares_hit || 0) +
+      Object.values(data.noteResults).filter((e) => e).length,
+  });
+
+  await Promise.all([p1, p2, p3]);
 
   return NextResponse.json({});
 }

package/package.json

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

package/test.ts

@@ -0,0 +1,8 @@
+import { getLeaderboard } from "./api/getLeaderboard";
+
+async function main() {
+  const result = await getLeaderboard(1);
+  console.log(result);
+}
+
+main();