rhythia-api 138.0.0 → 141.0.0

package/api/createBeatmap.ts

@@ -18,6 +18,7 @@ export const Schema = {
   input: z.strictObject({
     url: z.string(),
     session: z.string(),
+    updateFlag: z.boolean().optional(),
   }),
   output: z.strictObject({
     hash: z.string().optional(),
@@ -36,6 +37,8 @@ export async function POST(request: Request): Promise<NextResponse> {
 
 export async function handler({
   url,
+  session,
+  updateFlag,
 }: (typeof Schema)["input"]["_type"]): Promise<
   NextResponse<(typeof Schema)["output"]["_type"]>
 > {
@@ -49,6 +52,17 @@ export async function handler({
   const parsedData = parser.parse();
   const digested = parsedData.strings.mapID;
 
+  const user = (await supabase.auth.getUser(session)).data.user!;
+  let { data: userData, error: userError } = await supabase
+    .from("profiles")
+    .select("*")
+    .eq("uid", user.id)
+    .single();
+
+  if (!userData) {
+    return NextResponse.json({ error: "Bad user" });
+  }
+
   let { data: beatmapPage, error: errorlast } = await supabase
     .from("beatmapPages")
     .select(`*`)
@@ -56,7 +70,11 @@ export async function handler({
     .single();
 
   if (beatmapPage) {
-    return NextResponse.json({ error: "Already Exists" });
+    if (!updateFlag) {
+      return NextResponse.json({ error: "Already Exists" });
+    } else if (beatmapPage.owner !== userData.id) {
+      return NextResponse.json({ error: "Already Exists" });
+    }
   }
 
   const imgkey = `beatmap-img-${Date.now()}-${digested}`;
@@ -77,14 +95,15 @@ export async function handler({
   });
 
   await s3Client.send(command);
-  parsedData.markers.sort((a, b) => a.position - b.position);
+  const markers = parsedData.markers.sort((a, b) => a.position - b.position);
+
   const upserted = await supabase.from("beatmaps").upsert({
     beatmapHash: digested,
     title: parsedData.strings.mapName,
     playcount: 0,
     difficulty: parsedData.metadata.difficulty,
     noteCount: parsedData.metadata.noteCount,
-    length: parsedData.pointers.audioLength,
+    length: markers[markers.length - 1].position,
     beatmapFile: url,
     image: `https://static.rhythia.com/${imgkey}`,
     starRating: rateMap(parsedData),

package/api/deleteBeatmapPage.ts

@@ -0,0 +1,69 @@
+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(),
+    id: z.number(),
+  }),
+  output: z.strictObject({
+    error: z.string().optional(),
+  }),
+};
+
+export async function POST(request: Request): Promise<NextResponse> {
+  return protectedApi({
+    request,
+    schema: Schema,
+    authorization: validUser,
+    activity: handler,
+  });
+}
+
+export async function handler({
+  session,
+  id,
+}: (typeof Schema)["input"]["_type"]): Promise<
+  NextResponse<(typeof Schema)["output"]["_type"]>
+> {
+  const user = (await supabase.auth.getUser(session)).data.user!;
+  let { data: userData, error: userError } = await supabase
+    .from("profiles")
+    .select("*")
+    .eq("uid", user.id)
+    .single();
+
+  let { data: pageData, error: pageError } = await supabase
+    .from("beatmapPages")
+    .select("*")
+    .eq("id", id)
+    .single();
+
+  if (!pageData) return NextResponse.json({ error: "No beatmap." });
+
+  let { data: beatmapData, error: bmPageError } = await supabase
+    .from("beatmaps")
+    .select("*")
+    .eq("beatmapHash", pageData.latestBeatmapHash || "-1-1-1-1")
+    .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." });
+
+  if (pageData.status !== "UNRANKED")
+    return NextResponse.json({ error: "Only unranked maps can be updated" });
+
+  await supabase.from("beatmapPageComments").delete().eq("beatmapPage", id);
+  await supabase.from("beatmapPages").delete().eq("id", id);
+  await supabase
+    .from("beatmaps")
+    .delete()
+    .eq("beatmapHash", beatmapData.beatmapHash);
+
+  return NextResponse.json({});
+}

package/api/submitScore.ts

@@ -60,7 +60,7 @@ export async function handler({
   console.log(userData);
   let { data: beatmaps, error } = await supabase
     .from("beatmaps")
-    .select("playcount")
+    .select("*")
     .eq("beatmapHash", data.mapHash)
     .single();
 
@@ -81,10 +81,33 @@ export async function handler({
 
   let newPlaycount = 1;
 
-  if (beatmaps) {
-    newPlaycount = (beatmaps.playcount || 1) + 1;
+  if (!beatmaps) {
+    return NextResponse.json(
+      {
+        error: "Map not submitted",
+      },
+      { status: 500 }
+    );
+  }
+
+  if (beatmaps.noteCount !== data.mapNoteCount) {
+    return NextResponse.json(
+      {
+        error: "Wrong map",
+      },
+      { status: 500 }
+    );
+  }
+  if (beatmaps.noteCount !== data.mapNoteCount) {
+    return NextResponse.json(
+      {
+        error: "Wrong map",
+      },
+      { status: 500 }
+    );
   }
 
+  newPlaycount = (beatmaps.playcount || 1) + 1;
   await supabase.from("beatmaps").upsert({
     beatmapHash: data.mapHash,
     title: data.mapTitle,

package/api/updateBeatmapPage.ts

@@ -59,6 +59,9 @@ export async function handler({
   if (userData.id !== pageData?.owner)
     return NextResponse.json({ error: "Non-authz user." });
 
+  if (pageData?.status !== "UNRANKED")
+    return NextResponse.json({ error: "Only unranked maps can be updated" });
+
   const upserted = await supabase
     .from("beatmapPages")
     .upsert({

package/index.ts

@@ -15,6 +15,11 @@ import { Schema as CreateBeatmapPage } from "./api/createBeatmapPage"
 export { Schema as SchemaCreateBeatmapPage } from "./api/createBeatmapPage"
 export const createBeatmapPage = handleApi({url:"/api/createBeatmapPage",...CreateBeatmapPage})
 
+// ./api/deleteBeatmapPage.ts API
+import { Schema as DeleteBeatmapPage } from "./api/deleteBeatmapPage"
+export { Schema as SchemaDeleteBeatmapPage } from "./api/deleteBeatmapPage"
+export const deleteBeatmapPage = handleApi({url:"/api/deleteBeatmapPage",...DeleteBeatmapPage})
+
 // ./api/editAboutMe.ts API
 import { Schema as EditAboutMe } from "./api/editAboutMe"
 export { Schema as SchemaEditAboutMe } from "./api/editAboutMe"

package/package.json

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

package/scripts/ci-deploy.ts

@@ -1,76 +0,0 @@
-import fs from "fs";
-import * as git from "isomorphic-git";
-import http from "isomorphic-git/http/node";
-import path from "path";
-
-// Set up the repository URL
-const repoUrl = `https://${process.env.GIT_KEY}@github.com/cunev/rhythia-api.git`;
-
-const sourceBranch = process.env.SOURCE_BRANCH!;
-const targetBranch = process.env.TARGET_BRANCH!;
-
-async function cloneBranch() {
-  const dir = path.join("/tmp", "repo");
-
-  try {
-    // Ensure the directory is clean before cloning
-    if (fs.existsSync(dir)) {
-      fs.rmdirSync(dir, { recursive: true });
-      console.log(`Deleted existing directory: ${dir}`);
-    }
-
-    // Clone the repository into a temporary directory
-    await git.clone({
-      fs,
-      http,
-      dir,
-      url: repoUrl,
-      ref: sourceBranch,
-      singleBranch: true,
-      depth: 1,
-    });
-    console.log(`Cloned ${sourceBranch} branch from remote repository.`);
-
-    // Check out the source branch
-    await git.checkout({ fs, dir, ref: sourceBranch });
-    console.log(`Checked out to branch: ${sourceBranch}`);
-
-    // Pull the latest changes from the source branch
-    await git.pull({
-      fs,
-      http,
-      dir,
-      ref: sourceBranch,
-      singleBranch: true,
-      author: {
-        name: process.env.GIT_USER,
-        email: "you@example.com", // Replace with the actual email
-      },
-    });
-    console.log(`Pulled latest changes from branch: ${sourceBranch}`);
-
-    // Create and checkout the target branch from the source branch
-    await git.branch({ fs, dir, ref: targetBranch });
-    await git.checkout({ fs, dir, ref: targetBranch });
-    console.log(`Created and checked out to branch: ${targetBranch}`);
-
-    // Push the new branch to the remote repository
-    await git.push({
-      fs,
-      http,
-      dir,
-      remote: "origin",
-      ref: targetBranch,
-      force: true,
-      onAuth: () => ({
-        username: process.env.GIT_KEY, // GitHub token or password
-        password: "",
-      }),
-    });
-    console.log(`Pushed new branch to remote: ${targetBranch}`);
-  } catch (error) {
-    console.error("Error performing Git operations:", error.message);
-  }
-}
-
-cloneBranch();

package/scripts/test.ts

@@ -1,96 +0,0 @@
-import { createClient } from "@supabase/supabase-js";
-import { Database } from "../types/database";
-import { SSPMParser } from "../utils/star-calc/sspmParser";
-import { rateMap, rateMapOld } from "../utils/star-calc";
-import { V1SSPMParser } from "../utils/star-calc/sspmv1Parser";
-
-export const supabase = createClient<Database>(
-  `https://pfkajngbllcbdzoylrvp.supabase.co`,
-  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InBma2FqbmdibGxjYmR6b3lscnZwIiwicm9sZSI6InNlcnZpY2Vfcm9sZSIsImlhdCI6MTcxODU3NjA3MCwiZXhwIjoyMDM0MTUyMDcwfQ.XKUlQWvzmcYyirM-Zi4nwhiEKcpx1xLS97QUyuR3MoY",
-  {
-    auth: {
-      autoRefreshToken: false,
-      persistSession: false,
-    },
-  }
-);
-
-async function main() {
-  let qry = supabase
-    .from("beatmapPages")
-    .select(
-      `
-        owner,
-        created_at,
-        id,
-        status,
-        beatmaps!inner(
-          playcount,
-          ranked,
-          beatmapFile,
-          image,
-          starRating,
-          difficulty,
-          title
-        ),
-        profiles!inner(
-          username
-        )`
-    )
-    .order("created_at", { ascending: false });
-
-  qry = qry.ilike("beatmaps.title", "%Ca%");
-  qry = qry.ilike("profiles.username", "%Ca%");
-
-  const data = await qry;
-  console.log(data);
-  // console.log(data.data[]);
-  // const req = await fetch(`https://cdn.rhythia.net/index.json`);
-  // const json = Object.values(await req.json()) as any[];
-  // console.log(json[0]);
-
-  // let count = 0;
-  // for (const map of json) {
-  //   const request = await fetch(map.download);
-  //   const bytes = await request.arrayBuffer();
-  //   const parser = new SSPMParser(Buffer.from(bytes));
-  //   let rate = 0;
-  //   try {
-  //     const data = parser.parse();
-  //     rate = rateMap(data);
-  //   } catch (error) {
-  //     const parserOld = new V1SSPMParser(Buffer.from(bytes));
-  //     const data = parserOld.parse();
-
-  //     rate = rateMapOld(data);
-  //   }
-  //   await supabase.from("beatmaps").upsert({
-  //     beatmapHash: map.id,
-  //     starRating: rate,
-  //   });
-  //   count++;
-  //   console.log(count, json.length, map.id, rate);
-  // }
-  // for (const map of json) {
-  //   const reqMap = await fetch(map.link);
-  //   const buff = await reqMap.arrayBuffer();
-  //   writeFileSync("./toSubmit/" + map.id + ".sspm", Buffer.from(buff));
-  // }
-
-  // const { data: mapData, error } = await supabase
-  //   .from("beatmapPages")
-  //   .select("id,nominations,owner,status")
-  //   .eq("owner", 10)
-  //   .eq("status", "RANKED");
-
-  // if (!mapData) {
-  //   throw "lolz";
-  // }
-
-  // for (const element of mapData) {
-
-  //   console.log(data.error);
-  // }
-}
-
-main();

package/scripts/update.ts

@@ -1,49 +0,0 @@
-import { $ } from "bun";
-import { readdirSync, readFileSync, writeFileSync } from "fs";
-import { lowerFirst, upperFirst } from "lodash";
-import path from "path";
-const packageJson = JSON.parse(readFileSync("./package.json", "utf-8"));
-
-const versions = packageJson.version.split(".");
-versions[0] = Number(versions[0]) + 1;
-
-packageJson.version = versions.join(".");
-
-writeFileSync("./package.json", JSON.stringify(packageJson, null, 2));
-
-const apis = readdirSync("./api");
-
-const exports: string[] = [];
-exports.push(`import { handleApi } from "./handleApi"`);
-
-for (const api of apis) {
-  if (
-    !readFileSync(path.join("./api", api), "utf-8").includes(
-      "export const Schema"
-    )
-  ) {
-    continue;
-  }
-  exports.push(`\n// ./api/${api} API`);
-
-  const apiName = path.parse(api).name;
-  exports.push(
-    `import { Schema as ${upperFirst(apiName)} } from "./api/${apiName}"`
-  );
-  exports.push(
-    `export { Schema as Schema${upperFirst(apiName)} } from "./api/${apiName}"`
-  );
-
-  exports.push(
-    `export const ${lowerFirst(
-      apiName
-    )} = handleApi({url:"/api/${apiName}",...${upperFirst(apiName)}})`
-  );
-}
-exports.push(`export { handleApi } from "./handleApi"`);
-
-writeFileSync("./index.ts", exports.join("\n"));
-
-// const conf = readFileSync("./.cred", "utf-8");
-// await $`npm logout`.nothrow();
-await $`yarn publish`;