rhythia-api 231.0.0 → 234.0.0

package/api/updateBeatmapPage.ts

@@ -1,4 +1,4 @@
-import { NextResponse } from "next/server";
+import { NextResponse } from "../utils/response";
 import z from "zod";
 import { protectedApi, validUser } from "../utils/requestUtils";
 import { supabase } from "../utils/supabase";

package/api/vetoMap.ts

@@ -1,94 +1,101 @@
-import { NextResponse } from "next/server";
-import z from "zod";
-import { protectedApi, validUser } from "../utils/requestUtils";
-import { supabase } from "../utils/supabase";
-import { getUserBySession } from "../utils/getUserBySession";
-import { User } from "@supabase/supabase-js";
-
-const VETO_BADGES = ["Team Ranked"];
-
-export const Schema = {
-  input: z.strictObject({
-    session: z.string(),
-    mapId: z.number(),
-    reason: z.string().min(1).max(1000),
-  }),
-  output: z.object({
-    error: z.string().optional(),
-  }),
-};
-
-export async function POST(request: Request) {
-  return protectedApi({
-    request,
-    schema: Schema,
-    authorization: validUser,
-    activity: handler,
-  });
-}
-
-export async function handler(data: (typeof Schema)["input"]["_type"]) {
-  const user = (await getUserBySession(data.session)) as User;
-  const { data: queryUserData } = await supabase
-    .from("profiles")
-    .select("*")
-    .eq("uid", user.id)
-    .single();
-
-  if (!queryUserData) {
-    return NextResponse.json({ error: "Can't find user" });
-  }
-
-  const tags = (queryUserData?.badges || []) as string[];
-  const hasVetoAccess = VETO_BADGES.some((badge) => tags.includes(badge));
-
-  if (!hasVetoAccess) {
-    return NextResponse.json({ error: "Only management can veto maps!" });
-  }
-
-  const { data: mapData } = await supabase
-    .from("beatmapPages")
-    .select("id,qualified")
-    .eq("id", data.mapId)
-    .single();
-
-  if (!mapData) {
-    return NextResponse.json({ error: "Bad map" });
-  }
-
-  if (!mapData.qualified) {
-    return NextResponse.json({
-      error: "Only qualified maps can be vetoed",
-    });
-  }
-
-  const { data: vetoData, error: vetoError } = await supabase
-    .from("vetos")
-    .insert({
-      beatmapPage: data.mapId,
-      user: queryUserData.id,
-      veto_reason: data.reason,
-    })
-    .select("id")
-    .single();
-
-  if (vetoError) {
-    return NextResponse.json({ error: vetoError.message });
-  }
-
-  const { error: updateError } = await supabase.from("beatmapPages").upsert({
-    id: data.mapId,
-    qualified: false,
-    qualifiedAt: null,
-  });
-
-  if (updateError) {
-    if (vetoData?.id) {
-      await supabase.from("vetos").delete().eq("id", vetoData.id);
-    }
-
-    return NextResponse.json({ error: updateError.message });
-  }
-
-  return NextResponse.json({});
-}
+import { NextResponse } from "../utils/response";
+import z from "zod";
+import { protectedApi, validUser } from "../utils/requestUtils";
+import { supabase } from "../utils/supabase";
+import { getUserBySession } from "../utils/getUserBySession";
+import { User } from "@supabase/supabase-js";
+import { postMapLifecycleWebhook } from "../utils/mapLifecycleWebhook";
+
+const VETO_BADGES = ["Team Ranked"];
+
+export const Schema = {
+  input: z.strictObject({
+    session: z.string(),
+    mapId: z.number(),
+    reason: z.string().min(1).max(1000),
+  }),
+  output: z.object({
+    error: z.string().optional(),
+  }),
+};
+
+export async function POST(request: Request) {
+  return protectedApi({
+    request,
+    schema: Schema,
+    authorization: validUser,
+    activity: handler,
+  });
+}
+
+export async function handler(data: (typeof Schema)["input"]["_type"]) {
+  const user = (await getUserBySession(data.session)) as User;
+  const { data: queryUserData } = await supabase
+    .from("profiles")
+    .select("*")
+    .eq("uid", user.id)
+    .single();
+
+  if (!queryUserData) {
+    return NextResponse.json({ error: "Can't find user" });
+  }
+
+  const tags = (queryUserData?.badges || []) as string[];
+  const hasVetoAccess = VETO_BADGES.some((badge) => tags.includes(badge));
+
+  if (!hasVetoAccess) {
+    return NextResponse.json({ error: "Only management can veto maps!" });
+  }
+
+  const { data: mapData } = await supabase
+    .from("beatmapPages")
+    .select("id,qualified")
+    .eq("id", data.mapId)
+    .single();
+
+  if (!mapData) {
+    return NextResponse.json({ error: "Bad map" });
+  }
+
+  if (!mapData.qualified) {
+    return NextResponse.json({
+      error: "Only qualified maps can be vetoed",
+    });
+  }
+
+  const { data: vetoData, error: vetoError } = await supabase
+    .from("vetos")
+    .insert({
+      beatmapPage: data.mapId,
+      user: queryUserData.id,
+      veto_reason: data.reason,
+    })
+    .select("id")
+    .single();
+
+  if (vetoError) {
+    return NextResponse.json({ error: vetoError.message });
+  }
+
+  const { error: updateError } = await supabase.from("beatmapPages").upsert({
+    id: data.mapId,
+    qualified: false,
+    qualifiedAt: null,
+  });
+
+  if (updateError) {
+    if (vetoData?.id) {
+      await supabase.from("vetos").delete().eq("id", vetoData.id);
+    }
+
+    return NextResponse.json({ error: updateError.message });
+  }
+
+  await postMapLifecycleWebhook({
+    mapId: data.mapId,
+    event: "vetoed",
+    vetoReason: data.reason,
+  });
+
+  return NextResponse.json({});
+}

