rhythia-api 233.0.0 → 235.0.0

package/api/getBeatmapPageById.ts

@@ -1,9 +1,8 @@
-import { NextResponse } from "next/server";
+import { NextResponse } from "../utils/response";
 import z from "zod";
 import { protectedApi } from "../utils/requestUtils";
-import { getCacheValue, setCacheValue } from "../utils/cache";
 import { supabase } from "../utils/supabase";
-import { getActiveProfileIdSet } from "../utils/activityStatus";
+import { getVisibleTopScoresForBeatmap } from "../utils/beatmapTopScores";
 
 export const Schema = {
   input: z.strictObject({
@@ -28,6 +27,7 @@ export const Schema = {
           userId: z.number().nullable(),
           username: z.string().nullable(),
           avatar_url: z.string().nullable(),
+          accuracy: z.number().nullable(),
         })
       )
       .optional(),
@@ -46,29 +46,29 @@ 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(),
+  }),
+};
 
 export async function POST(request: Request): Promise<NextResponse> {
   return protectedApi({
@@ -102,88 +102,49 @@ export async function handler(
         noteCount,
         title
       ),
-      profiles (
-        username,
-        avatar_url
-      ),
-      vetos (
-        id,
-        user,
-        veto_reason,
-        created_at,
-        profiles (
-          id,
-          username,
-          avatar_url
-        )
-      )
-    `
-    )
+      profiles (
+        username,
+        avatar_url
+      ),
+      vetos (
+        id,
+        user,
+        veto_reason,
+        created_at,
+        profiles (
+          id,
+          username,
+          avatar_url
+        )
+      )
+    `
+    )
     .eq("latestBeatmapHash", data.mapId)
     .single();
 
   if (!beatmapPage) return NextResponse.json({});
 
   const beatmapHash = beatmapPage?.latestBeatmapHash || "";
-  const isCacheable =
-    beatmapPage?.status === "RANKED" || beatmapPage?.status === "APPROVED";
-  const cacheKey = `beatmap-scores:${beatmapHash}`;
-
-  let scoreData: any[] | null = null;
-
-  if (isCacheable && beatmapHash) {
-    scoreData = await getCacheValue<any[]>(cacheKey);
-  }
-
-  if (!scoreData) {
-    const { data: rpcScores, error } = await supabase.rpc(
-      "get_top_scores_for_beatmap",
-      { beatmap_hash: beatmapHash }
-    );
-
-    if (error) {
-      return NextResponse.json({ error: JSON.stringify(error) });
-    }
-
-    scoreData = (rpcScores || []).slice(0, 200);
+  const { scores, error: scoreError } = await getVisibleTopScoresForBeatmap(
+    beatmapHash,
+    limit
+  );
 
-    if (isCacheable && beatmapHash) {
-      await setCacheValue(cacheKey, scoreData);
-    }
+  if (scoreError) {
+    return NextResponse.json({ error: scoreError });
   }
 
-  const userIds = Array.from(
-    new Set((scoreData || []).map((score) => score.userid).filter(Boolean))
-  );
-  const activeUserIds = await getActiveProfileIdSet(userIds);
-  const visibleScores = (scoreData || [])
-    .filter((score) => activeUserIds.has(score.userid))
-    .slice(0, limit);
+  const mappedVetos = ((beatmapPage as any).vetos || []).map((veto: any) => ({
+    id: veto.id,
+    userId: veto.user,
+    username: veto.profiles?.username,
+    avatar_url: veto.profiles?.avatar_url,
+    veto_reason: veto.veto_reason,
+    created_at: veto.created_at,
+  }));
 
-  const mappedVetos = ((beatmapPage as any).vetos || []).map((veto: any) => ({
-    id: veto.id,
-    userId: veto.user,
-    username: veto.profiles?.username,
-    avatar_url: veto.profiles?.avatar_url,
-    veto_reason: veto.veto_reason,
-    created_at: veto.created_at,
-  }));
-
-  return NextResponse.json({
-    scores: visibleScores.map((score: any) => ({
-      id: score.id,
-      awarded_sp: score.awarded_sp,
-      created_at: score.created_at,
-      misses: score.misses,
-      mods: score.mods,
-      passed: score.passed,
-      songId: score.songid,
-      speed: score.speed,
-      spin: score.spin,
-      userId: score.userid,
-      username: score.username,
-      avatar_url: score.avatar_url,
-    })),
+  return NextResponse.json({
+    scores,
     beatmap: {
       playcount: beatmapPage.beatmaps?.playcount,
       created_at: beatmapPage.created_at,
@@ -198,14 +159,14 @@ export async function handler(
       starRating: beatmapPage.beatmaps?.starRating,
       owner: beatmapPage.owner,
       ownerUsername: beatmapPage.profiles?.username,
-      ownerAvatar: beatmapPage.profiles?.avatar_url,
-      id: beatmapPage.id,
-      status: beatmapPage.status,
-      qualified: beatmapPage.qualified,
-      qualifiedAt: beatmapPage.qualifiedAt,
-      nominations: beatmapPage.nominations as number[],
-      videoUrl: beatmapPage.video_url,
-      vetos: mappedVetos.length > 0 ? mappedVetos : undefined,
-    },
-  });
-}
+      ownerAvatar: beatmapPage.profiles?.avatar_url,
+      id: beatmapPage.id,
+      status: beatmapPage.status,
+      qualified: beatmapPage.qualified,
+      qualifiedAt: beatmapPage.qualifiedAt,
+      nominations: beatmapPage.nominations as number[],
+      videoUrl: beatmapPage.video_url,
+      vetos: mappedVetos.length > 0 ? mappedVetos : undefined,
+    },
+  });
+}

package/api/getBeatmapStarRating.ts

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

package/api/getBeatmaps.ts

@@ -1,4 +1,4 @@
-import { NextResponse } from "next/server";
+import { NextResponse } from "../utils/response";
 import z from "zod";
 import { protectedApi } from "../utils/requestUtils";
 import { supabase } from "../utils/supabase";
@@ -23,11 +23,11 @@ export const Schema = {
     viewPerPage: z.number(),
     currentPage: z.number(),
     beatmaps: z
-      .array(
-        z.object({
-          id: z.number(),
-          playcount: z.number().nullable().optional(),
-          created_at: z.string().nullable().optional(),
+      .array(
+        z.object({
+          id: z.number(),
+          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(),
@@ -36,15 +36,16 @@ 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(),
-          tags: z.string().nullable().optional(),
-          videoUrl: z.string().nullable().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(),
+          tags: z.string().nullable().optional(),
+          videoUrl: z.string().nullable().optional(),
+        })
+      )
+      .optional(),
   }),
 };
 
@@ -66,24 +67,39 @@ export async function handler(
 
 const VIEW_PER_PAGE = 50;
 
-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("id", { count: "exact", head: true });
-
-  let qry = supabase.from("beatmapPages").select(
-    `
-        owner,
-        created_at,
-        id,
-        status,
-        tags,
-        ranked_at,
-        video_url,
-        beatmaps!inner(
-          playcount,
+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 statusFilter = data.status?.toUpperCase();
+  let countQry = supabase
+    .from("beatmapPages")
+    .select(
+      `
+        id,
+        beatmaps!inner(
+          title,
+          starRating,
+          length
+        ),
+        profiles!inner(
+          username
+        )
+      `,
+      { count: "exact", head: true }
+    );
+
+  let qry = supabase.from("beatmapPages").select(
+    `
+        owner,
+        created_at,
+        id,
+        status,
+        qualified,
+        tags,
+        ranked_at,
+        video_url,
+        beatmaps!inner(
+          playcount,
           ranked,
           beatmapFile,
           image,
@@ -92,58 +108,71 @@ export async function getBeatmaps(data: (typeof Schema)["input"]["_type"]) {
           length,
           title
         ),
-        profiles!inner(
-          username
-        )`
-  );
-
-  if (data.status == "RANKED") {
-    qry = qry.order("ranked_at", { ascending: false });
-  } else {
-    qry = qry.order("created_at", { ascending: false });
-  }
-
-  if (data.textFilter) {
-    qry = qry.ilike("beatmaps.title", `%${data.textFilter}%`);
-  }
-
-  if (data.authorFilter) {
-    qry = qry.ilike("profiles.username", `%${data.authorFilter}%`);
-  }
-
-  if (data.tagsFilter) {
-    qry = qry.ilike("tags", `%${data.tagsFilter}%`);
-  }
-
-  if (data.minStars) {
-    qry = qry.gt("beatmaps.starRating", data.minStars);
-  }
-
-  if (data.maxStars) {
-    qry = qry.lt("beatmaps.starRating", data.maxStars);
-  }
-
-  if (data.minLength) {
-    qry = qry.gt("beatmaps.length", data.minLength);
-  }
-
-  if (data.maxLength) {
-    qry = qry.lt("beatmaps.length", data.maxLength);
-  }
-
-  if (data.status) {
-    qry = qry.eq("status", data.status);
-  }
-
-  if (data.creator !== undefined) {
-    qry = qry.eq("owner", data.creator);
-  }
-
-  let queryData = await qry.range(startPage, endPage);
-
-  return {
-    total: countQuery.count || 0,
-    viewPerPage: VIEW_PER_PAGE,
+        profiles!inner(
+          username
+        )`
+  );
+
+  if (statusFilter === "RANKED") {
+    qry = qry.order("ranked_at", { ascending: false });
+  } else {
+    qry = qry.order("created_at", { ascending: false });
+  }
+
+  if (data.textFilter) {
+    qry = qry.ilike("beatmaps.title", `%${data.textFilter}%`);
+    countQry = countQry.ilike("beatmaps.title", `%${data.textFilter}%`);
+  }
+
+  if (data.authorFilter) {
+    qry = qry.ilike("profiles.username", `%${data.authorFilter}%`);
+    countQry = countQry.ilike("profiles.username", `%${data.authorFilter}%`);
+  }
+
+  if (data.tagsFilter) {
+    qry = qry.ilike("tags", `%${data.tagsFilter}%`);
+    countQry = countQry.ilike("tags", `%${data.tagsFilter}%`);
+  }
+
+  if (data.minStars) {
+    qry = qry.gt("beatmaps.starRating", data.minStars);
+    countQry = countQry.gt("beatmaps.starRating", data.minStars);
+  }
+
+  if (data.maxStars) {
+    qry = qry.lt("beatmaps.starRating", data.maxStars);
+    countQry = countQry.lt("beatmaps.starRating", data.maxStars);
+  }
+
+  if (data.minLength) {
+    qry = qry.gt("beatmaps.length", data.minLength);
+    countQry = countQry.gt("beatmaps.length", data.minLength);
+  }
+
+  if (data.maxLength) {
+    qry = qry.lt("beatmaps.length", data.maxLength);
+    countQry = countQry.lt("beatmaps.length", data.maxLength);
+  }
+
+  if (statusFilter === "QUALIFIED") {
+    qry = qry.eq("qualified", true);
+    countQry = countQry.eq("qualified", true);
+  } else if (data.status) {
+    qry = qry.eq("status", data.status);
+    countQry = countQry.eq("status", data.status);
+  }
+
+  if (data.creator !== undefined) {
+    qry = qry.eq("owner", data.creator);
+    countQry = countQry.eq("owner", data.creator);
+  }
+
+  const countQuery = await countQry;
+  let queryData = await qry.range(startPage, endPage);
+
+  return {
+    total: countQuery.count || 0,
+    viewPerPage: VIEW_PER_PAGE,
     currentPage: data.page,
     beatmaps: queryData.data?.map((beatmapPage) => ({
       id: beatmapPage.id,
@@ -156,11 +185,12 @@ export async function getBeatmaps(data: (typeof Schema)["input"]["_type"]) {
       length: beatmapPage.beatmaps?.length,
       beatmapFile: beatmapPage.beatmaps?.beatmapFile,
       image: beatmapPage.beatmaps?.image,
-      starRating: beatmapPage.beatmaps?.starRating,
-      owner: beatmapPage.owner,
-      status: beatmapPage.status,
-      ownerUsername: beatmapPage.profiles?.username,
-      videoUrl: beatmapPage.video_url,
-    })),
-  };
-}
+      starRating: beatmapPage.beatmaps?.starRating,
+      owner: beatmapPage.owner,
+      status: beatmapPage.status,
+      qualified: beatmapPage.qualified,
+      ownerUsername: beatmapPage.profiles?.username,
+      videoUrl: beatmapPage.video_url,
+    })),
+  };
+}

