rhythia-api 120.0.0 → 122.0.0

package/api/approveMap.ts

@@ -0,0 +1,65 @@
+import { NextResponse } from "next/server";
+import z from "zod";
+import { protectedApi, validUser } from "../utils/requestUtils";
+import { supabase } from "../utils/supabase";
+
+export const Schema = {
+  input: z.strictObject({
+    session: z.string(),
+    mapId: z.number(),
+  }),
+  output: z.object({
+    error: z.string().optional(),
+  }),
+};
+
+export async function POST(request: Request) {
+  return protectedApi({
+    request,
+    schema: Schema,
+    authorization: validUser,
+    activity: handler,
+  });
+}
+
+export async function handler(data: (typeof Schema)["input"]["_type"]) {
+  const user = (await supabase.auth.getUser(data.session)).data.user!;
+  let { data: queryUserData, error: userError } = await supabase
+    .from("profiles")
+    .select("*")
+    .eq("uid", user.id)
+    .single();
+
+  if (!queryUserData) {
+    return NextResponse.json({ error: "Can't find user" });
+  }
+
+  const tags = (queryUserData?.badges || []) as string[];
+
+  if (!tags.includes("MMT")) {
+    return NextResponse.json({ error: "Only MMTs can approve maps!" });
+  }
+
+  const { data: mapData, error } = await supabase
+    .from("beatmapPages")
+    .select("id,nominations")
+    .eq("id", data.mapId)
+    .single();
+
+  if (!mapData) {
+    return NextResponse.json({ error: "Bad map" });
+  }
+
+  if (mapData.nominations! < 2) {
+    return NextResponse.json({
+      error: "Maps can get approved only if they have 2 approvals",
+    });
+  }
+
+  await supabase.from("beatmapPages").upsert({
+    id: data.mapId,
+    status: "RANKED",
+  });
+
+  return NextResponse.json({});
+}

package/api/getBeatmaps.ts

@@ -64,28 +64,26 @@ export async function getBeatmaps(data: (typeof Schema)["input"]["_type"]) {
   const endPage = startPage + VIEW_PER_PAGE - 1;
   const countQuery = await supabase
     .from("beatmapPages")
-    .select("*", { count: "exact", head: true });
+    .select("id", { count: "exact", head: true });
 
   let qry = supabase
     .from("beatmapPages")
     .select(
       `
-        *,
+        owner,
+        created_at,
+        id,
         beatmaps!inner(
-          created_at,
           playcount,
-          length,
           ranked,
           beatmapFile,
           image,
           starRating,
           difficulty,
-          noteCount,
           title
         ),
         profiles!inner(
-          username,
-          avatar_url
+          username
         )`
     )
     .order("created_at", { ascending: false });
@@ -105,7 +103,7 @@ export async function getBeatmaps(data: (typeof Schema)["input"]["_type"]) {
     qry = qry.eq("status", data.status);
   }
 
-  if (data.creator) {
+  if (data.creator !== undefined) {
     qry = qry.eq("owner", data.creator);
   }
 
@@ -120,8 +118,6 @@ export async function getBeatmaps(data: (typeof Schema)["input"]["_type"]) {
       playcount: beatmapPage.beatmaps?.playcount,
       created_at: beatmapPage.created_at,
       difficulty: beatmapPage.beatmaps?.difficulty,
-      noteCount: beatmapPage.beatmaps?.noteCount,
-      length: beatmapPage.beatmaps?.length,
       title: beatmapPage.beatmaps?.title,
       ranked: beatmapPage.beatmaps?.ranked,
       beatmapFile: beatmapPage.beatmaps?.beatmapFile,
@@ -129,7 +125,6 @@ export async function getBeatmaps(data: (typeof Schema)["input"]["_type"]) {
       starRating: beatmapPage.beatmaps?.starRating,
       owner: beatmapPage.owner,
       ownerUsername: beatmapPage.profiles?.username,
-      ownerAvatar: beatmapPage.profiles?.avatar_url,
     })),
   };
 }

package/api/getLeaderboard.ts

@@ -73,7 +73,7 @@ export async function getLeaderboard(page = 1, session: string) {
   const endPage = startPage + VIEW_PER_PAGE - 1;
   const countQuery = await supabase
     .from("profiles")
-    .select("*", { count: "exact", head: true })
+    .select("ban", { count: "exact", head: true })
     .neq("ban", "excluded");
 
   let { data: queryData, error } = await supabase

package/api/getScore.ts

@@ -24,6 +24,7 @@ export const Schema = {
         beatmapNotes: z.number().optional().nullable(),
         beatmapTitle: z.string().optional().nullable(),
         username: z.string().optional().nullable(),
+        speed: z.number().optional().nullable(),
       })
       .optional(),
   }),
@@ -76,6 +77,7 @@ export async function handler(
       beatmapNotes: score.beatmaps?.noteCount,
       beatmapTitle: score.beatmaps?.title,
       username: score.profiles?.username,
+      speed: score.speed,
     },
   });
 }

package/api/getUserScores.ts

@@ -24,6 +24,7 @@ export const Schema = {
           beatmapDifficulty: z.number().optional().nullable(),
           beatmapNotes: z.number().optional().nullable(),
           beatmapTitle: z.string().optional().nullable(),
+          speed: z.number().optional().nullable(),
         })
       )
       .optional(),
@@ -42,6 +43,7 @@ export const Schema = {
           beatmapDifficulty: z.number().optional().nullable(),
           beatmapNotes: z.number().optional().nullable(),
           beatmapTitle: z.string().optional().nullable(),
+          speed: z.number().optional().nullable(),
         })
       )
       .optional(),
