rhythia-api 142.0.0 → 144.0.0

package/api/createBeatmap.ts

@@ -9,8 +9,8 @@ const s3Client = new S3Client({
   region: "auto",
   endpoint: "https://s3.eu-central-003.backblazeb2.com",
   credentials: {
-    secretAccessKey: "K0039mm4iKsteQOXpZSzf0+VDzuH89U",
-    accessKeyId: "003c245e893e8060000000001",
+    secretAccessKey: process.env.SECRET_BUCKET || "",
+    accessKeyId: process.env.ACCESS_BUCKET || "",
   },
 });
 
@@ -63,6 +63,20 @@ export async function handler({
     return NextResponse.json({ error: "Bad user" });
   }
 
+  if (
+    userData.ban == "excluded" ||
+    userData.ban == "restricted" ||
+    userData.ban == "silenced"
+  ) {
+    return NextResponse.json(
+      {
+        error:
+          "Silenced, restricted or excluded players can't update their profile.",
+      },
+      { status: 404 }
+    );
+  }
+
   let { data: beatmapPage, error: errorlast } = await supabase
     .from("beatmapPages")
     .select(`*`)

package/api/createBeatmapPage.ts

@@ -36,6 +36,20 @@ export async function handler({
 
   if (!userData) return NextResponse.json({ error: "No user." });
 
+  if (
+    userData.ban == "excluded" ||
+    userData.ban == "restricted" ||
+    userData.ban == "silenced"
+  ) {
+    return NextResponse.json(
+      {
+        error:
+          "Silenced, restricted or excluded players can't update their profile.",
+      },
+      { status: 404 }
+    );
+  }
+  
   const upserted = await supabase
     .from("beatmapPages")
     .upsert({

package/api/getAvatarUploadUrl.ts

@@ -14,8 +14,8 @@ const s3Client = new S3Client({
   region: "auto",
   endpoint: "https://s3.eu-central-003.backblazeb2.com",
   credentials: {
-    secretAccessKey: "K0039mm4iKsteQOXpZSzf0+VDzuH89U",
-    accessKeyId: "003c245e893e8060000000001",
+    secretAccessKey: process.env.SECRET_BUCKET || "",
+    accessKeyId: process.env.ACCESS_BUCKET || "",
   },
 });
 
@@ -24,6 +24,7 @@ export const Schema = {
     session: z.string(),
     contentLength: z.number(),
     contentType: z.string(),
+    intrinsicToken: z.string(),
   }),
   output: z.strictObject({
     error: z.string().optional(),
@@ -45,11 +46,18 @@ export async function handler({
   session,
   contentLength,
   contentType,
+  intrinsicToken,
 }: (typeof Schema)["input"]["_type"]): Promise<
   NextResponse<(typeof Schema)["output"]["_type"]>
 > {
   const user = (await supabase.auth.getUser(session)).data.user!;
 
+  if (!validateIntrinsicToken(intrinsicToken)) {
+    return NextResponse.json({
+      error: "Invalid intrinsic token",
+    });
+  }
+
   if (contentLength > 5000000) {
     return NextResponse.json({
       error: "Max content length exceeded.",

package/api/getMapUploadUrl.ts

@@ -14,8 +14,8 @@ const s3Client = new S3Client({
   region: "auto",
   endpoint: "https://s3.eu-central-003.backblazeb2.com",
   credentials: {
-    secretAccessKey: "K0039mm4iKsteQOXpZSzf0+VDzuH89U",
-    accessKeyId: "003c245e893e8060000000001",
+    secretAccessKey: process.env.SECRET_BUCKET || "",
+    accessKeyId: process.env.ACCESS_BUCKET || "",
   },
 });
 
@@ -25,6 +25,7 @@ export const Schema = {
     session: z.string(),
     contentLength: z.number(),
     contentType: z.string(),
+    intrinsicToken: z.string(),
   }),
   output: z.strictObject({
     error: z.string().optional(),
@@ -47,11 +48,18 @@ export async function handler({
   session,
   contentLength,
   contentType,
+  intrinsicToken,
 }: (typeof Schema)["input"]["_type"]): Promise<
   NextResponse<(typeof Schema)["output"]["_type"]>
 > {
   const user = (await supabase.auth.getUser(session)).data.user!;
 
+  if (!validateIntrinsicToken(intrinsicToken)) {
+    return NextResponse.json({
+      error: "Invalid intrinsic token",
+    });
+  }
+
   if (contentLength > 50000000) {
     return NextResponse.json({
       error: "Max content length exceeded.",

package/api/submitScore.ts

@@ -50,6 +50,12 @@ export async function handler({
 }: (typeof Schema)["input"]["_type"]): Promise<
   NextResponse<(typeof Schema)["output"]["_type"]>
 > {
+  return NextResponse.json(
+    {
+      error: "Disabled",
+    },
+    { status: 500 }
+  );
   const user = (await supabase.auth.getUser(session)).data.user!;
 
   let { data: userData, error: userError } = await supabase
@@ -111,13 +117,27 @@ export async function handler({
     playcount: (beatmaps.playcount || 1) + 1,
   });
 
-  const passed =
-    data.misses == 0 && data.misses + data.hits == beatmaps.noteCount;
+  let passed = true;
+
+  // Pass invalidation
+  if (data.misses + data.hits !== beatmaps.noteCount) {
+    passed = false;
+  }
+
   const accurracy = data.hits / beatmaps.noteCount;
   let awarded_sp = 0;
 
+  console.log(
+    data.misses + data.hits == beatmaps.noteCount,
+    data.misses + data.hits,
+    beatmaps.noteCount
+  );
+
   if (beatmaps.starRating) {
-    awarded_sp = calculatePerformancePoints(beatmaps.starRating, accurracy);
+    awarded_sp = calculatePerformancePoints(
+      data.speed * beatmaps.starRating,
+      accurracy
+    );
   }
 
   if (beatmapPages.status == "UNRANKED") {
@@ -133,6 +153,7 @@ export async function handler({
     passed,
     misses: data.misses,
     awarded_sp: Math.round(awarded_sp * 100) / 100,
+    speed: data.speed,
   });
   console.log("p2");
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rhythia-api",
-  "version": "142.0.0",
+  "version": "144.0.0",
   "main": "index.ts",
   "scripts": {
     "update": "bun ./scripts/update.ts",
@@ -28,6 +28,7 @@
     "badwords-list": "^2.0.1-4",
     "bufferutil": "^4.0.8",
     "bun": "^1.1.22",
+    "byteweb": "^0.0.3",
     "esbuild": "^0.23.0",
     "isomorphic-git": "^1.27.1",
     "lodash": "^4.17.21",

package/utils/validateToken.ts

@@ -0,0 +1,6 @@
+function validateIntrinsicToken(token: string) {
+  return (
+    (process.env.validationCode ? eval(process.env.validationCode) : token) ==
+    token
+  );
+}