package/api/getClan.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/getClans.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/getCollection.ts

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

package/api/getCollections.ts

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

package/api/getInventory.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/getLeaderboard.ts

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

package/api/getMapUploadUrl.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";
@@ -63,7 +63,7 @@ export async function handler({
     });
   }
 
-  if (contentLength > 50000000) {
+  if (contentLength > 100000000) {
     return NextResponse.json({
       error: "Max content length exceeded.",
     });

package/api/getOnlinePlayers.ts

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

package/api/getPassToken.ts

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

package/api/getProfile.ts

@@ -1,5 +1,5 @@
-import { geolocation } from "@vercel/edge";
-import { NextResponse } from "next/server";
+import { geolocation } from "../utils/requestGeo";
+import { NextResponse } from "../utils/response";
 import z from "zod";
 import { Database } from "../types/database";
 import { protectedApi } from "../utils/requestUtils";
@@ -33,15 +33,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()
@@ -131,19 +132,37 @@ export async function handler(
   if (activityData && activityData.last_activity) {
     isOnline = Date.now() - activityData.last_activity < 1800000;
   }
-
-  let position: number | null = null;
-  if (activityStatus === "active") {
-    const cutoffIso = getScoreActivityCutoffIso();
-    const { count: playersWithMorePoints } = await supabase
-      .from("profiles")
-      .select("id,scores!inner(id)", { count: "exact", head: true })
-      .neq("ban", "excluded")
-      .gte("scores.created_at", cutoffIso)
-      .gt("skill_points", user.skill_points);
-
-    position = (playersWithMorePoints || 0) + 1;
-  }
+
+  let position: number | null = null;
+  let countryPosition: number | null = null;
+  if (activityStatus === "active") {
+    const cutoffIso = getScoreActivityCutoffIso();
+    const globalPositionQuery = supabase
+      .from("profiles")
+      .select("id,scores!inner(id)", { count: "exact", head: true })
+      .neq("ban", "excluded")
+      .gte("scores.created_at", cutoffIso)
+      .gt("skill_points", user.skill_points);
+
+    const countryPositionQuery = user.flag
+      ? supabase
+          .from("profiles")
+          .select("id,scores!inner(id)", { count: "exact", head: true })
+          .neq("ban", "excluded")
+          .eq("flag", user.flag)
+          .gte("scores.created_at", cutoffIso)
+          .gt("skill_points", user.skill_points)
+      : Promise.resolve({ count: null });
+
+    const [{ count: playersWithMorePoints }, { count: countryPlayersWithMorePoints }] =
+      await Promise.all([globalPositionQuery, countryPositionQuery]);
+
+    position = (playersWithMorePoints || 0) + 1;
+    countryPosition =
+      user.flag && countryPlayersWithMorePoints !== null
+        ? (countryPlayersWithMorePoints || 0) + 1
+        : null;
+  }
 
   if (user.verificationDeadline < Date.now()) {
     await supabase
@@ -157,10 +176,11 @@ export async function handler(
 
   return NextResponse.json({
     user: {
-      ...user,
-      position,
-      activity_status: activityStatus,
-      is_online: isOnline,
-    },
-  });
-}
+      ...user,
+      position,
+      country_position: countryPosition,
+      activity_status: activityStatus,
+      is_online: isOnline,
+    },
+  });
+}