rhythia-api 174.0.0 → 176.0.0

package/api/addCollectionMap.ts

@@ -0,0 +1,70 @@
+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";
+
+export const Schema = {
+  input: z.strictObject({
+    session: z.string(),
+    collection: z.number(),
+    beatmapPage: z.number(),
+  }),
+  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;
+  let { data: queryUserData, error: userError } = await supabase
+    .from("profiles")
+    .select("*")
+    .eq("uid", user.id)
+    .single();
+
+  if (!queryUserData) {
+    return NextResponse.json({ error: "Can't find user" });
+  }
+
+  let { data: queryCollectionData, error: collectionError } = await supabase
+    .from("beatmapCollections")
+    .select("*")
+    .eq("id", data.collection)
+    .single();
+
+  let { data: queryBeatmapData, error: beatmapData } = await supabase
+    .from("beatmapPages")
+    .select("*")
+    .eq("id", data.beatmapPage)
+    .single();
+
+  if (!queryCollectionData) {
+    return NextResponse.json({ error: "Can't find collection" });
+  }
+
+  if (!queryBeatmapData) {
+    return NextResponse.json({ error: "Can't find beatmap page" });
+  }
+
+  if (queryCollectionData.owner !== queryUserData.id) {
+    return NextResponse.json({ error: "You can't update foreign collections" });
+  }
+
+  await supabase.from("collectionRelations").insert({
+    collection: data.collection,
+    beatmapPage: data.beatmapPage,
+  });
+
+  return NextResponse.json({});
+}

package/api/createCollection.ts

@@ -0,0 +1,46 @@
+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";
+
+export const Schema = {
+  input: z.strictObject({
+    session: z.string(),
+    title: z.string(),
+  }),
+  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;
+  let { data: queryUserData, error: userError } = await supabase
+    .from("profiles")
+    .select("*")
+    .eq("uid", user.id)
+    .single();
+
+  if (!queryUserData) {
+    return NextResponse.json({ error: "Can't find user" });
+  }
+
+  await supabase.from("beatmapCollections").insert({
+    title: data.title,
+    description: "",
+    owner: queryUserData.id,
+  });
+
+  return NextResponse.json({});
+}

package/api/getCollection.ts

@@ -0,0 +1,112 @@
+import { NextResponse } from "next/server";
+import z from "zod";
+import { protectedApi } from "../utils/requestUtils";
+import { supabase } from "../utils/supabase";
+
+export const Schema = {
+  input: z.strictObject({
+    session: z.string(),
+    collection: z.number(),
+  }),
+  output: z.object({
+    collection: z.object({
+      title: z.string(),
+      description: z.string(),
+      beatmaps: z.array(
+        z.object({
+          id: z.number(),
+          playcount: z.number().nullable().optional(),
+          created_at: z.string().nullable().optional(),
+          difficulty: 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(),
+          status: z.string().nullable().optional(),
+          tags: z.string().nullable().optional(),
+        })
+      ),
+    }),
+    error: z.string().optional(),
+  }),
+};
+
+export async function POST(request: Request) {
+  return protectedApi({
+    request,
+    schema: Schema,
+    authorization: () => {},
+    activity: handler,
+  });
+}
+
+export async function handler(data: (typeof Schema)["input"]["_type"]) {
+  let { data: queryCollectionData, error: collectionError } = await supabase
+    .from("beatmapCollections")
+    .select("*")
+    .eq("id", data.collection)
+    .single();
+
+  if (!queryCollectionData) {
+    return NextResponse.json({ error: "Can't find collection" });
+  }
+
+  let { data: queryBeatmaps, error: beatmapsError } = await supabase
+    .from("collectionRelations")
+    .select(
+      `
+        *,
+        beatmapPages!inner(
+          owner,
+          created_at,
+          id,
+          status,
+          tags,
+          beatmaps!inner(
+            playcount,
+            ranked,
+            beatmapFile,
+            image,
+            starRating,
+            difficulty,
+            length,
+            title
+          ),
+          profiles!inner(
+            username
+          )
+        )
+      `
+    )
+    .eq("collection", data.collection);
+
+  const formattedBeatmaps =
+    queryBeatmaps?.map((relation) => ({
+      id: relation.beatmapPages.id,
+      playcount: relation.beatmapPages.beatmaps.playcount,
+      created_at: relation.beatmapPages.created_at,
+      difficulty: relation.beatmapPages.beatmaps.difficulty,
+      length: relation.beatmapPages.beatmaps.length,
+      title: relation.beatmapPages.beatmaps.title,
+      ranked: relation.beatmapPages.beatmaps.ranked,
+      beatmapFile: relation.beatmapPages.beatmaps.beatmapFile,
+      image: relation.beatmapPages.beatmaps.image,
+      starRating: relation.beatmapPages.beatmaps.starRating,
+      owner: relation.beatmapPages.owner,
+      ownerUsername: relation.beatmapPages.profiles.username,
+      status: relation.beatmapPages.status,
+      tags: relation.beatmapPages.tags,
+    })) || [];
+
+  return NextResponse.json({
+    collection: {
+      title: queryCollectionData.title,
+      description: queryCollectionData.description,
+      beatmaps: formattedBeatmaps,
+    },
+  });
+}

