rhythia-api 234.0.0 → 236.0.0

package/api/getBeatmaps.ts

@@ -1,166 +1,197 @@
-import { NextResponse } from "../utils/response";
-import z from "zod";
-import { protectedApi } from "../utils/requestUtils";
-import { supabase } from "../utils/supabase";
-
-export const Schema = {
-  input: z.strictObject({
-    session: z.string(),
-    textFilter: z.string().optional(),
-    authorFilter: z.string().optional(),
-    tagsFilter: z.string().optional(),
-    page: z.number().default(1),
-    maxStars: z.number().optional(),
-    minLength: z.number().optional(),
-    maxLength: z.number().optional(),
-    minStars: z.number().optional(),
-    creator: z.number().optional(),
-    status: z.string().optional(),
-  }),
-  output: z.object({
-    error: z.string().optional(),
-    total: z.number(),
-    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(),
-          difficulty: z.number().nullable().optional(),
-          noteCount: z.number().nullable().optional(),
-          length: z.number().nullable().optional(),
-          title: z.string().nullable().optional(),
-          ranked: z.boolean().nullable().optional(),
-          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(),
-  }),
-};
-
-export async function POST(request: Request): Promise<NextResponse> {
-  return protectedApi({
-    request,
-    schema: Schema,
-    authorization: () => {},
-    activity: handler,
-  });
-}
-
-export async function handler(
-  data: (typeof Schema)["input"]["_type"]
-): Promise<NextResponse<(typeof Schema)["output"]["_type"]>> {
-  const result = await getBeatmaps(data);
-  return NextResponse.json(result);
-}
-
-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,
-          ranked,
-          beatmapFile,
-          image,
-          starRating,
-          difficulty,
-          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,
-    currentPage: data.page,
-    beatmaps: queryData.data?.map((beatmapPage) => ({
-      id: beatmapPage.id,
-      tags: beatmapPage.tags,
-      playcount: beatmapPage.beatmaps?.playcount,
-      created_at: beatmapPage.created_at,
-      difficulty: beatmapPage.beatmaps?.difficulty,
-      title: beatmapPage.beatmaps?.title,
-      ranked: beatmapPage.beatmaps?.ranked,
-      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,
-    })),
-  };
-}
+import { NextResponse } from "../utils/response";
+import z from "zod";
+import { protectedApi } from "../utils/requestUtils";
+import { supabase } from "../utils/supabase";
+
+export const Schema = {
+  input: z.strictObject({
+    session: z.string(),
+    textFilter: z.string().optional(),
+    authorFilter: z.string().optional(),
+    tagsFilter: z.string().optional(),
+    page: z.number().default(1),
+    maxStars: z.number().optional(),
+    minLength: z.number().optional(),
+    maxLength: z.number().optional(),
+    minStars: z.number().optional(),
+    creator: z.number().optional(),
+    status: z.string().optional(),
+  }),
+  output: z.object({
+    error: z.string().optional(),
+    total: z.number(),
+    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(),
+          difficulty: z.number().nullable().optional(),
+          noteCount: z.number().nullable().optional(),
+          length: z.number().nullable().optional(),
+          title: z.string().nullable().optional(),
+          ranked: z.boolean().nullable().optional(),
+          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(),
+          tags: z.string().nullable().optional(),
+          videoUrl: z.string().nullable().optional(),
+        })
+      )
+      .optional(),
+  }),
+};
+
+export async function POST(request: Request): Promise<NextResponse> {
+  return protectedApi({
+    request,
+    schema: Schema,
+    authorization: () => {},
+    activity: handler,
+  });
+}
+
+export async function handler(
+  data: (typeof Schema)["input"]["_type"]
+): Promise<NextResponse<(typeof Schema)["output"]["_type"]>> {
+  const result = await getBeatmaps(data);
+  return NextResponse.json(result);
+}
+
+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;
+  // status filter is a bit uncanny, we store qualified as a field, but it acts as a status in the UI.
+  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,
+          starRating,
+          difficulty,
+          length,
+          title
+        ),
+        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,
+      tags: beatmapPage.tags,
+      playcount: beatmapPage.beatmaps?.playcount,
+      created_at: beatmapPage.created_at,
+      difficulty: beatmapPage.beatmaps?.difficulty,
+      title: beatmapPage.beatmaps?.title,
+      ranked: beatmapPage.beatmaps?.ranked,
+      length: beatmapPage.beatmaps?.length,
+      beatmapFile: beatmapPage.beatmaps?.beatmapFile,
+      image: beatmapPage.beatmaps?.image,
+      starRating: beatmapPage.beatmaps?.starRating,
+      owner: beatmapPage.owner,
+      status: beatmapPage.status,
+      qualified: beatmapPage.qualified,
+      ownerUsername: beatmapPage.profiles?.username,
+      videoUrl: beatmapPage.video_url,
+    })),
+  };
+}