package/index.ts

@@ -47,14 +47,14 @@ export const chartPublicStats = handleApi({url:"/api/chartPublicStats",...ChartP
 // ./api/checkQualified.ts API
 
 /*
-export const Schema = {
-  input: z.strictObject({
-    secret: z.string(),
-  }),
-  output: z.object({
-    error: z.string().optional(),
-    updated: z.number(),
-  }),
+export const Schema = {
+  input: z.strictObject({
+    secret: z.string(),
+  }),
+  output: z.object({
+    error: z.string().optional(),
+    updated: z.number(),
+  }),
 };*/
 import { Schema as CheckQualified } from "./api/checkQualified"
 export { Schema as SchemaCheckQualified } from "./api/checkQualified"
@@ -63,7 +63,17 @@ export const checkQualified = handleApi({url:"/api/checkQualified",...CheckQuali
 // ./api/createBeatmap.ts API
 
 /*
-*/
+export const Schema = {
+  input: z.strictObject({
+    url: z.string(),
+    session: z.string(),
+    updateFlag: z.boolean().optional(),
+  }),
+  output: z.strictObject({
+    hash: z.string().optional(),
+    error: z.string().optional(),
+  }),
+};*/
 import { Schema as CreateBeatmap } from "./api/createBeatmap"
 export { Schema as SchemaCreateBeatmap } from "./api/createBeatmap"
 export const createBeatmap = handleApi({url:"/api/createBeatmap",...CreateBeatmap})
@@ -308,6 +318,47 @@ import { Schema as EditProfile } from "./api/editProfile"
 export { Schema as SchemaEditProfile } from "./api/editProfile"
 export const editProfile = handleApi({url:"/api/editProfile",...EditProfile})
 
+// ./api/enhancedSearch.ts API
+
+/*
+export const Schema = {
+  input: z.strictObject({
+    text: z.string().trim().min(1),
+    limit: z.number().int().min(1).max(25).default(10),
+  }),
+  output: z.object({
+    error: z.string().optional(),
+    users: z.array(
+      z.object({
+        id: z.number(),
+        username: z.string().nullable(),
+        avatar_url: z.string().nullable(),
+        about_me: z.string().nullable(),
+        flag: z.string().nullable(),
+      })
+    ),
+    beatmaps: z.array(
+      z.object({
+        id: z.number(),
+        mapId: z.string().nullable(),
+        title: z.string().nullable(),
+        description: z.string().nullable(),
+        image: z.string().nullable(),
+        starRating: z.number().nullable(),
+        length: z.number().nullable(),
+        status: z.string().nullable(),
+        tags: z.string().nullable(),
+        owner: z.number().nullable(),
+        ownerUsername: z.string().nullable(),
+        ownerAvatar: z.string().nullable(),
+      })
+    ),
+  }),
+};*/
+import { Schema as EnhancedSearch } from "./api/enhancedSearch"
+export { Schema as SchemaEnhancedSearch } from "./api/enhancedSearch"
+export const enhancedSearch = handleApi({url:"/api/enhancedSearch",...EnhancedSearch})
+
 // ./api/executeAdminOperation.ts API
 
 /*
@@ -469,30 +520,30 @@ export const Schema = {
         image: z.string().nullable().optional(),
         imageLarge: 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(),
-        qualified: z.boolean().nullable().optional(),
-        qualifiedAt: z.string().nullable().optional(),
-        description: z.string().nullable().optional(),
-        tags: z.string().nullable().optional(),
-        videoUrl: z.string().nullable().optional(),
-        vetos: z
-          .array(
-            z.object({
-              id: z.number(),
-              userId: z.number().nullable().optional(),
-              username: z.string().nullable().optional(),
-              avatar_url: z.string().nullable().optional(),
-              veto_reason: z.string().nullable().optional(),
-              created_at: z.string().nullable().optional(),
-            })
-          )
-          .optional(),
-      })
-      .optional(),
-  }),
+        owner: z.number().nullable().optional(),
+        ownerUsername: z.string().nullable().optional(),
+        ownerAvatar: z.string().nullable().optional(),
+        status: z.string().nullable().optional(),
+        qualified: z.boolean().nullable().optional(),
+        qualifiedAt: z.string().nullable().optional(),
+        description: z.string().nullable().optional(),
+        tags: z.string().nullable().optional(),
+        videoUrl: z.string().nullable().optional(),
+        vetos: z
+          .array(
+            z.object({
+              id: z.number(),
+              userId: z.number().nullable().optional(),
+              username: z.string().nullable().optional(),
+              avatar_url: z.string().nullable().optional(),
+              veto_reason: z.string().nullable().optional(),
+              created_at: z.string().nullable().optional(),
+            })
+          )
+          .optional(),
+      })
+      .optional(),
+  }),
 };*/
 import { Schema as GetBeatmapPage } from "./api/getBeatmapPage"
 export { Schema as SchemaGetBeatmapPage } from "./api/getBeatmapPage"
@@ -524,6 +575,7 @@ export const Schema = {
           userId: z.number().nullable(),
           username: z.string().nullable(),
           avatar_url: z.string().nullable(),
+          accuracy: z.number().nullable(),
         })
       )
       .optional(),
@@ -542,28 +594,28 @@ export const Schema = {
         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(),
-        qualified: z.boolean().nullable().optional(),
-        qualifiedAt: z.string().nullable().optional(),
-        videoUrl: z.string().nullable(),
-        vetos: z
-          .array(
-            z.object({
-              id: z.number(),
-              userId: z.number().nullable().optional(),
-              username: z.string().nullable().optional(),
-              avatar_url: z.string().nullable().optional(),
-              veto_reason: z.string().nullable().optional(),
-              created_at: z.string().nullable().optional(),
-            })
-          )
-          .optional(),
-      })
-      .optional(),
-  }),
+        owner: z.number().nullable().optional(),
+        ownerUsername: z.string().nullable().optional(),
+        ownerAvatar: z.string().nullable().optional(),
+        status: z.string().nullable().optional(),
+        qualified: z.boolean().nullable().optional(),
+        qualifiedAt: z.string().nullable().optional(),
+        videoUrl: z.string().nullable(),
+        vetos: z
+          .array(
+            z.object({
+              id: z.number(),
+              userId: z.number().nullable().optional(),
+              username: z.string().nullable().optional(),
+              avatar_url: z.string().nullable().optional(),
+              veto_reason: z.string().nullable().optional(),
+              created_at: z.string().nullable().optional(),
+            })
+          )
+          .optional(),
+      })
+      .optional(),
+  }),
 };*/
 import { Schema as GetBeatmapPageById } from "./api/getBeatmapPageById"
 export { Schema as SchemaGetBeatmapPageById } from "./api/getBeatmapPageById"
