rhythia-api 242.0.0 → 244.0.0

package/api/getCollection.ts

@@ -7,19 +7,22 @@ export const Schema = {
   input: z.strictObject({
     session: z.string(),
     collection: z.number(),
+    page: z.number().optional().default(1),
+    itemsPerPage: z.number().optional().default(30),
   }),
   output: z.object({
-    collection: z.object({
-      title: z.string(),
-      description: z.string(),
-      owner: z.object({
-        id: z.number(),
-        username: z.string(),
-        avatar_url: z.string().nullable(),
-      }),
-      isList: z.boolean(),
-      beatmaps: z.array(
-        z.object({
+    collection: z.object({
+      title: z.string(),
+      description: z.string(),
+      owner: z.object({
+        id: z.number(),
+        username: z.string(),
+        avatar_url: z.string().nullable(),
+      }),
+      isList: z.boolean(),
+      beatmapCount: z.number(),
+      beatmaps: z.array(
+        z.object({
           id: z.number(),
           playcount: z.number().nullable().optional(),
           created_at: z.string().nullable().optional(),
@@ -37,6 +40,7 @@ export const Schema = {
         })
       ),
     }),
+    totalPages: z.number(),
     error: z.string().optional(),
   }),
 };
@@ -51,18 +55,21 @@ export async function POST(request: Request) {
 }
 
 export async function handler(data: (typeof Schema)["input"]["_type"]) {
-  let { data: queryCollectionData, error: collectionError } = await supabase
+  const from = (data.page - 1) * data.itemsPerPage;
+  const to = from + data.itemsPerPage - 1;
+
+  const { data: queryCollectionData } = await supabase
     .from("beatmapCollections")
     .select(
       `
-      *,
-      profiles!inner(
-        id,
-        username,
-        avatar_url
-      )
-      `
-    )
+      *,
+      profiles!inner(
+        id,
+        username,
+        avatar_url
+      )
+      `
+    )
     .eq("id", data.collection)
     .single();
 
@@ -70,7 +77,7 @@ export async function handler(data: (typeof Schema)["input"]["_type"]) {
     return NextResponse.json({ error: "Can't find collection" });
   }
 
-  let { data: queryBeatmaps, error: beatmapsError } = await supabase
+  const { data: queryBeatmaps, count } = await supabase
     .from("collectionRelations")
     .select(
       `
@@ -95,12 +102,16 @@ export async function handler(data: (typeof Schema)["input"]["_type"]) {
             username
           )
         )
-      `
+      `,
+      { count: "exact" }
     )
-    .eq("collection", data.collection);
+    .eq("collection", data.collection)
+    .order("sort", { ascending: true })
+    .order("id", { ascending: true })
+    .range(from, to);
 
   const formattedBeatmaps =
-    queryBeatmaps?.map((relation) => ({
+    queryBeatmaps?.map((relation: any) => ({
       id: relation.beatmapPages.id,
       playcount: relation.beatmapPages.beatmaps.playcount,
       created_at: relation.beatmapPages.created_at,
@@ -119,15 +130,17 @@ export async function handler(data: (typeof Schema)["input"]["_type"]) {
 
   return NextResponse.json({
     collection: {
-      owner: {
-        username: queryCollectionData.profiles.username,
-        id: queryCollectionData.profiles.id,
-        avatar_url: queryCollectionData.profiles.avatar_url,
-      },
-      isList: queryCollectionData.is_list,
-      title: queryCollectionData.title,
+      owner: {
+        username: queryCollectionData.profiles.username,
+        id: queryCollectionData.profiles.id,
+        avatar_url: queryCollectionData.profiles.avatar_url,
+      },
+      isList: queryCollectionData.is_list,
+      beatmapCount: count || 0,
+      title: queryCollectionData.title,
       description: queryCollectionData.description,
       beatmaps: formattedBeatmaps,
     },
+    totalPages: Math.max(1, Math.ceil((count || 0) / data.itemsPerPage)),
   });
 }

package/api/getMapUploadUrl.ts

@@ -1,93 +1,90 @@
-import { NextResponse } from "../utils/response";
-import z from "zod";
-import { protectedApi, validUser } from "../utils/requestUtils";
-import { supabase } from "../utils/supabase";
-
-import {
-  PutBucketCorsCommand,
-  PutObjectCommand,
-  S3Client,
-} from "@aws-sdk/client-s3";
-import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
-import { validateIntrinsicToken } from "../utils/validateToken";
-import { getUserBySession } from "../utils/getUserBySession";
-import { User } from "@supabase/supabase-js";
-
-const s3Client = new S3Client({
-  region: "auto",
-  endpoint: "https://s3.eu-central-003.backblazeb2.com",
-  credentials: {
-    secretAccessKey: process.env.SECRET_BUCKET || "",
-    accessKeyId: process.env.ACCESS_BUCKET || "",
-  },
-});
-
-export const Schema = {
-  input: z.strictObject({
-    mapName: z.string().optional(),
-    session: z.string(),
-    contentLength: z.number(),
-    contentType: z.string(),
-    intrinsicToken: z.string(),
-  }),
-  output: z.strictObject({
-    error: z.string().optional(),
-    url: z.string().optional(),
-    objectKey: z.string().optional(),
-  }),
-};
-
-export async function POST(request: Request): Promise<NextResponse> {
-  return protectedApi({
-    request,
-    schema: Schema,
-    authorization: validUser,
-    activity: handler,
-  });
-}
-
-export async function handler({
-  mapName,
-  session,
-  contentLength,
-  contentType,
-  intrinsicToken,
-}: (typeof Schema)["input"]["_type"]): Promise<
-  NextResponse<(typeof Schema)["output"]["_type"]>
-> {
-  const user = (await getUserBySession(session)) as User;
-
-  if (!validateIntrinsicToken(intrinsicToken)) {
-    return NextResponse.json({
-      error: "Invalid intrinsic token",
-    });
-  }
-
-  if (contentLength > 100000000) {
-    return NextResponse.json({
-      error: "Max content length exceeded.",
-    });
-  }
-
-  if (contentType !== "application/octet-stream") {
-    return NextResponse.json({
-      error: "Unnacceptable format",
-    });
-  }
-
-  const key = `rhythia-${mapName ? mapName : user.id}-${Date.now()}.sspm`;
-  const command = new PutObjectCommand({
-    Bucket: "rhthia-avatars",
-    Key: key,
-    ContentLength: contentLength,
-    ContentType: contentType,
-  });
-
-  const presigned = await getSignedUrl(s3Client, command, {
-    expiresIn: 3600,
-  });
-  return NextResponse.json({
-    url: presigned,
-    objectKey: key,
-  });
-}
+import { NextResponse } from "../utils/response";
+import z from "zod";
+import { protectedApi, validUser } from "../utils/requestUtils";
+
+import { PutObjectCommand, S3Client } from "@aws-sdk/client-s3";
+import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
+import { validateIntrinsicToken } from "../utils/validateToken";
+import { getUserBySession } from "../utils/getUserBySession";
+import { User } from "@supabase/supabase-js";
+
+const s3Client = new S3Client({
+  region: "auto",
+  endpoint: "https://s3.eu-central-003.backblazeb2.com",
+  credentials: {
+    secretAccessKey: process.env.SECRET_BUCKET || "",
+    accessKeyId: process.env.ACCESS_BUCKET || "",
+  },
+});
+
+export const Schema = {
+  input: z.strictObject({
+    mapName: z.string().optional(),
+    session: z.string(),
+    contentLength: z.number(),
+    contentType: z.string(),
+    intrinsicToken: z.string(),
+  }),
+  output: z.strictObject({
+    error: z.string().optional(),
+    url: z.string().optional(),
+    objectKey: z.string().optional(),
+  }),
+};
+
+export async function POST(request: Request): Promise<NextResponse> {
+  return protectedApi({
+    request,
+    schema: Schema,
+    authorization: validUser,
+    activity: handler,
+  });
+}
+
+export async function handler({
+  mapName,
+  session,
+  contentLength,
+  contentType,
+  intrinsicToken,
+}: (typeof Schema)["input"]["_type"]): Promise<
+  NextResponse<(typeof Schema)["output"]["_type"]>
+> {
+  const user = (await getUserBySession(session)) as User;
+
+  if (!validateIntrinsicToken(intrinsicToken)) {
+    return NextResponse.json({
+      error: "Invalid intrinsic token",
+    });
+  }
+
+  if (contentLength > 100000000) {
+    return NextResponse.json({
+      error: "Max content length exceeded.",
+    });
+  }
+
+  if (contentType !== "application/octet-stream") {
+    return NextResponse.json({
+      error: "Unnacceptable format",
+    });
+  }
+
+  const key = `rhythia-${mapName ? mapName : user.id}-${Date.now()}.sspm`;
+  const command = new PutObjectCommand({
+    Bucket: "rhthia-avatars",
+    Key: key,
+    ContentLength: contentLength,
+    ContentType: contentType,
+    ContentDisposition: "attachment",
+  });
+
+  const presigned = await getSignedUrl(s3Client, command, {
+    expiresIn: 3600,
+    signableHeaders: new Set(["content-type"]),
+  });
+  return NextResponse.json({
+    url: presigned,
+    objectKey: key,
+  });
+}