package/api/reportProfile.ts

@@ -0,0 +1,94 @@
+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";
+
+const MAX_DESCRIPTION_LENGTH = 1000;
+
+export const Schema = {
+  input: z.strictObject({
+    session: z.string(),
+    profileId: z.number(),
+    description: z.string(),
+  }),
+  output: z.strictObject({
+    error: z.string().optional(),
+    id: z.number().optional(),
+  }),
+};
+
+export async function POST(request: Request): Promise<NextResponse> {
+  return protectedApi({
+    request,
+    schema: Schema,
+    authorization: validUser,
+    activity: handler,
+  });
+}
+
+export async function handler({
+  session,
+  profileId,
+  description,
+}: (typeof Schema)["input"]["_type"]): Promise<
+  NextResponse<(typeof Schema)["output"]["_type"]>
+> {
+  const trimmedDescription = description.trim();
+
+  if (!trimmedDescription.length) {
+    return NextResponse.json({ error: "Report description is required." });
+  }
+
+  if (trimmedDescription.length > MAX_DESCRIPTION_LENGTH) {
+    return NextResponse.json({
+      error: `Report description exceeds ${MAX_DESCRIPTION_LENGTH} characters.`,
+    });
+  }
+
+  const user = (await getUserBySession(session)) as User;
+  const { data: reporterProfile } = await supabase
+    .from("profiles")
+    .select("id,ban")
+    .eq("uid", user.id)
+    .single();
+
+  if (!reporterProfile) {
+    return NextResponse.json({ error: "Can't find user" });
+  }
+
+  if (reporterProfile.ban !== "cool") {
+    return NextResponse.json({ error: "Error" });
+  }
+
+  if (reporterProfile.id === profileId) {
+    return NextResponse.json({ error: "You can't report yourself." });
+  }
+
+  const { data: reportedProfile } = await supabase
+    .from("profiles")
+    .select("id")
+    .eq("id", profileId)
+    .single();
+
+  if (!reportedProfile) {
+    return NextResponse.json({ error: "Player not found." });
+  }
+
+  const insertResult = await supabase
+    .from("profileReports")
+    .insert({
+      reporter: reporterProfile.id,
+      reported: reportedProfile.id,
+      description: trimmedDescription,
+    })
+    .select("id")
+    .single();
+
+  if (insertResult.error) {
+    return NextResponse.json({ error: insertResult.error.message });
+  }
+
+  return NextResponse.json({ id: insertResult.data?.id });
+}

package/index.ts