@@ -940,15 +992,16 @@ export const Schema = {
         verified: z.boolean().nullable(),
         verificationDeadline: z.number().nullable(),
         play_count: z.number().nullable(),
-        skill_points: z.number().nullable(),
-        squares_hit: z.number().nullable(),
-        total_score: z.number().nullable(),
-        position: z.number().nullable(),
-        activity_status: z.enum(["active", "inactive"]),
-        is_online: z.boolean(),
-        clans: z
-          .object({
-            id: z.number(),
+        skill_points: z.number().nullable(),
+        squares_hit: z.number().nullable(),
+        total_score: z.number().nullable(),
+        position: z.number().nullable(),
+        country_position: z.number().nullable(),
+        activity_status: z.enum(["active", "inactive"]),
+        is_online: z.boolean(),
+        clans: z
+          .object({
+            id: z.number(),
             acronym: z.string(),
           })
           .optional()
@@ -1144,12 +1197,12 @@ export const Schema = {
           awarded_sp: z.number().nullable(),
           beatmapHash: z.string().nullable(),
           created_at: z.string(),
-          id: z.number(),
-          misses: z.number().nullable(),
-          passed: z.boolean().nullable(),
-          replay_url: z.string().nullable().optional(),
-          songId: z.string().nullable(),
-          userId: z.number().nullable(),
+          id: z.number(),
+          misses: z.number().nullable(),
+          passed: z.boolean().nullable(),
+          replay_url: z.string().nullable().optional(),
+          songId: z.string().nullable(),
+          userId: z.number().nullable(),
           beatmapDifficulty: z.number().optional().nullable(),
           beatmapNotes: z.number().optional().nullable(),
           beatmapTitle: z.string().optional().nullable(),
@@ -1164,12 +1217,12 @@ export const Schema = {
           id: z.number(),
           awarded_sp: z.number().nullable(),
           created_at: z.string(),
-          misses: z.number().nullable(),
-          mods: z.record(z.unknown()),
-          passed: z.boolean().nullable(),
-          replay_url: z.string().nullable().optional(),
-          songId: z.string().nullable(),
-          speed: z.number().nullable(),
+          misses: z.number().nullable(),
+          mods: z.record(z.unknown()),
+          passed: z.boolean().nullable(),
+          replay_url: z.string().nullable().optional(),
+          songId: z.string().nullable(),
+          speed: z.number().nullable(),
           spin: z.boolean(),
           beatmapHash: z.string().nullable(),
           beatmapTitle: z.string().nullable(),
@@ -1184,12 +1237,12 @@ export const Schema = {
           awarded_sp: z.number().nullable(),
           beatmapHash: z.string().nullable(),
           created_at: z.string(),
-          id: z.number(),
-          misses: z.number().nullable(),
-          passed: z.boolean().nullable(),
-          replay_url: z.string().nullable().optional(),
-          rank: z.string().nullable(),
-          songId: z.string().nullable(),
+          id: z.number(),
+          misses: z.number().nullable(),
+          passed: z.boolean().nullable(),
+          replay_url: z.string().nullable().optional(),
+          rank: z.string().nullable(),
+          songId: z.string().nullable(),
           userId: z.number().nullable(),
           beatmapDifficulty: z.number().optional().nullable(),
           beatmapNotes: z.number().optional().nullable(),
@@ -1264,15 +1317,15 @@ export const postBeatmapComment = handleApi({url:"/api/postBeatmapComment",...Po
 // ./api/qualifyMap.ts API
 
 /*
-export const Schema = {
-  input: z.strictObject({
-    session: z.string(),
-    mapId: z.number(),
-  }),
-  output: z.object({
-    error: z.string().optional(),
-    qualifiedAt: z.string().optional(),
-  }),
+export const Schema = {
+  input: z.strictObject({
+    session: z.string(),
+    mapId: z.number(),
+  }),
+  output: z.object({
+    error: z.string().optional(),
+    qualifiedAt: z.string().optional(),
+  }),
 };*/
 import { Schema as QualifyMap } from "./api/qualifyMap"
 export { Schema as SchemaQualifyMap } from "./api/qualifyMap"
@@ -1367,26 +1420,26 @@ export const submitScore = handleApi({url:"/api/submitScore",...SubmitScore})
 // ./api/submitScoreInternal.ts API
 
 /*
-export const Schema = {
-  input: z.strictObject({
-    session: z.string(),
-    secret: z.string(),
-    token: z.string(),
-    data: z.strictObject({
-      onlineMapId: z.number(),
-      misses: z.number(),
-      hits: z.number(),
-      speed: z.number(),
-      mods: z.array(z.string()),
-      spin: z.boolean(),
-      replayBytes: z.string().nullable().optional(),
-      pauses: z.number().nullable().optional(),
-      failTime: z.number().nullable().optional(),
-    }),
-  }),
-  output: z.object({
-    error: z.string().optional(),
-  }),
+export const Schema = {
+  input: z.strictObject({
+    session: z.string(),
+    secret: z.string(),
+    token: z.string(),
+    data: z.strictObject({
+      onlineMapId: z.number(),
+      misses: z.number(),
+      hits: z.number(),
+      speed: z.number(),
+      mods: z.array(z.string()),
+      spin: z.boolean(),
+      replayBytes: z.string().nullable().optional(),
+      pauses: z.number().nullable().optional(),
+      failTime: z.number().nullable().optional(),
+    }),
+  }),
+  output: z.object({
+    error: z.string().optional(),
+  }),
 };*/
 import { Schema as SubmitScoreInternal } from "./api/submitScoreInternal"
 export { Schema as SchemaSubmitScoreInternal } from "./api/submitScoreInternal"
@@ -1415,15 +1468,15 @@ export const updateBeatmapPage = handleApi({url:"/api/updateBeatmapPage",...Upda
 // ./api/vetoMap.ts API
 
 /*
-export const Schema = {
-  input: z.strictObject({
-    session: z.string(),
-    mapId: z.number(),
-    reason: z.string().min(1).max(1000),
-  }),
-  output: z.object({
-    error: z.string().optional(),
-  }),
+export const Schema = {
+  input: z.strictObject({
+    session: z.string(),
+    mapId: z.number(),
+    reason: z.string().min(1).max(1000),
+  }),
+  output: z.object({
+    error: z.string().optional(),
+  }),
 };*/
 import { Schema as VetoMap } from "./api/vetoMap"
 export { Schema as SchemaVetoMap } from "./api/vetoMap"

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "rhythia-api",
-  "version": "231.0.0",
+  "version": "234.0.0",
   "main": "index.ts",
   "author": "online-contributors-cunev",
   "scripts": {
+    "dev": "wrangler dev",
+    "deploy": "wrangler deploy",
     "update": "bun ./scripts/update.ts",
-    "ci-deploy": "tsx ./scripts/ci-deploy.ts",
     "test": "tsx ./scripts/test.ts",
     "cache:clear-user-scores": "bun run scripts/clear-user-score-cache.ts",
     "db:optimize-user-scores": "bun run scripts/optimize-user-scores-indexes.ts",
@@ -13,28 +14,20 @@
     "query-push": "bun run scripts/deploy-queries.ts",
     "queries:pull": "bun run scripts/pull-queries.ts",
     "queries:deploy": "bun run scripts/deploy-queries.ts",
-    "sync": "npx supabase gen types typescript --project-id \"pfkajngbllcbdzoylrvp\" --schema public > types/database.ts",
-    "pipeline:build-api": "tsx ./scripts/build.ts",
-    "pipeline:deploy-testing": "tsx ./scripts/build.ts"
+    "sync": "npx supabase gen types typescript --project-id \"pfkajngbllcbdzoylrvp\" --schema public > types/database.ts"
   },
   "license": "MIT",
   "dependencies": {
     "@2toad/profanity": "^3.0.0",
     "@aws-sdk/client-s3": "^3.637.0",
-    "@aws-sdk/node-http-handler": "^3.374.0",
     "@aws-sdk/s3-request-presigner": "^3.637.0",
-    "@netlify/zip-it-and-ship-it": "^9.37.9",
     "@noble/ciphers": "^1.0.0",
     "@supabase/supabase-js": "^2.45.1",
-    "@types/aws-lambda": "^8.10.143",
     "@types/bun": "^1.1.6",
     "@types/lodash": "^4.17.7",
     "@types/node": "^22.2.0",
     "@types/pg": "^8.15.5",
     "@types/validator": "^13.12.2",
-    "@vercel/edge": "^1.1.2",
-    "@vercel/node": "^3.2.8",
-    "aws-lambda": "^1.0.7",
     "bad-words": "^4.0.0",
     "badwords-list": "^2.0.1-4",
     "bufferutil": "^4.0.8",
@@ -43,7 +36,6 @@
     "esbuild": "^0.23.0",
     "isomorphic-git": "^1.27.1",
     "lodash": "^4.17.21",
-    "next": "^14.2.5",
     "osu-classes": "^3.1.0",
     "osu-parsers": "^4.1.7",
     "osu-standard-stable": "^5.0.0",
@@ -61,5 +53,8 @@
     "zero-width": "^1.0.29",
     "zod": "^3.24.2"
   },
+  "devDependencies": {
+    "wrangler": "^4.12.0"
+  },
   "packageManager": "yarn@1.22.22"
 }