rhythia-api 117.0.0 → 119.0.0

package/api/createBeatmap.ts

@@ -40,9 +40,7 @@ export async function handler({
 }: (typeof Schema)["input"]["_type"]): Promise<
   NextResponse<(typeof Schema)["output"]["_type"]>
 > {
-  if (
-    !url.startsWith(`https://rhthia-avatars.s3.eu-central-003.backblazeb2.com/`)
-  )
+  if (!url.startsWith(`https://static.rhythia.com/`))
     return NextResponse.json({ error: "Invalid url" });
 
   const request = await fetch(url);
@@ -71,7 +69,7 @@ export async function handler({
     noteCount: parsedData.metadata.noteCount,
     length: parsedData.pointers.audioLength,
     beatmapFile: url,
-    image: `https://rhthia-avatars.s3.eu-central-003.backblazeb2.com/${imgkey}`,
+    image: `https://static.rhythia.com/${imgkey}`,
     starRating: rateMap(parsedData),
   });
 

package/api/getBeatmaps.ts

@@ -8,6 +8,10 @@ export const Schema = {
     session: z.string(),
     textFilter: z.string().optional(),
     page: z.number().default(1),
+    maxStars: z.number().optional(),
+    minStars: z.number().optional(),
+    creator: z.string().optional(),
+    status: z.string().optional(),
   }),
   output: z.object({
     error: z.string().optional(),
@@ -49,58 +53,25 @@ 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 getBeatmaps(
-    data.page,
-    data.session,
-    data.textFilter || ""
-  );
+  const result = await getBeatmaps(data);
   return NextResponse.json(result);
 }
 
 const VIEW_PER_PAGE = 50;
 
-export async function getBeatmaps(page = 1, session: string, filter: string) {
-  const startPage = (page - 1) * VIEW_PER_PAGE;
+export async function getBeatmaps(data: (typeof Schema)["input"]["_type"]) {
+  const startPage = (data.page - 1) * VIEW_PER_PAGE;
   const endPage = startPage + VIEW_PER_PAGE - 1;
   const countQuery = await supabase
     .from("beatmapPages")
     .select("*", { count: "exact", head: true });
 
-  let queryData = await getQuery(startPage, endPage, filter);
-
-  return {
-    total: countQuery.count || 0,
-    viewPerPage: VIEW_PER_PAGE,
-    currentPage: page,
-    beatmaps: queryData
-      ?.filter((e) => e.beatmaps)
-      .map((beatmapPage) => ({
-        id: beatmapPage.id,
-        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,
-        image: beatmapPage.beatmaps?.image,
-        starRating: beatmapPage.beatmaps?.starRating,
-        owner: beatmapPage.owner,
-        ownerUsername: beatmapPage.profiles?.username,
-        ownerAvatar: beatmapPage.profiles?.avatar_url,
-      })),
-  };
-}
-
-async function getQuery(startPage: number, endPage: number, filter: string) {
-  if (filter.length) {
-    let { data: data, error } = await supabase
-      .from("beatmapPages")
-      .select(
-        `
+  let qry = supabase
+    .from("beatmapPages")
+    .select(
+      `
         *,
-        beatmaps (
+        beatmaps!inner(
           created_at,
           playcount,
           length,
@@ -112,41 +83,53 @@ async function getQuery(startPage: number, endPage: number, filter: string) {
           noteCount,
           title
         ),
-        profiles (
+        profiles!inner(
           username,
           avatar_url
         )`
-      )
-      .order("created_at", { ascending: false })
-      .ilike("beatmaps.title", `%${filter}%`)
-      .range(startPage, endPage);
+    )
+    .order("created_at", { ascending: false });
 
-    return data;
-  } else {
-    let { data: data, error } = await supabase
-      .from("beatmapPages")
-      .select(
-        `
-      *,
-      beatmaps (
-        created_at,
-        playcount,
-        length,
-        ranked,
-        beatmapFile,
-        image,
-        starRating,
-        difficulty,
-        noteCount,
-        title
-      ),
-      profiles (
-        username,
-        avatar_url
-      )`
-      )
-      .order("created_at", { ascending: false })
-      .range(startPage, endPage);
-    return data;
+  if (data.textFilter) {
+    qry = qry.ilike("beatmaps.title", `%${data.textFilter}%`);
+  }
+
+  if (data.minStars) {
+    qry = qry.gt("beatmaps.starRating", data.minStars);
   }
+
+  if (data.maxStars) {
+    qry = qry.lt("beatmaps.starRating", data.maxStars);
+  }
+  if (data.status) {
+    qry = qry.eq("status", data.status);
+  }
+
+  if (data.creator) {
+    qry = qry.eq("creator", data.creator);
+  }
+
+  let queryData = await qry.range(startPage, endPage);
+
+  return {
+    total: countQuery.count || 0,
+    viewPerPage: VIEW_PER_PAGE,
+    currentPage: data.page,
+    beatmaps: queryData.data?.map((beatmapPage) => ({
+      id: beatmapPage.id,
+      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,
+      image: beatmapPage.beatmaps?.image,
+      starRating: beatmapPage.beatmaps?.starRating,
+      owner: beatmapPage.owner,
+      ownerUsername: beatmapPage.profiles?.username,
+      ownerAvatar: beatmapPage.profiles?.avatar_url,
+    })),
+  };
 }

package/api/updateBeatmapPage.ts

@@ -43,7 +43,15 @@ export async function handler({
     .eq("id", id)
     .single();
 
+  let { data: beatmapData, error: bmPageError } = await supabase
+    .from("beatmaps")
+    .select("*")
+    .eq("beatmapHash", beatmapHash)
+    .single();
+
   if (!userData) return NextResponse.json({ error: "No user." });
+  if (!beatmapData) return NextResponse.json({ error: "No beatmap." });
+
   if (userData.id !== pageData?.owner)
     return NextResponse.json({ error: "Non-authz user." });
 
@@ -52,6 +60,9 @@ export async function handler({
     .upsert({
       id,
       latestBeatmapHash: beatmapHash,
+      genre: "",
+      title: beatmapData.title,
+      status: "UNRANKED",
       owner: userData.id,
     })
     .select("*")

package/package.json

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