package/api/getCollections.ts

@@ -0,0 +1,101 @@
+import { NextResponse } from "next/server";
+import z from "zod";
+import { protectedApi } from "../utils/requestUtils";
+import { supabase } from "../utils/supabase";
+
+export const Schema = {
+  input: z.strictObject({
+    session: z.string(),
+    page: z.number().optional().default(1),
+    itemsPerPage: z.number().optional().default(10),
+  }),
+  output: z.object({
+    collections: z.array(
+      z.object({
+        id: z.number(),
+        title: z.string(),
+        description: z.string(),
+        beatmapCount: z.number(),
+        starRatingDistribution: z.array(
+          z.object({
+            stars: z.number(),
+            count: z.number(),
+          })
+        ),
+        createdAt: z.string(),
+      })
+    ),
+    totalPages: z.number(),
+    error: z.string().optional(),
+  }),
+};
+
+export async function POST(request: Request) {
+  return protectedApi({
+    request,
+    schema: Schema,
+    authorization: () => {},
+    activity: handler,
+  });
+}
+
+export async function handler(data: (typeof Schema)["input"]["_type"]) {
+  const { data: collections, error } = await supabase
+    .rpc("get_collections_v1", {
+      page_number: data.page,
+      items_per_page: data.itemsPerPage,
+    })
+    .returns<
+      {
+        id: number;
+        title: string;
+        description: string;
+        created_at: string;
+        beatmap_count: number;
+        star1: number;
+        star2: number;
+        star3: number;
+        star4: number;
+        star5: number;
+        star6: number;
+        star7: number;
+        star8: number;
+        star9: number;
+        star10: number;
+        total_pages: number;
+      }[]
+    >();
+
+  if (error) {
+    return NextResponse.json({ error: "Error fetching collections" });
+  }
+
+  // Get the total pages from the first row (all rows will have the same value)
+  const totalPages = collections?.[0]?.total_pages ?? 1;
+
+  const formattedCollections =
+    collections?.map((collection) => ({
+      id: collection.id,
+      title: collection.title,
+      description: collection.description,
+      beatmapCount: collection.beatmap_count,
+      starRatingDistribution: [
+        { stars: 1, count: collection.star1 },
+        { stars: 2, count: collection.star2 },
+        { stars: 3, count: collection.star3 },
+        { stars: 4, count: collection.star4 },
+        { stars: 5, count: collection.star5 },
+        { stars: 6, count: collection.star6 },
+        { stars: 7, count: collection.star7 },
+        { stars: 8, count: collection.star8 },
+        { stars: 9, count: collection.star9 },
+        { stars: 10, count: collection.star10 },
+      ],
+      createdAt: collection.created_at,
+    })) || [];
+
+  return NextResponse.json({
+    collections: formattedCollections,
+    totalPages,
+  });
+}

