rhythia-api 102.0.0 → 103.0.0

package/api/editProfile.ts

@@ -79,7 +79,7 @@ export async function handler(
     .upsert(upsertPayload)
     .select();
 
-  if (upsertResult.status == 409) {
+  if (upsertResult.error) {
     return NextResponse.json(
       {
         error: "Can't update, username might be used by someone else!",

package/api/getAvatarUploadUrl.ts

@@ -0,0 +1,55 @@
+import { NextResponse } from "next/server";
+import z from "zod";
+import { protectedApi, validUser } from "../utils/requestUtils";
+import { supabase } from "../utils/supabase";
+
+import { PutObjectCommand, S3Client } from "@aws-sdk/client-s3";
+import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
+
+const s3Client = new S3Client({
+  region: "us-east-1",
+  credentials: {
+    secretAccessKey: "0036dd2cb06d730015861d27ce0796cccb5031123e",
+    accessKeyId: "c245e893e806",
+  },
+});
+
+export const Schema = {
+  input: z.strictObject({
+    session: z.string(),
+  }),
+  output: z.strictObject({
+    url: z.string(),
+  }),
+};
+
+export async function POST(request: Request): Promise<NextResponse> {
+  return protectedApi({
+    request,
+    schema: Schema,
+    authorization: validUser,
+    activity: handler,
+  });
+}
+
+export async function handler({
+  session,
+}: (typeof Schema)["input"]["_type"]): Promise<
+  NextResponse<(typeof Schema)["output"]["_type"]>
+> {
+  const user = (await supabase.auth.getUser(session)).data.user!;
+
+  const command = new PutObjectCommand({
+    Bucket: "rhythia-avatars",
+    Key: `user-avatar-${Date.now()}-${user.id}`,
+    ContentLength: 5000000,
+  });
+
+  const presigned = await getSignedUrl(s3Client, command, {
+    expiresIn: 3600,
+  });
+  return NextResponse.json({
+    url: presigned,
+    objectKey: `user-avatar-${Date.now()}-${user.id}`,
+  });
+}

package/api/getLeaderboard.ts

@@ -45,7 +45,7 @@ export async function handler(
   return NextResponse.json(result);
 }
 
-const VIEW_PER_PAGE = 100;
+const VIEW_PER_PAGE = 50;
 
 export async function getLeaderboard(page = 1, session: string) {
   const getUserData = await getUser({ session });

package/api/getScore.ts

@@ -18,7 +18,6 @@ export const Schema = {
         id: z.number(),
         misses: z.number().nullable(),
         passed: z.boolean().nullable(),
-        rank: z.string().nullable(),
         songId: z.string().nullable(),
         userId: z.number().nullable(),
         beatmapDifficulty: z.number().optional().nullable(),
@@ -72,7 +71,6 @@ export async function handler(
       awarded_sp: score.awarded_sp,
       beatmapHash: score.beatmapHash,
       misses: score.misses,
-      rank: score.rank,
       songId: score.songId,
       beatmapDifficulty: score.beatmaps?.difficulty,
       beatmapNotes: score.beatmaps?.noteCount,

package/api/getUserScores.ts

@@ -19,7 +19,6 @@ export const Schema = {
           id: z.number(),
           misses: z.number().nullable(),
           passed: z.boolean().nullable(),
-          rank: z.string().nullable(),
           songId: z.string().nullable(),
           userId: z.number().nullable(),
           beatmapDifficulty: z.number().optional().nullable(),
@@ -125,7 +124,6 @@ export async function handler(
       awarded_sp: s.awarded_sp,
       beatmapHash: s.beatmapHash,
       misses: s.misses,
-      rank: s.rank,
       songId: s.songId,
       beatmapDifficulty: s.beatmaps?.difficulty,
       beatmapNotes: s.beatmaps?.noteCount,

package/api/submitScore.ts

@@ -82,14 +82,12 @@ export async function handler({
   console.log("p1");
   await supabase.from("scores").upsert({
     beatmapHash: data.mapHash,
-    noteResults: [],
     replayHwid: data.relayHwid,
     songId: data.songId,
     userId: userData.id,
     passed: data.passed,
     misses: data.misses,
     awarded_sp: Math.round(data.sspp * 100) / 100,
-    rank: "A",
   });
   console.log("p2");
 

package/index.ts

@@ -5,6 +5,11 @@ import { Schema as EditProfile } from "./api/editProfile"
 export { Schema as SchemaEditProfile } from "./api/editProfile"
 export const editProfile = handleApi({url:"/api/editProfile",...EditProfile})
 
+// ./api/getAvatarUploadUrl.ts API
+import { Schema as GetAvatarUploadUrl } from "./api/getAvatarUploadUrl"
+export { Schema as SchemaGetAvatarUploadUrl } from "./api/getAvatarUploadUrl"
+export const getAvatarUploadUrl = handleApi({url:"/api/getAvatarUploadUrl",...GetAvatarUploadUrl})
+
 // ./api/getLeaderboard.ts API
 import { Schema as GetLeaderboard } from "./api/getLeaderboard"
 export { Schema as SchemaGetLeaderboard } from "./api/getLeaderboard"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rhythia-api",
-  "version": "102.0.0",
+  "version": "103.0.0",
   "main": "index.ts",
   "scripts": {
     "update": "bun ./scripts/update.ts",
@@ -12,6 +12,8 @@
   },
   "license": "MIT",
   "dependencies": {
+    "@aws-sdk/client-s3": "^3.637.0",
+    "@aws-sdk/s3-request-presigner": "^3.637.0",
     "@netlify/zip-it-and-ship-it": "^9.37.9",
     "@supabase/supabase-js": "^2.45.1",
     "@types/aws-lambda": "^8.10.143",

package/types/database.ts

@@ -108,12 +108,9 @@ export type Database = {
           created_at: string
           id: number
           misses: number | null
-          noteResults: Json | null
           passed: boolean | null
-          rank: string | null
           replayHwid: string | null
           songId: string | null
-          triggers: Json | null
           userId: number | null
         }
         Insert: {
@@ -122,12 +119,9 @@ export type Database = {
           created_at?: string
           id?: number
           misses?: number | null
-          noteResults?: Json | null
           passed?: boolean | null
-          rank?: string | null
           replayHwid?: string | null
           songId?: string | null
-          triggers?: Json | null
           userId?: number | null
         }
         Update: {
@@ -136,12 +130,9 @@ export type Database = {
           created_at?: string
           id?: number
           misses?: number | null
-          noteResults?: Json | null
           passed?: boolean | null
-          rank?: string | null
           replayHwid?: string | null
           songId?: string | null
-          triggers?: Json | null
           userId?: number | null
         }
         Relationships: [