@@ -624,49 +624,50 @@ export const getBeatmapPageById = handleApi({url:"/api/getBeatmapPageById",...Ge
 // ./api/getBeatmaps.ts API
 
 /*
-export const Schema = {
-  input: z.strictObject({
-    session: z.string(),
-    textFilter: z.string().optional(),
-    authorFilter: z.string().optional(),
-    tagsFilter: z.string().optional(),
-    page: z.number().default(1),
-    maxStars: z.number().optional(),
-    minLength: z.number().optional(),
-    maxLength: z.number().optional(),
-    minStars: z.number().optional(),
-    creator: z.number().optional(),
-    status: z.string().optional(),
-  }),
-  output: z.object({
-    error: z.string().optional(),
-    total: z.number(),
-    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(),
-          difficulty: z.number().nullable().optional(),
-          noteCount: z.number().nullable().optional(),
-          length: z.number().nullable().optional(),
-          title: z.string().nullable().optional(),
-          ranked: z.boolean().nullable().optional(),
-          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(),
-  }),
+export const Schema = {
+  input: z.strictObject({
+    session: z.string(),
+    textFilter: z.string().optional(),
+    authorFilter: z.string().optional(),
+    tagsFilter: z.string().optional(),
+    page: z.number().default(1),
+    maxStars: z.number().optional(),
+    minLength: z.number().optional(),
+    maxLength: z.number().optional(),
+    minStars: z.number().optional(),
+    creator: z.number().optional(),
+    status: z.string().optional(),
+  }),
+  output: z.object({
+    error: z.string().optional(),
+    total: z.number(),
+    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(),
+          difficulty: z.number().nullable().optional(),
+          noteCount: z.number().nullable().optional(),
+          length: z.number().nullable().optional(),
+          title: z.string().nullable().optional(),
+          ranked: z.boolean().nullable().optional(),
+          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(),
+          tags: z.string().nullable().optional(),
+          videoUrl: z.string().nullable().optional(),
+        })
+      )
+      .optional(),
+  }),
 };*/
 import { Schema as GetBeatmaps } from "./api/getBeatmaps"
 export { Schema as SchemaGetBeatmaps } from "./api/getBeatmaps"
@@ -1347,6 +1348,24 @@ import { Schema as RankMapsArchive } from "./api/rankMapsArchive"
 export { Schema as SchemaRankMapsArchive } from "./api/rankMapsArchive"
 export const rankMapsArchive = handleApi({url:"/api/rankMapsArchive",...RankMapsArchive})
 
+// ./api/reportProfile.ts API
+
+/*
+export const Schema = {
+  input: z.strictObject({
+    session: z.string(),
+    profileId: z.number(),
+    description: z.string(),
+  }),
+  output: z.strictObject({
+    error: z.string().optional(),
+    id: z.number().optional(),
+  }),
+};*/
+import { Schema as ReportProfile } from "./api/reportProfile"
+export { Schema as SchemaReportProfile } from "./api/reportProfile"
+export const reportProfile = handleApi({url:"/api/reportProfile",...ReportProfile})
+
 // ./api/searchUsers.ts API
 
 /*

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rhythia-api",
-  "version": "234.0.0",
+  "version": "236.0.0",
   "main": "index.ts",
   "author": "online-contributors-cunev",
   "scripts": {
@@ -10,6 +10,7 @@
     "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",
+    "db:create-profile-reports": "node scripts/create-profile-reports-table.ts",
     "query-pull": "bun run scripts/pull-queries.ts",
     "query-push": "bun run scripts/deploy-queries.ts",
     "queries:pull": "bun run scripts/pull-queries.ts",

package/types/database.ts

@@ -519,6 +519,45 @@ export type Database = {
         }
         Relationships: []
       }
+      profileReports: {
+        Row: {
+          created_at: string
+          description: string
+          id: number
+          reported: number
+          reporter: number
+        }
+        Insert: {
+          created_at?: string
+          description: string
+          id?: number
+          reported: number
+          reporter: number
+        }
+        Update: {
+          created_at?: string
+          description?: string
+          id?: number
+          reported?: number
+          reporter?: number
+        }
+        Relationships: [
+          {
+            foreignKeyName: "profileReports_reported_fkey"
+            columns: ["reported"]
+            isOneToOne: false
+            referencedRelation: "profiles"
+            referencedColumns: ["id"]
+          },
+          {
+            foreignKeyName: "profileReports_reporter_fkey"
+            columns: ["reporter"]
+            isOneToOne: false
+            referencedRelation: "profiles"
+            referencedColumns: ["id"]
+          },
+        ]
+      }
       profiles: {
         Row: {
           about_me: string | null

package/worker.ts

@@ -46,6 +46,7 @@ import { POST as getVideoUploadUrl } from "./api/getVideoUploadUrl";
 import { POST as postBeatmapComment } from "./api/postBeatmapComment";
 import { POST as qualifyMap } from "./api/qualifyMap";
 import { POST as rankMapsArchive } from "./api/rankMapsArchive";
+import { POST as reportProfile } from "./api/reportProfile";
 import { POST as searchUsers } from "./api/searchUsers";
 import { POST as setPasskey } from "./api/setPasskey";
 import { POST as submitScore } from "./api/submitScore";
@@ -113,6 +114,7 @@ const apiRoutes: Record<string, RouteHandler> = {
   "/api/postBeatmapComment": postBeatmapComment,
   "/api/qualifyMap": qualifyMap,
   "/api/rankMapsArchive": rankMapsArchive,
+  "/api/reportProfile": reportProfile,
   "/api/searchUsers": searchUsers,
   "/api/setPasskey": setPasskey,
   "/api/submitScore": submitScore,