package/api/getRawStarRating.ts

@@ -1,7 +1,8 @@
 import { NextResponse } from "next/server";
 import z from "zod";
 import { protectedApi } from "../utils/requestUtils";
-import { calculatePerformancePoints, rateMapNotes } from "../utils/star-calc";
+import { rateMapNotes } from "../utils/star-calc";
+import { calculatePerformancePoints } from "./submitScore";
 
 export const Schema = {
   input: z.strictObject({

package/index.ts

@@ -1,5 +1,22 @@
 import { handleApi } from "./handleApi"
 
+// ./api/addCollectionMap.ts API
+
+/*
+export const Schema = {
+  input: z.strictObject({
+    session: z.string(),
+    collection: z.number(),
+    beatmapPage: z.number(),
+  }),
+  output: z.object({
+    error: z.string().optional(),
+  }),
+};*/
+import { Schema as AddCollectionMap } from "./api/addCollectionMap"
+export { Schema as SchemaAddCollectionMap } from "./api/addCollectionMap"
+export const addCollectionMap = handleApi({url:"/api/addCollectionMap",...AddCollectionMap})
+
 // ./api/approveMap.ts API
 
 /*
@@ -78,6 +95,22 @@ import { Schema as CreateClan } from "./api/createClan"
 export { Schema as SchemaCreateClan } from "./api/createClan"
 export const createClan = handleApi({url:"/api/createClan",...CreateClan})
 
+// ./api/createCollection.ts API
+
+/*
+export const Schema = {
+  input: z.strictObject({
+    session: z.string(),
+    title: z.string(),
+  }),
+  output: z.object({
+    error: z.string().optional(),
+  }),
+};*/
+import { Schema as CreateCollection } from "./api/createCollection"
+export { Schema as SchemaCreateCollection } from "./api/createCollection"
+export const createCollection = handleApi({url:"/api/createCollection",...CreateCollection})
+
 // ./api/deleteBeatmapPage.ts API
 
 /*
@@ -414,6 +447,77 @@ import { Schema as GetClan } from "./api/getClan"
 export { Schema as SchemaGetClan } from "./api/getClan"
 export const getClan = handleApi({url:"/api/getClan",...GetClan})
 
+// ./api/getCollection.ts API
+
+/*
+export const Schema = {
+  input: z.strictObject({
+    session: z.string(),
+    collection: z.number(),
+  }),
+  output: z.object({
+    collection: z.object({
+      title: z.string(),
+      description: z.string(),
+      beatmaps: z.array(
+        z.object({
+          id: z.number(),
+          playcount: z.number().nullable().optional(),
+          created_at: z.string().nullable().optional(),
+          difficulty: 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(),
+          status: z.string().nullable().optional(),
+          tags: z.string().nullable().optional(),
+        })
+      ),
+    }),
+    error: z.string().optional(),
+  }),
+};*/
+import { Schema as GetCollection } from "./api/getCollection"
+export { Schema as SchemaGetCollection } from "./api/getCollection"
+export const getCollection = handleApi({url:"/api/getCollection",...GetCollection})
+
+// ./api/getCollections.ts API
+
+/*
+export const Schema = {
+  input: z.strictObject({
+    session: z.string(),
+    page: z.number().optional().default(1),
+    itemsPerPage: z.number().optional().default(10),
+  }),
+  output: z.object({
+    collections: z.array(
+      z.object({
+        id: z.number(),
+        title: z.string(),
+        description: z.string(),
+        beatmapCount: z.number(),
+        starRatingDistribution: z.array(
+          z.object({
+            stars: z.number(),
+            count: z.number(),
+          })
+        ),
+        createdAt: z.string(),
+      })
+    ),
+    totalPages: z.number(),
+    error: z.string().optional(),
+  }),
+};*/
+import { Schema as GetCollections } from "./api/getCollections"
+export { Schema as SchemaGetCollections } from "./api/getCollections"
+export const getCollections = handleApi({url:"/api/getCollections",...GetCollections})
+
 // ./api/getLeaderboard.ts API
 
 /*

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rhythia-api",
-  "version": "174.0.0",
+  "version": "176.0.0",
   "main": "index.ts",
   "author": "online-contributors",
   "scripts": {

package/types/database.ts

@@ -9,6 +9,38 @@ export type Json =
 export type Database = {
   public: {
     Tables: {
+      beatmapCollections: {
+        Row: {
+          created_at: string
+          description: string
+          id: number
+          owner: number
+          title: string
+        }
+        Insert: {
+          created_at?: string
+          description: string
+          id?: number
+          owner: number
+          title: string
+        }
+        Update: {
+          created_at?: string
+          description?: string
+          id?: number
+          owner?: number
+          title?: string
+        }
+        Relationships: [
+          {
+            foreignKeyName: "beatmapCollections_owner_fkey"
+            columns: ["owner"]
+            isOneToOne: false
+            referencedRelation: "profiles"
+            referencedColumns: ["id"]
+          },
+        ]
+      }
       beatmapPageComments: {
         Row: {
           beatmapPage: number
@@ -215,6 +247,42 @@ export type Database = {
           },
         ]
       }
+      collectionRelations: {
+        Row: {
+          beatmapPage: number | null
+          collection: number
+          created_at: string
+          id: number
+        }
+        Insert: {
+          beatmapPage?: number | null
+          collection: number
+          created_at?: string
+          id?: number
+        }
+        Update: {
+          beatmapPage?: number | null
+          collection?: number
+          created_at?: string
+          id?: number
+        }
+        Relationships: [
+          {
+            foreignKeyName: "collectionRelations_beatmapPage_fkey"
+            columns: ["beatmapPage"]
+            isOneToOne: false
+            referencedRelation: "beatmapPages"
+            referencedColumns: ["id"]
+          },
+          {
+            foreignKeyName: "collectionRelations_collection_fkey"
+            columns: ["collection"]
+            isOneToOne: false
+            referencedRelation: "beatmapCollections"
+            referencedColumns: ["id"]
+          },
+        ]
+      }
       discordWebhooks: {
         Row: {
           id: number
@@ -437,7 +505,30 @@ export type Database = {
       [_ in never]: never
     }
     Functions: {
-      [_ in never]: never
+      get_collections_v1: {
+        Args: {
+          page_number?: number
+          items_per_page?: number
+        }
+        Returns: {
+          id: number
+          title: string
+          description: string
+          created_at: string
+          beatmap_count: number
+          star1: number
+          star2: number
+          star3: number
+          star4: number
+          star5: number
+          star6: number
+          star7: number
+          star8: number
+          star9: number
+          star10: number
+          total_pages: number
+        }[]
+      }
     }
     Enums: {
       banTypes: "cool" | "silenced" | "restricted" | "excluded"

package/utils/star-calc/index.ts

@@ -4,19 +4,6 @@ import { sampleMap } from "./osuUtils";
 import { SSPMParsedMap } from "./sspmParser";
 import { SSPMMap, V1SSPMParser } from "./sspmv1Parser";
 
-function easeInExpoDeq(x: number) {
-  return x === 0 ? 0 : Math.pow(2, 35 * x - 35);
-}
-
-export function calculatePerformancePoints(
-  starRating: number,
-  accuracy: number
-) {
-  return Math.round(
-    Math.pow((starRating * easeInExpoDeq(accuracy) * 100) / 2, 2) / 1000
-  );
-}
-
 export function rateMap(map: SSPMParsedMap) {
   let notes = map.markers
     .filter((marker) => marker.type === 0)