@@ -128,6 +130,7 @@ export async function handler(
       beatmapDifficulty: s.beatmaps?.difficulty,
       beatmapNotes: s.beatmaps?.noteCount,
       beatmapTitle: s.beatmaps?.title,
+      speed: s.speed,
     })),
     top: vals?.map((s) => ({
       created_at: s.created_at,
@@ -142,6 +145,7 @@ export async function handler(
       beatmapDifficulty: s.beatmaps?.difficulty,
       beatmapNotes: s.beatmaps?.noteCount,
       beatmapTitle: s.beatmaps?.title,
+      speed: s.speed,
     })),
   });
 }

package/api/nominateMap.ts

@@ -0,0 +1,59 @@
+import { NextResponse } from "next/server";
+import z from "zod";
+import { protectedApi, validUser } from "../utils/requestUtils";
+import { supabase } from "../utils/supabase";
+
+export const Schema = {
+  input: z.strictObject({
+    session: z.string(),
+    mapId: z.number(),
+  }),
+  output: z.object({
+    error: z.string().optional(),
+  }),
+};
+
+export async function POST(request: Request) {
+  return protectedApi({
+    request,
+    schema: Schema,
+    authorization: validUser,
+    activity: handler,
+  });
+}
+
+export async function handler(data: (typeof Schema)["input"]["_type"]) {
+  const user = (await supabase.auth.getUser(data.session)).data.user!;
+  let { data: queryUserData, error: userError } = await supabase
+    .from("profiles")
+    .select("*")
+    .eq("uid", user.id)
+    .single();
+
+  if (!queryUserData) {
+    return NextResponse.json({ error: "Can't find user" });
+  }
+
+  const tags = (queryUserData?.badges || []) as string[];
+
+  if (!tags.includes("RCT")) {
+    return NextResponse.json({ error: "Only RCTs can nominate maps!" });
+  }
+
+  const { data: mapData, error } = await supabase
+    .from("beatmapPages")
+    .select("id,nominations")
+    .eq("id", data.mapId)
+    .single();
+
+  if (!mapData) {
+    return NextResponse.json({ error: "Bad map" });
+  }
+
+  await supabase.from("beatmapPages").upsert({
+    id: data.mapId,
+    nominations: mapData.nominations! + 1,
+  });
+
+  return NextResponse.json({});
+}

package/index.ts

@@ -1,5 +1,10 @@
 import { handleApi } from "./handleApi"
 
+// ./api/approveMap.ts API
+import { Schema as ApproveMap } from "./api/approveMap"
+export { Schema as SchemaApproveMap } from "./api/approveMap"
+export const approveMap = handleApi({url:"/api/approveMap",...ApproveMap})
+
 // ./api/createBeatmap.ts API
 import { Schema as CreateBeatmap } from "./api/createBeatmap"
 export { Schema as SchemaCreateBeatmap } from "./api/createBeatmap"
@@ -65,6 +70,11 @@ import { Schema as GetUserScores } from "./api/getUserScores"
 export { Schema as SchemaGetUserScores } from "./api/getUserScores"
 export const getUserScores = handleApi({url:"/api/getUserScores",...GetUserScores})
 
+// ./api/nominateMap.ts API
+import { Schema as NominateMap } from "./api/nominateMap"
+export { Schema as SchemaNominateMap } from "./api/nominateMap"
+export const nominateMap = handleApi({url:"/api/nominateMap",...NominateMap})
+
 // ./api/searchUsers.ts API
 import { Schema as SearchUsers } from "./api/searchUsers"
 export { Schema as SchemaSearchUsers } from "./api/searchUsers"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rhythia-api",
-  "version": "120.0.0",
+  "version": "122.0.0",
   "main": "index.ts",
   "scripts": {
     "update": "bun ./scripts/update.ts",
@@ -33,7 +33,7 @@
     "osu-parsers": "^4.1.7",
     "osu-standard-stable": "^5.0.0",
     "simple-git": "^3.25.0",
-    "supabase": "^1.192.5",
+    "supabase": "^1.204.3",
     "tsx": "^4.17.0",
     "utf-8-validate": "^6.0.4",
     "zod": "^3.23.8"

package/types/database.ts

@@ -15,6 +15,7 @@ export type Database = {
           genre: string | null
           id: number
           latestBeatmapHash: string | null
+          nominations: number | null
           owner: number | null
           status: string | null
           title: string | null
@@ -24,6 +25,7 @@ export type Database = {
           genre?: string | null
           id?: number
           latestBeatmapHash?: string | null
+          nominations?: number | null
           owner?: number | null
           status?: string | null
           title?: string | null
@@ -33,6 +35,7 @@ export type Database = {
           genre?: string | null
           id?: number
           latestBeatmapHash?: string | null
+          nominations?: number | null
           owner?: number | null
           status?: string | null
           title?: string | null
@@ -174,6 +177,7 @@ export type Database = {
           passed: boolean | null
           replayHwid: string | null
           songId: string | null
+          speed: number | null
           userId: number | null
         }
         Insert: {
@@ -185,6 +189,7 @@ export type Database = {
           passed?: boolean | null
           replayHwid?: string | null
           songId?: string | null
+          speed?: number | null
           userId?: number | null
         }
         Update: {
@@ -196,6 +201,7 @@ export type Database = {
           passed?: boolean | null
           replayHwid?: string | null
           songId?: string | null
+          speed?: number | null
           userId?: number | null
         }
         Relationships: [