rhythia-api 116.0.0 → 118.0.0

package/api/createBeatmap.ts

@@ -40,9 +40,7 @@ export async function handler({
 }: (typeof Schema)["input"]["_type"]): Promise<
   NextResponse<(typeof Schema)["output"]["_type"]>
 > {
-  if (
-    !url.startsWith(`https://rhthia-avatars.s3.eu-central-003.backblazeb2.com/`)
-  )
+  if (!url.startsWith(`https://static.rhythia.com/`))
     return NextResponse.json({ error: "Invalid url" });
 
   const request = await fetch(url);
@@ -71,7 +69,7 @@ export async function handler({
     noteCount: parsedData.metadata.noteCount,
     length: parsedData.pointers.audioLength,
     beatmapFile: url,
-    image: `https://rhthia-avatars.s3.eu-central-003.backblazeb2.com/${imgkey}`,
+    image: `https://static.rhythia.com/${imgkey}`,
     starRating: rateMap(parsedData),
   });
 

package/api/getBeatmaps.ts

@@ -8,6 +8,9 @@ export const Schema = {
     session: z.string(),
     textFilter: z.string().optional(),
     page: z.number().default(1),
+    maxStars: z.number().optional(),
+    minStars: z.number().optional(),
+    status: z.string().optional(),
   }),
   output: z.object({
     error: z.string().optional(),
@@ -49,31 +52,25 @@ export async function POST(request: Request): Promise<NextResponse> {
 export async function handler(
   data: (typeof Schema)["input"]["_type"]
 ): Promise<NextResponse<(typeof Schema)["output"]["_type"]>> {
-  const result = await getBeatmaps(
-    data.page,
-    data.session,
-    data.textFilter || ""
-  );
+  const result = await getBeatmaps(data);
   return NextResponse.json(result);
 }
 
 const VIEW_PER_PAGE = 50;
 
-export async function getBeatmaps(page = 1, session: string, filter: string) {
-  const startPage = (page - 1) * VIEW_PER_PAGE;
+export async function getBeatmaps(data: (typeof Schema)["input"]["_type"]) {
+  const startPage = (data.page - 1) * VIEW_PER_PAGE;
   const endPage = startPage + VIEW_PER_PAGE - 1;
   const countQuery = await supabase
     .from("beatmapPages")
     .select("*", { count: "exact", head: true });
 
-  let queryData;
-  if (filter.length) {
-    let { data: data, error } = await supabase
-      .from("beatmapPages")
-      .select(
-        `
+  let qry = supabase
+    .from("beatmapPages")
+    .select(
+      `
         *,
-        beatmaps (
+        beatmaps!inner(
           created_at,
           playcount,
           length,
@@ -85,48 +82,35 @@ export async function getBeatmaps(page = 1, session: string, filter: string) {
           noteCount,
           title
         ),
-        profiles (
+        profiles!inner(
           username,
           avatar_url
         )`
-      )
-      .order("created_at", { ascending: false })
-      .textSearch("beatmaps.title", filter)
-      .range(startPage, endPage);
-    queryData = data;
-  } else {
-    let { data: data, error } = await supabase
-      .from("beatmapPages")
-      .select(
-        `
-      *,
-      beatmaps (
-        created_at,
-        playcount,
-        length,
-        ranked,
-        beatmapFile,
-        image,
-        starRating,
-        difficulty,
-        noteCount,
-        title
-      ),
-      profiles (
-        username,
-        avatar_url
-      )`
-      )
-      .order("created_at", { ascending: false })
-      .range(startPage, endPage);
-    queryData = data;
+    )
+    .order("created_at", { ascending: false });
+
+  if (data.textFilter) {
+    qry = qry.ilike("beatmaps.title", `%${data.textFilter}%`);
+  }
+
+  if (data.minStars) {
+    qry = qry.gt("beatmaps.starRating", data.minStars);
+  }
+
+  if (data.maxStars) {
+    qry = qry.lt("beatmaps.starRating", data.maxStars);
   }
+  if (data.status) {
+    qry = qry.eq("status", data.status);
+  }
+
+  let queryData = await qry.range(startPage, endPage);
 
   return {
     total: countQuery.count || 0,
     viewPerPage: VIEW_PER_PAGE,
-    currentPage: page,
-    beatmaps: queryData?.map((beatmapPage) => ({
+    currentPage: data.page,
+    beatmaps: queryData.data?.map((beatmapPage) => ({
       id: beatmapPage.id,
       playcount: beatmapPage.beatmaps?.playcount,
       created_at: beatmapPage.created_at,

package/api/getProfile.ts

@@ -16,6 +16,7 @@ export const Schema = {
       .object({
         about_me: z.string().nullable(),
         avatar_url: z.string().nullable(),
+        profile_image: z.string().nullable(),
         badges: z.any().nullable(),
         created_at: z.number().nullable(),
         flag: z.string().nullable(),

package/api/updateBeatmapPage.ts

@@ -43,7 +43,15 @@ export async function handler({
     .eq("id", id)
     .single();
 
+  let { data: beatmapData, error: bmPageError } = await supabase
+    .from("beatmaps")
+    .select("*")
+    .eq("beatmapHash", beatmapHash)
+    .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." });
 
@@ -52,6 +60,9 @@ export async function handler({
     .upsert({
       id,
       latestBeatmapHash: beatmapHash,
+      genre: "",
+      title: beatmapData.title,
+      status: "UNRANKED",
       owner: userData.id,
     })
     .select("*")

package/package.json

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

package/types/database.ts

@@ -12,21 +12,30 @@ export type Database = {
       beatmapPages: {
         Row: {
           created_at: string
+          genre: string | null
           id: number
           latestBeatmapHash: string | null
           owner: number | null
+          status: string | null
+          title: string | null
         }
         Insert: {
           created_at?: string
+          genre?: string | null
           id?: number
           latestBeatmapHash?: string | null
           owner?: number | null
+          status?: string | null
+          title?: string | null
         }
         Update: {
           created_at?: string
+          genre?: string | null
           id?: number
           latestBeatmapHash?: string | null
           owner?: number | null
+          status?: string | null
+          title?: string | null
         }
         Relationships: [
           {
@@ -54,7 +63,6 @@ export type Database = {
           image: string | null
           length: number | null
           noteCount: number | null
-          pageId: number | null
           playcount: number | null
           ranked: boolean | null
           starRating: number | null
@@ -68,7 +76,6 @@ export type Database = {
           image?: string | null
           length?: number | null
           noteCount?: number | null
-          pageId?: number | null
           playcount?: number | null
           ranked?: boolean | null
           starRating?: number | null
@@ -82,21 +89,12 @@ export type Database = {
           image?: string | null
           length?: number | null
           noteCount?: number | null
-          pageId?: number | null
           playcount?: number | null
           ranked?: boolean | null
           starRating?: number | null
           title?: string | null
         }
-        Relationships: [
-          {
-            foreignKeyName: "beatmaps_pageId_fkey"
-            columns: ["pageId"]
-            isOneToOne: false
-            referencedRelation: "beatmapPages"
-            referencedColumns: ["id"]
-          },
-        ]
+        Relationships: []
       }
       profiles: {
         Row: {
@@ -110,6 +108,7 @@ export type Database = {
           flag: string | null
           id: number
           play_count: number | null
+          profile_image: string | null
           skill_points: number | null
           squares_hit: number | null
           total_score: number | null
@@ -128,6 +127,7 @@ export type Database = {
           flag?: string | null
           id?: number
           play_count?: number | null
+          profile_image?: string | null
           skill_points?: number | null
           squares_hit?: number | null
           total_score?: number | null
@@ -146,6 +146,7 @@ export type Database = {
           flag?: string | null
           id?: number
           play_count?: number | null
+          profile_image?: string | null
           skill_points?: number | null
           squares_hit?: number | null
           total_score?: number | null