rhythia-api 116.0.0 → 117.0.0

package/api/getBeatmaps.ts

@@ -66,7 +66,34 @@ export async function getBeatmaps(page = 1, session: string, filter: string) {
     .from("beatmapPages")
     .select("*", { count: "exact", head: true });
 
-  let queryData;
+  let queryData = await getQuery(startPage, endPage, filter);
+
+  return {
+    total: countQuery.count || 0,
+    viewPerPage: VIEW_PER_PAGE,
+    currentPage: page,
+    beatmaps: queryData
+      ?.filter((e) => e.beatmaps)
+      .map((beatmapPage) => ({
+        id: beatmapPage.id,
+        playcount: beatmapPage.beatmaps?.playcount,
+        created_at: beatmapPage.created_at,
+        difficulty: beatmapPage.beatmaps?.difficulty,
+        noteCount: beatmapPage.beatmaps?.noteCount,
+        length: beatmapPage.beatmaps?.length,
+        title: beatmapPage.beatmaps?.title,
+        ranked: beatmapPage.beatmaps?.ranked,
+        beatmapFile: beatmapPage.beatmaps?.beatmapFile,
+        image: beatmapPage.beatmaps?.image,
+        starRating: beatmapPage.beatmaps?.starRating,
+        owner: beatmapPage.owner,
+        ownerUsername: beatmapPage.profiles?.username,
+        ownerAvatar: beatmapPage.profiles?.avatar_url,
+      })),
+  };
+}
+
+async function getQuery(startPage: number, endPage: number, filter: string) {
   if (filter.length) {
     let { data: data, error } = await supabase
       .from("beatmapPages")
@@ -91,9 +118,10 @@ export async function getBeatmaps(page = 1, session: string, filter: string) {
         )`
       )
       .order("created_at", { ascending: false })
-      .textSearch("beatmaps.title", filter)
+      .ilike("beatmaps.title", `%${filter}%`)
       .range(startPage, endPage);
-    queryData = data;
+
+    return data;
   } else {
     let { data: data, error } = await supabase
       .from("beatmapPages")
@@ -119,28 +147,6 @@ export async function getBeatmaps(page = 1, session: string, filter: string) {
       )
       .order("created_at", { ascending: false })
       .range(startPage, endPage);
-    queryData = data;
+    return data;
   }
-
-  return {
-    total: countQuery.count || 0,
-    viewPerPage: VIEW_PER_PAGE,
-    currentPage: page,
-    beatmaps: queryData?.map((beatmapPage) => ({
-      id: beatmapPage.id,
-      playcount: beatmapPage.beatmaps?.playcount,
-      created_at: beatmapPage.created_at,
-      difficulty: beatmapPage.beatmaps?.difficulty,
-      noteCount: beatmapPage.beatmaps?.noteCount,
-      length: beatmapPage.beatmaps?.length,
-      title: beatmapPage.beatmaps?.title,
-      ranked: beatmapPage.beatmaps?.ranked,
-      beatmapFile: beatmapPage.beatmaps?.beatmapFile,
-      image: beatmapPage.beatmaps?.image,
-      starRating: beatmapPage.beatmaps?.starRating,
-      owner: beatmapPage.owner,
-      ownerUsername: beatmapPage.profiles?.username,
-      ownerAvatar: beatmapPage.profiles?.avatar_url,
-    })),
-  };
 }

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rhythia-api",
-  "version": "116.0.0",
+  "version": "117.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