rhythia-api 152.0.0 → 154.0.0

package/api/getPassToken.ts

@@ -3,7 +3,6 @@ import z from "zod";
 import { Database } from "../types/database";
 import { protectedApi, validUser } from "../utils/requestUtils";
 import { supabase } from "../utils/supabase";
-import md5 from "md5";
 import { encryptString } from "../utils/security";
 export const Schema = {
   input: z.strictObject({

package/api/getProfile.ts

@@ -4,6 +4,8 @@ import z from "zod";
 import { Database } from "../types/database";
 import { protectedApi } from "../utils/requestUtils";
 import { supabase } from "../utils/supabase";
+import { getUserBySession } from "../utils/getUserBySession";
+import { User } from "@supabase/supabase-js";
 
 export const Schema = {
   input: z.strictObject({
@@ -71,7 +73,7 @@ export async function handler(
     profiles = queryData;
   } else {
     // Fetch by session id
-    const user = (await supabase.auth.getUser(data.session)).data.user;
+    const user = (await getUserBySession(data.session)) as User;
 
     if (user) {
       let { data: queryData, error } = await supabase

package/api/getPublicStats.ts

@@ -9,6 +9,26 @@ export const Schema = {
     profiles: z.number(),
     beatmaps: z.number(),
     scores: z.number(),
+    lastBeatmaps: z.array(
+      z.object({
+        id: z.number().nullable().optional(),
+        nominations: z.array(z.number()).nullable().optional(),
+        playcount: z.number().nullable().optional(),
+        created_at: z.string().nullable().optional(),
+        difficulty: z.number().nullable().optional(),
+        noteCount: z.number().nullable().optional(),
+        length: z.number().nullable().optional(),
+        title: z.string().nullable().optional(),
+        ranked: z.boolean().nullable().optional(),
+        beatmapFile: z.string().nullable().optional(),
+        image: z.string().nullable().optional(),
+        starRating: z.number().nullable().optional(),
+        owner: z.number().nullable().optional(),
+        ownerUsername: z.string().nullable().optional(),
+        ownerAvatar: z.string().nullable().optional(),
+        status: z.string().nullable().optional(),
+      })
+    ),
   }),
 };
 
@@ -30,6 +50,33 @@ export async function handler(data: (typeof Schema)["input"]["_type"]) {
     .from("beatmaps")
     .select("*", { count: "exact", head: true });
 
+  let { data: beatmapPage, error: errorlast } = await supabase
+    .from("beatmapPages")
+    .select(
+      `
+      *,
+      beatmaps (
+        created_at,
+        playcount,
+        length,
+        ranked,
+        beatmapFile,
+        image,
+        starRating,
+        difficulty,
+        noteCount,
+        title
+      ),
+      profiles (
+        username,
+        avatar_url
+      )
+    `
+    )
+    .eq("status", "RANKED")
+    .order("created_at", { ascending: false })
+    .limit(4);
+
   const countScoresQuery = await supabase
     .from("scores")
     .select("*", { count: "exact", head: true });
@@ -38,5 +85,23 @@ export async function handler(data: (typeof Schema)["input"]["_type"]) {
     beatmaps: countBeatmapsQuery.count,
     profiles: countProfilesQuery.count,
     scores: countScoresQuery.count,
+    lastBeatmaps: beatmapPage?.map((e) => ({
+      playcount: e.beatmaps?.playcount,
+      created_at: e.created_at,
+      difficulty: e.beatmaps?.difficulty,
+      noteCount: e.beatmaps?.noteCount,
+      length: e.beatmaps?.length,
+      title: e.beatmaps?.title,
+      ranked: e.beatmaps?.ranked,
+      beatmapFile: e.beatmaps?.beatmapFile,
+      image: e.beatmaps?.image,
+      starRating: e.beatmaps?.starRating,
+      owner: e.owner,
+      ownerUsername: e.profiles?.username,
+      ownerAvatar: e.profiles?.avatar_url,
+      id: e.id,
+      status: e.status,
+      nominations: e.nominations as number[],
+    })),
   });
 }

package/api/setPasskey.ts

@@ -3,7 +3,6 @@ import z from "zod";
 import { Database } from "../types/database";
 import { protectedApi, validUser } from "../utils/requestUtils";
 import { supabase } from "../utils/supabase";
-import md5 from "md5";
 import { getUserBySession } from "../utils/getUserBySession";
 import { User } from "@supabase/supabase-js";
 export const Schema = {
@@ -53,7 +52,7 @@ export async function handler(
   await supabase.from("passkeys").upsert({
     id: userData.id!,
     email: user.email!,
-    passkey: md5(data.data.passkey),
+    passkey: data.data.passkey,
   });
 
   return NextResponse.json({});

package/api/submitScore.ts

@@ -17,7 +17,6 @@ export const Schema = {
       misses: z.number(),
       hits: z.number(),
       mapHash: z.string(),
-      mapNoteCount: z.number(),
       speed: z.number(),
     }),
   }),
@@ -26,8 +25,10 @@ export const Schema = {
   }),
 };
 
-function easeInExpoDeq(x: number) {
-  return x === 0 ? 0 : Math.pow(2, 50 * x - 50);
+function easeInExpoDeqHard(x: number, star: number) {
+  let exponent = 100 - 12 * star;
+  if (exponent < 5) exponent = 5;
+  return x === 0 ? 0 : Math.pow(2, exponent * x - exponent);
 }
 
 export function calculatePerformancePoints(
@@ -35,7 +36,10 @@ export function calculatePerformancePoints(
   accuracy: number
 ) {
   return Math.round(
-    Math.pow((starRating * easeInExpoDeq(accuracy) * 100) / 2, 2) / 1000
+    Math.pow(
+      (starRating * easeInExpoDeqHard(accuracy, starRating) * 100) / 2,
+      2
+    ) / 1000
   );
 }
 
@@ -62,7 +66,6 @@ export async function handler({
       misses: data.misses,
       hits: data.hits,
       mapHash: data.mapHash,
-      mapNoteCount: data.mapNoteCount,
       speed: data.speed,
     })
   ) {
@@ -121,7 +124,8 @@ export async function handler({
     );
   }
 
-  if (beatmaps.noteCount !== data.mapNoteCount) {
+  const noteCount = data.misses + data.hits;
+  if (noteCount !== beatmaps.noteCount) {
     return NextResponse.json(
       {
         error: "Wrong map",
@@ -142,7 +146,7 @@ export async function handler({
     passed = false;
   }
 
-  const accurracy = data.hits / beatmaps.noteCount;
+  const accurracy = data.hits / noteCount;
   let awarded_sp = 0;
 
   console.log(
@@ -203,9 +207,9 @@ export async function handler({
 
   for (const score of values) {
     totalSp += ((score || 0) * weight) / 100;
-    weight -= 1;
+    weight = weight * 0.97;
 
-    if (weight == 0) {
+    if (weight < 5) {
       break;
     }
   }

package/index.ts

@@ -418,6 +418,26 @@ export const Schema = {
     profiles: z.number(),
     beatmaps: z.number(),
     scores: z.number(),
+    lastBeatmaps: z.array(
+      z.object({
+        id: z.number().nullable().optional(),
+        nominations: z.array(z.number()).nullable().optional(),
+        playcount: z.number().nullable().optional(),
+        created_at: z.string().nullable().optional(),
+        difficulty: z.number().nullable().optional(),
+        noteCount: z.number().nullable().optional(),
+        length: z.number().nullable().optional(),
+        title: z.string().nullable().optional(),
+        ranked: z.boolean().nullable().optional(),
+        beatmapFile: z.string().nullable().optional(),
+        image: z.string().nullable().optional(),
+        starRating: z.number().nullable().optional(),
+        owner: z.number().nullable().optional(),
+        ownerUsername: z.string().nullable().optional(),
+        ownerAvatar: z.string().nullable().optional(),
+        status: z.string().nullable().optional(),
+      })
+    ),
   }),
 };*/
 import { Schema as GetPublicStats } from "./api/getPublicStats"
@@ -613,7 +633,6 @@ export const Schema = {
       misses: z.number(),
       hits: z.number(),
       mapHash: z.string(),
-      mapNoteCount: z.number(),
       speed: z.number(),
     }),
   }),

package/package.json

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

package/utils/getUserBySession.ts

@@ -10,6 +10,7 @@ export async function getUserBySession(session: string): Promise<User | null> {
   }
 
   try {
+    console.log("trying legacy token");
     const decryptedToken = JSON.parse(decryptString(session)) as {
       userId: number;
       email: string;
@@ -17,14 +18,24 @@ export async function getUserBySession(session: string): Promise<User | null> {
       computerName: string;
     };
 
+    for (const key of Object.keys(decryptedToken)) {
+      if (decryptedToken[key] === undefined || decryptedToken[key] === null) {
+        return null;
+      }
+    }
+
+    console.log(decryptedToken);
+
     let { data: queryPasskey, error } = await supabase
       .from("passkeys")
       .select("*,profiles(uid)")
-      .eq("id", decryptedToken.userId || "nil")
-      .eq("email", decryptedToken.email || "nil")
-      .eq("passkey", decryptedToken.passKey || "nil")
+      .eq("id", decryptedToken.userId)
+      .eq("email", decryptedToken.email)
+      .eq("passkey", decryptedToken.passKey)
       .single();
 
+    console.log(queryPasskey);
+
     if (!queryPasskey) {
       return null;
     }