rhythia-api 101.0.0 → 103.0.0

package/api/editProfile.ts

@@ -3,7 +3,6 @@ import z from "zod";
 import { Database } from "../types/database";
 import { protectedApi, validUser } from "../utils/requestUtils";
 import { supabase } from "../utils/supabase";
-
 export const Schema = {
   input: z.strictObject({
     session: z.string(),
@@ -30,6 +29,24 @@ export async function POST(request: Request): Promise<NextResponse> {
 export async function handler(
   data: (typeof Schema)["input"]["_type"]
 ): Promise<NextResponse<(typeof Schema)["output"]["_type"]>> {
+  if (data.data.username !== undefined && data.data.username.length === 0) {
+    return NextResponse.json(
+      {
+        error: "Username can't be empty",
+      },
+      { status: 404 }
+    );
+  }
+
+  if (data.data.username && data.data.username.length > 20) {
+    return NextResponse.json(
+      {
+        error: "Username too long.",
+      },
+      { status: 404 }
+    );
+  }
+
   const user = (await supabase.auth.getUser(data.session)).data.user!;
   let userData: Database["public"]["Tables"]["profiles"]["Update"];
 
@@ -53,6 +70,7 @@ export async function handler(
 
   const upsertPayload: Database["public"]["Tables"]["profiles"]["Update"] = {
     id: userData.id,
+    computedUsername: data.data.username?.toLowerCase(),
     ...data.data,
   };
 
@@ -61,7 +79,7 @@ export async function handler(
     .upsert(upsertPayload)
     .select();
 
-  if (upsertResult.status == 409) {
+  if (upsertResult.error) {
     return NextResponse.json(
       {
         error: "Can't update, username might be used by someone else!",

package/api/getAvatarUploadUrl.ts

@@ -0,0 +1,55 @@
+import { NextResponse } from "next/server";
+import z from "zod";
+import { protectedApi, validUser } from "../utils/requestUtils";
+import { supabase } from "../utils/supabase";
+
+import { PutObjectCommand, S3Client } from "@aws-sdk/client-s3";
+import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
+
+const s3Client = new S3Client({
+  region: "us-east-1",
+  credentials: {
+    secretAccessKey: "0036dd2cb06d730015861d27ce0796cccb5031123e",
+    accessKeyId: "c245e893e806",
+  },
+});
+
+export const Schema = {
+  input: z.strictObject({
+    session: z.string(),
+  }),
+  output: z.strictObject({
+    url: z.string(),
+  }),
+};
+
+export async function POST(request: Request): Promise<NextResponse> {
+  return protectedApi({
+    request,
+    schema: Schema,
+    authorization: validUser,
+    activity: handler,
+  });
+}
+
+export async function handler({
+  session,
+}: (typeof Schema)["input"]["_type"]): Promise<
+  NextResponse<(typeof Schema)["output"]["_type"]>
+> {
+  const user = (await supabase.auth.getUser(session)).data.user!;
+
+  const command = new PutObjectCommand({
+    Bucket: "rhythia-avatars",
+    Key: `user-avatar-${Date.now()}-${user.id}`,
+    ContentLength: 5000000,
+  });
+
+  const presigned = await getSignedUrl(s3Client, command, {
+    expiresIn: 3600,
+  });
+  return NextResponse.json({
+    url: presigned,
+    objectKey: `user-avatar-${Date.now()}-${user.id}`,
+  });
+}

package/api/getLeaderboard.ts

@@ -45,7 +45,7 @@ export async function handler(
   return NextResponse.json(result);
 }
 
-const VIEW_PER_PAGE = 100;
+const VIEW_PER_PAGE = 50;
 
 export async function getLeaderboard(page = 1, session: string) {
   const getUserData = await getUser({ session });

package/api/getProfile.ts

@@ -2,7 +2,7 @@ import { geolocation } from "@vercel/edge";
 import { NextResponse } from "next/server";
 import z from "zod";
 import { Database } from "../types/database";
-import { protectedApi, validUser } from "../utils/requestUtils";
+import { protectedApi } from "../utils/requestUtils";
 import { supabase } from "../utils/supabase";
 
 export const Schema = {
@@ -77,7 +77,6 @@ export async function handler(
         .select("*")
         .eq("uid", user.id);
 
-      console.log(profiles, error);
       if (!queryData?.length) {
         const geo = geolocation(req);
         const data = await supabase
@@ -87,7 +86,13 @@ export async function handler(
             about_me: "",
             avatar_url: user.user_metadata.avatar_url,
             badges: ["Early Bird"],
-            username: user.user_metadata.full_name,
+            username: `${user.user_metadata.full_name.slice(0, 20)}${Math.round(
+              Math.random() * 900000 + 100000
+            )}`,
+            computedUsername: `${user.user_metadata.full_name.slice(
+              0,
+              20
+            )}${Math.round(Math.random() * 900000 + 100000)}`.toLowerCase(),
             flag: (geo.country || "US").toUpperCase(),
             created_at: Date.now(),
           })

package/api/getScore.ts

@@ -18,7 +18,6 @@ export const Schema = {
         id: z.number(),
         misses: z.number().nullable(),
         passed: z.boolean().nullable(),
-        rank: z.string().nullable(),
         songId: z.string().nullable(),
         userId: z.number().nullable(),
         beatmapDifficulty: z.number().optional().nullable(),
@@ -72,7 +71,6 @@ export async function handler(
       awarded_sp: score.awarded_sp,
       beatmapHash: score.beatmapHash,
       misses: score.misses,
-      rank: score.rank,
       songId: score.songId,
       beatmapDifficulty: score.beatmaps?.difficulty,
       beatmapNotes: score.beatmaps?.noteCount,

package/api/getUserScores.ts

@@ -19,7 +19,6 @@ export const Schema = {
           id: z.number(),
           misses: z.number().nullable(),
           passed: z.boolean().nullable(),
-          rank: z.string().nullable(),
           songId: z.string().nullable(),
           userId: z.number().nullable(),
           beatmapDifficulty: z.number().optional().nullable(),
@@ -94,8 +93,27 @@ export async function handler(
     .eq("userId", data.id)
     .neq("awarded_sp", 0)
     .eq("passed", true)
-    .order("awarded_sp", { ascending: false })
-    .limit(10);
+    .order("awarded_sp", { ascending: false });
+
+  if (scores2 == null) return NextResponse.json({ error: "No scores" });
+
+  let hashMap: Record<string, { awarded_sp: number; score: any }> = {};
+
+  for (const score of scores2) {
+    const { beatmapHash, awarded_sp } = score;
+
+    if (!beatmapHash || !awarded_sp) continue;
+
+    if (!hashMap[beatmapHash] || hashMap[beatmapHash].awarded_sp < awarded_sp) {
+      hashMap[beatmapHash] = { awarded_sp, score };
+    }
+  }
+
+  const values = Object.values(hashMap);
+  let vals = values
+    .sort((a, b) => b.awarded_sp - a.awarded_sp)
+    .slice(0, 10)
+    .map((e) => e.score);
 
   return NextResponse.json({
     lastDay: scores1?.map((s) => ({
@@ -106,13 +124,12 @@ export async function handler(
       awarded_sp: s.awarded_sp,
       beatmapHash: s.beatmapHash,
       misses: s.misses,
-      rank: s.rank,
       songId: s.songId,
       beatmapDifficulty: s.beatmaps?.difficulty,
       beatmapNotes: s.beatmaps?.noteCount,
       beatmapTitle: s.beatmaps?.title,
     })),
-    top: scores2?.map((s) => ({
+    top: vals?.map((s) => ({
       created_at: s.created_at,
       id: s.id,
       passed: s.passed,

package/api/submitScore.ts

@@ -10,13 +10,14 @@ export const Schema = {
       token: z.string(),
       relayHwid: z.string(),
       songId: z.string(),
-      noteResults: z.record(z.boolean()),
-      triggers: z.array(z.array(z.number())),
+      misses: z.number(),
+      squareHits: z.number(),
       mapHash: z.string(),
       mapTitle: z.string(),
       mapDifficulty: z.number(),
       mapNoteCount: z.number(),
       mapLength: z.number(),
+      passed: z.boolean(),
       sspp: z.number(),
     }),
   }),
@@ -69,8 +70,7 @@ export async function handler({
     newPlaycount = (beatmaps.playcount || 1) + 1;
   }
 
-  console.log(newPlaycount);
-  const p1 = await supabase.from("beatmaps").upsert({
+  await supabase.from("beatmaps").upsert({
     beatmapHash: data.mapHash,
     title: data.mapTitle,
     playcount: newPlaycount,
@@ -80,26 +80,57 @@ export async function handler({
   });
 
   console.log("p1");
-  const p2 = await supabase.from("scores").upsert({
+  await supabase.from("scores").upsert({
     beatmapHash: data.mapHash,
-    noteResults: data.noteResults,
     replayHwid: data.relayHwid,
     songId: data.songId,
-    triggers: data.triggers,
     userId: userData.id,
-    passed: data.mapNoteCount == Object.keys(data.noteResults).length,
-    misses: Object.values(data.noteResults).filter((e) => !e).length,
-    awarded_sp: data.sspp,
-    rank: "A",
+    passed: data.passed,
+    misses: data.misses,
+    awarded_sp: Math.round(data.sspp * 100) / 100,
   });
   console.log("p2");
 
-  const p3 = await supabase.from("profiles").upsert({
+  let totalSp = 0;
+  let { data: scores2, error: errorsp } = await supabase
+    .from("scores")
+    .select(`awarded_sp,beatmapHash`)
+    .eq("userId", userData.id)
+    .neq("awarded_sp", 0)
+    .eq("passed", true)
+    .order("awarded_sp", { ascending: false });
+
+  if (scores2 == null) return NextResponse.json({ error: "No scores" });
+
+  let hashMap: Record<string, number> = {};
+
+  for (const score of scores2) {
+    const { beatmapHash, awarded_sp } = score;
+
+    if (!beatmapHash || !awarded_sp) continue;
+
+    if (!hashMap[beatmapHash] || hashMap[beatmapHash] < awarded_sp) {
+      hashMap[beatmapHash] = awarded_sp;
+    }
+  }
+  let weight = 100;
+  const values = Object.values(hashMap);
+  values.sort((a, b) => b - a);
+
+  for (const score of values) {
+    totalSp += ((score || 0) * weight) / 100;
+    weight -= 1;
+
+    if (weight == 0) {
+      break;
+    }
+  }
+
+  await supabase.from("profiles").upsert({
     id: userData.id,
     play_count: (userData.play_count || 0) + 1,
-    squares_hit:
-      (userData.squares_hit || 0) +
-      Object.values(data.noteResults).filter((e) => e).length,
+    skill_points: Math.round(totalSp * 100) / 100,
+    squares_hit: (userData.squares_hit || 0) + data.squareHits,
   });
   console.log("p3");
 

package/index.ts

@@ -5,6 +5,11 @@ import { Schema as EditProfile } from "./api/editProfile"
 export { Schema as SchemaEditProfile } from "./api/editProfile"
 export const editProfile = handleApi({url:"/api/editProfile",...EditProfile})
 
+// ./api/getAvatarUploadUrl.ts API
+import { Schema as GetAvatarUploadUrl } from "./api/getAvatarUploadUrl"
+export { Schema as SchemaGetAvatarUploadUrl } from "./api/getAvatarUploadUrl"
+export const getAvatarUploadUrl = handleApi({url:"/api/getAvatarUploadUrl",...GetAvatarUploadUrl})
+
 // ./api/getLeaderboard.ts API
 import { Schema as GetLeaderboard } from "./api/getLeaderboard"
 export { Schema as SchemaGetLeaderboard } from "./api/getLeaderboard"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rhythia-api",
-  "version": "101.0.0",
+  "version": "103.0.0",
   "main": "index.ts",
   "scripts": {
     "update": "bun ./scripts/update.ts",
@@ -12,6 +12,8 @@
   },
   "license": "MIT",
   "dependencies": {
+    "@aws-sdk/client-s3": "^3.637.0",
+    "@aws-sdk/s3-request-presigner": "^3.637.0",
     "@netlify/zip-it-and-ship-it": "^9.37.9",
     "@supabase/supabase-js": "^2.45.1",
     "@types/aws-lambda": "^8.10.143",
@@ -21,6 +23,7 @@
     "@vercel/edge": "^1.1.2",
     "@vercel/node": "^3.2.8",
     "aws-lambda": "^1.0.7",
+    "badwords-list": "^2.0.1-4",
     "bufferutil": "^4.0.8",
     "bun": "^1.1.22",
     "esbuild": "^0.23.0",
@@ -28,7 +31,7 @@
     "lodash": "^4.17.21",
     "next": "^14.2.5",
     "simple-git": "^3.25.0",
-    "supabase": "^1.190.0",
+    "supabase": "^1.191.3",
     "tsx": "^4.17.0",
     "utf-8-validate": "^6.0.4",
     "zod": "^3.23.8"

package/types/database.ts

@@ -1,254 +1,251 @@
-export type Json =
-  | string
-  | number
-  | boolean
-  | null
-  | { [key: string]: Json | undefined }
-  | Json[]
-
-export type Database = {
-  public: {
-    Tables: {
-      beatmaps: {
-        Row: {
-          beatmapHash: string
-          created_at: string
-          difficulty: number | null
-          length: number | null
-          noteCount: number | null
-          playcount: number | null
-          title: string | null
-        }
-        Insert: {
-          beatmapHash: string
-          created_at?: string
-          difficulty?: number | null
-          length?: number | null
-          noteCount?: number | null
-          playcount?: number | null
-          title?: string | null
-        }
-        Update: {
-          beatmapHash?: string
-          created_at?: string
-          difficulty?: number | null
-          length?: number | null
-          noteCount?: number | null
-          playcount?: number | null
-          title?: string | null
-        }
-        Relationships: []
-      }
-      profiles: {
-        Row: {
-          about_me: string | null
-          avatar_url: string | null
-          badges: Json | null
-          created_at: number | null
-          flag: string | null
-          id: number
-          play_count: number | null
-          skill_points: number | null
-          squares_hit: number | null
-          total_score: number | null
-          uid: string | null
-          username: string | null
-          verified: boolean | null
-        }
-        Insert: {
-          about_me?: string | null
-          avatar_url?: string | null
-          badges?: Json | null
-          created_at?: number | null
-          flag?: string | null
-          id?: number
-          play_count?: number | null
-          skill_points?: number | null
-          squares_hit?: number | null
-          total_score?: number | null
-          uid?: string | null
-          username?: string | null
-          verified?: boolean | null
-        }
-        Update: {
-          about_me?: string | null
-          avatar_url?: string | null
-          badges?: Json | null
-          created_at?: number | null
-          flag?: string | null
-          id?: number
-          play_count?: number | null
-          skill_points?: number | null
-          squares_hit?: number | null
-          total_score?: number | null
-          uid?: string | null
-          username?: string | null
-          verified?: boolean | null
-        }
-        Relationships: [
-          {
-            foreignKeyName: "profiles_uid_fkey"
-            columns: ["uid"]
-            isOneToOne: true
-            referencedRelation: "users"
-            referencedColumns: ["id"]
-          },
-        ]
-      }
-      scores: {
-        Row: {
-          awarded_sp: number | null
-          beatmapHash: string | null
-          created_at: string
-          id: number
-          misses: number | null
-          noteResults: Json | null
-          passed: boolean | null
-          rank: string | null
-          replayHwid: string | null
-          songId: string | null
-          triggers: Json | null
-          userId: number | null
-        }
-        Insert: {
-          awarded_sp?: number | null
-          beatmapHash?: string | null
-          created_at?: string
-          id?: number
-          misses?: number | null
-          noteResults?: Json | null
-          passed?: boolean | null
-          rank?: string | null
-          replayHwid?: string | null
-          songId?: string | null
-          triggers?: Json | null
-          userId?: number | null
-        }
-        Update: {
-          awarded_sp?: number | null
-          beatmapHash?: string | null
-          created_at?: string
-          id?: number
-          misses?: number | null
-          noteResults?: Json | null
-          passed?: boolean | null
-          rank?: string | null
-          replayHwid?: string | null
-          songId?: string | null
-          triggers?: Json | null
-          userId?: number | null
-        }
-        Relationships: [
-          {
-            foreignKeyName: "scores_beatmapHash_fkey"
-            columns: ["beatmapHash"]
-            isOneToOne: false
-            referencedRelation: "beatmaps"
-            referencedColumns: ["beatmapHash"]
-          },
-          {
-            foreignKeyName: "scores_userId_fkey"
-            columns: ["userId"]
-            isOneToOne: false
-            referencedRelation: "profiles"
-            referencedColumns: ["id"]
-          },
-        ]
-      }
-    }
-    Views: {
-      [_ in never]: never
-    }
-    Functions: {
-      [_ in never]: never
-    }
-    Enums: {
-      [_ in never]: never
-    }
-    CompositeTypes: {
-      [_ in never]: never
-    }
-  }
-}
-
-type PublicSchema = Database[Extract<keyof Database, "public">]
-
-export type Tables<
-  PublicTableNameOrOptions extends
-    | keyof (PublicSchema["Tables"] & PublicSchema["Views"])
-    | { schema: keyof Database },
-  TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
-    ? keyof (Database[PublicTableNameOrOptions["schema"]]["Tables"] &
-        Database[PublicTableNameOrOptions["schema"]]["Views"])
-    : never = never,
-> = PublicTableNameOrOptions extends { schema: keyof Database }
-  ? (Database[PublicTableNameOrOptions["schema"]]["Tables"] &
-      Database[PublicTableNameOrOptions["schema"]]["Views"])[TableName] extends {
-      Row: infer R
-    }
-    ? R
-    : never
-  : PublicTableNameOrOptions extends keyof (PublicSchema["Tables"] &
-        PublicSchema["Views"])
-    ? (PublicSchema["Tables"] &
-        PublicSchema["Views"])[PublicTableNameOrOptions] extends {
-        Row: infer R
-      }
-      ? R
-      : never
-    : never
-
-export type TablesInsert<
-  PublicTableNameOrOptions extends
-    | keyof PublicSchema["Tables"]
-    | { schema: keyof Database },
-  TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
-    ? keyof Database[PublicTableNameOrOptions["schema"]]["Tables"]
-    : never = never,
-> = PublicTableNameOrOptions extends { schema: keyof Database }
-  ? Database[PublicTableNameOrOptions["schema"]]["Tables"][TableName] extends {
-      Insert: infer I
-    }
-    ? I
-    : never
-  : PublicTableNameOrOptions extends keyof PublicSchema["Tables"]
-    ? PublicSchema["Tables"][PublicTableNameOrOptions] extends {
-        Insert: infer I
-      }
-      ? I
-      : never
-    : never
-
-export type TablesUpdate<
-  PublicTableNameOrOptions extends
-    | keyof PublicSchema["Tables"]
-    | { schema: keyof Database },
-  TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
-    ? keyof Database[PublicTableNameOrOptions["schema"]]["Tables"]
-    : never = never,
-> = PublicTableNameOrOptions extends { schema: keyof Database }
-  ? Database[PublicTableNameOrOptions["schema"]]["Tables"][TableName] extends {
-      Update: infer U
-    }
-    ? U
-    : never
-  : PublicTableNameOrOptions extends keyof PublicSchema["Tables"]
-    ? PublicSchema["Tables"][PublicTableNameOrOptions] extends {
-        Update: infer U
-      }
-      ? U
-      : never
-    : never
-
-export type Enums<
-  PublicEnumNameOrOptions extends
-    | keyof PublicSchema["Enums"]
-    | { schema: keyof Database },
-  EnumName extends PublicEnumNameOrOptions extends { schema: keyof Database }
-    ? keyof Database[PublicEnumNameOrOptions["schema"]]["Enums"]
-    : never = never,
-> = PublicEnumNameOrOptions extends { schema: keyof Database }
-  ? Database[PublicEnumNameOrOptions["schema"]]["Enums"][EnumName]
-  : PublicEnumNameOrOptions extends keyof PublicSchema["Enums"]
-    ? PublicSchema["Enums"][PublicEnumNameOrOptions]
-    : never
+export type Json =
+  | string
+  | number
+  | boolean
+  | null
+  | { [key: string]: Json | undefined }
+  | Json[]
+
+export type Database = {
+  public: {
+    Tables: {
+      beatmaps: {
+        Row: {
+          beatmapHash: string
+          created_at: string
+          difficulty: number | null
+          length: number | null
+          noteCount: number | null
+          playcount: number | null
+          ranked: boolean | null
+          title: string | null
+        }
+        Insert: {
+          beatmapHash: string
+          created_at?: string
+          difficulty?: number | null
+          length?: number | null
+          noteCount?: number | null
+          playcount?: number | null
+          ranked?: boolean | null
+          title?: string | null
+        }
+        Update: {
+          beatmapHash?: string
+          created_at?: string
+          difficulty?: number | null
+          length?: number | null
+          noteCount?: number | null
+          playcount?: number | null
+          ranked?: boolean | null
+          title?: string | null
+        }
+        Relationships: []
+      }
+      profiles: {
+        Row: {
+          about_me: string | null
+          avatar_url: string | null
+          badges: Json | null
+          computedUsername: string | null
+          created_at: number | null
+          flag: string | null
+          id: number
+          play_count: number | null
+          skill_points: number | null
+          squares_hit: number | null
+          total_score: number | null
+          uid: string | null
+          username: string | null
+          verified: boolean | null
+        }
+        Insert: {
+          about_me?: string | null
+          avatar_url?: string | null
+          badges?: Json | null
+          computedUsername?: string | null
+          created_at?: number | null
+          flag?: string | null
+          id?: number
+          play_count?: number | null
+          skill_points?: number | null
+          squares_hit?: number | null
+          total_score?: number | null
+          uid?: string | null
+          username?: string | null
+          verified?: boolean | null
+        }
+        Update: {
+          about_me?: string | null
+          avatar_url?: string | null
+          badges?: Json | null
+          computedUsername?: string | null
+          created_at?: number | null
+          flag?: string | null
+          id?: number
+          play_count?: number | null
+          skill_points?: number | null
+          squares_hit?: number | null
+          total_score?: number | null
+          uid?: string | null
+          username?: string | null
+          verified?: boolean | null
+        }
+        Relationships: [
+          {
+            foreignKeyName: "profiles_uid_fkey"
+            columns: ["uid"]
+            isOneToOne: true
+            referencedRelation: "users"
+            referencedColumns: ["id"]
+          },
+        ]
+      }
+      scores: {
+        Row: {
+          awarded_sp: number | null
+          beatmapHash: string | null
+          created_at: string
+          id: number
+          misses: number | null
+          passed: boolean | null
+          replayHwid: string | null
+          songId: string | null
+          userId: number | null
+        }
+        Insert: {
+          awarded_sp?: number | null
+          beatmapHash?: string | null
+          created_at?: string
+          id?: number
+          misses?: number | null
+          passed?: boolean | null
+          replayHwid?: string | null
+          songId?: string | null
+          userId?: number | null
+        }
+        Update: {
+          awarded_sp?: number | null
+          beatmapHash?: string | null
+          created_at?: string
+          id?: number
+          misses?: number | null
+          passed?: boolean | null
+          replayHwid?: string | null
+          songId?: string | null
+          userId?: number | null
+        }
+        Relationships: [
+          {
+            foreignKeyName: "scores_beatmapHash_fkey"
+            columns: ["beatmapHash"]
+            isOneToOne: false
+            referencedRelation: "beatmaps"
+            referencedColumns: ["beatmapHash"]
+          },
+          {
+            foreignKeyName: "scores_userId_fkey"
+            columns: ["userId"]
+            isOneToOne: false
+            referencedRelation: "profiles"
+            referencedColumns: ["id"]
+          },
+        ]
+      }
+    }
+    Views: {
+      [_ in never]: never
+    }
+    Functions: {
+      [_ in never]: never
+    }
+    Enums: {
+      [_ in never]: never
+    }
+    CompositeTypes: {
+      [_ in never]: never
+    }
+  }
+}
+
+type PublicSchema = Database[Extract<keyof Database, "public">]
+
+export type Tables<
+  PublicTableNameOrOptions extends
+    | keyof (PublicSchema["Tables"] & PublicSchema["Views"])
+    | { schema: keyof Database },
+  TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
+    ? keyof (Database[PublicTableNameOrOptions["schema"]]["Tables"] &
+        Database[PublicTableNameOrOptions["schema"]]["Views"])
+    : never = never,
+> = PublicTableNameOrOptions extends { schema: keyof Database }
+  ? (Database[PublicTableNameOrOptions["schema"]]["Tables"] &
+      Database[PublicTableNameOrOptions["schema"]]["Views"])[TableName] extends {
+      Row: infer R
+    }
+    ? R
+    : never
+  : PublicTableNameOrOptions extends keyof (PublicSchema["Tables"] &
+        PublicSchema["Views"])
+    ? (PublicSchema["Tables"] &
+        PublicSchema["Views"])[PublicTableNameOrOptions] extends {
+        Row: infer R
+      }
+      ? R
+      : never
+    : never
+
+export type TablesInsert<
+  PublicTableNameOrOptions extends
+    | keyof PublicSchema["Tables"]
+    | { schema: keyof Database },
+  TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
+    ? keyof Database[PublicTableNameOrOptions["schema"]]["Tables"]
+    : never = never,
+> = PublicTableNameOrOptions extends { schema: keyof Database }
+  ? Database[PublicTableNameOrOptions["schema"]]["Tables"][TableName] extends {
+      Insert: infer I
+    }
+    ? I
+    : never
+  : PublicTableNameOrOptions extends keyof PublicSchema["Tables"]
+    ? PublicSchema["Tables"][PublicTableNameOrOptions] extends {
+        Insert: infer I
+      }
+      ? I
+      : never
+    : never
+
+export type TablesUpdate<
+  PublicTableNameOrOptions extends
+    | keyof PublicSchema["Tables"]
+    | { schema: keyof Database },
+  TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
+    ? keyof Database[PublicTableNameOrOptions["schema"]]["Tables"]
+    : never = never,
+> = PublicTableNameOrOptions extends { schema: keyof Database }
+  ? Database[PublicTableNameOrOptions["schema"]]["Tables"][TableName] extends {
+      Update: infer U
+    }
+    ? U
+    : never
+  : PublicTableNameOrOptions extends keyof PublicSchema["Tables"]
+    ? PublicSchema["Tables"][PublicTableNameOrOptions] extends {
+        Update: infer U
+      }
+      ? U
+      : never
+    : never
+
+export type Enums<
+  PublicEnumNameOrOptions extends
+    | keyof PublicSchema["Enums"]
+    | { schema: keyof Database },
+  EnumName extends PublicEnumNameOrOptions extends { schema: keyof Database }
+    ? keyof Database[PublicEnumNameOrOptions["schema"]]["Enums"]
+    : never = never,
+> = PublicEnumNameOrOptions extends { schema: keyof Database }
+  ? Database[PublicEnumNameOrOptions["schema"]]["Enums"][EnumName]
+  : PublicEnumNameOrOptions extends keyof PublicSchema["Enums"]
+    ? PublicSchema["Enums"][PublicEnumNameOrOptions]
+    : never