rhythia-api 170.0.0 → 172.0.0

package/api/createClan.ts

@@ -66,5 +66,16 @@ export async function handler(data: (typeof Schema)["input"]["_type"]) {
     acronym: data.acronym.toUpperCase(),
   });
 
+  let { data: queryClanData, error: clanError } = await supabase
+    .from("clans")
+    .select("*")
+    .eq("owner", queryUserData.id)
+    .single();
+
+  await supabase.from("profiles").upsert({
+    id: queryUserData.id,
+    clan: queryClanData?.id,
+  });
+
   return NextResponse.json({});
 }

package/api/getClan.ts

@@ -34,8 +34,6 @@ export const Schema = {
         skill_points: z.number().nullable(),
         squares_hit: z.number().nullable(),
         total_score: z.number().nullable(),
-        position: z.number().nullable(),
-        is_online: z.boolean(),
       })
     ),
   }),

package/api/getLeaderboard.ts

@@ -28,6 +28,13 @@ export const Schema = {
           skill_points: z.number().nullable(),
           spin_skill_points: z.number().nullable(),
           total_score: z.number().nullable(),
+          clans: z
+            .object({
+              id: z.number(),
+              acronym: z.string(),
+            })
+            .optional()
+            .nullable(),
         })
       )
       .optional(),
@@ -92,7 +99,10 @@ export async function getLeaderboard(
     .select("ban", { count: "exact", head: true })
     .neq("ban", "excluded");
 
-  let query = supabase.from("profiles").select("*").neq("ban", "excluded");
+  let query = supabase
+    .from("profiles")
+    .select("*,clans:clan(id, acronym)")
+    .neq("ban", "excluded");
 
   if (flag) {
     query.eq("flag", flag);
@@ -120,6 +130,7 @@ export async function getLeaderboard(
       spin_skill_points: user.spin_skill_points,
       total_score: user.total_score,
       username: user.username,
+      clans: user.clans as any,
     })),
   };
 }

package/api/getProfile.ts

@@ -33,6 +33,13 @@ export const Schema = {
         total_score: z.number().nullable(),
         position: z.number().nullable(),
         is_online: z.boolean(),
+        clans: z
+          .object({
+            id: z.number(),
+            acronym: z.string(),
+          })
+          .optional()
+          .nullable(),
       })
       .optional(),
   }),
@@ -57,7 +64,7 @@ export async function handler(
   if (data.id !== undefined && data.id !== null) {
     let { data: queryData, error } = await supabase
       .from("profiles")
-      .select("*")
+      .select(`*,clans:clan(id,acronym)`)
       .eq("id", data.id);
 
     console.log(profiles, error);
@@ -84,25 +91,23 @@ export async function handler(
 
       if (!queryData?.length) {
         const geo = geolocation(req);
-        const data = await supabase
-          .from("profiles")
-          .upsert({
-            uid: user.id,
-            about_me: "",
-            avatar_url:
-              "https://rhthia-avatars.s3.eu-central-003.backblazeb2.com/user-avatar-1725309193296-72002e6b-321c-4f60-a692-568e0e75147d",
-            badges: [],
-            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(),
-          })
-          .select();
+        const data = await supabase.from("profiles").upsert({
+          uid: user.id,
+          about_me: "",
+          avatar_url:
+            "https://rhthia-avatars.s3.eu-central-003.backblazeb2.com/user-avatar-1725309193296-72002e6b-321c-4f60-a692-568e0e75147d",
+          badges: [],
+          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(),
+        }).select(`
+          *,clans:clan(id,acronym)`);
 
         profiles = data.data!;
       } else {
@@ -127,7 +132,7 @@ export async function handler(
   // Query to count how many players have more skill points than the specific player
   const { count: playersWithMorePoints, error: rankError } = await supabase
     .from("profiles")
-    .select("*", { count: "exact", head: true })
+    .select(`*`, { count: "exact", head: true })
     .neq("ban", "excluded")
     .gt("skill_points", user.skill_points);
 

package/index.ts

@@ -395,8 +395,6 @@ export const Schema = {
         skill_points: z.number().nullable(),
         squares_hit: z.number().nullable(),
         total_score: z.number().nullable(),
-        position: z.number().nullable(),
-        is_online: z.boolean(),
       })
     ),
   }),
@@ -431,6 +429,13 @@ export const Schema = {
           skill_points: z.number().nullable(),
           spin_skill_points: z.number().nullable(),
           total_score: z.number().nullable(),
+          clans: z
+            .object({
+              id: z.number(),
+              acronym: z.string(),
+            })
+            .optional()
+            .nullable(),
         })
       )
       .optional(),
@@ -510,6 +515,13 @@ export const Schema = {
         total_score: z.number().nullable(),
         position: z.number().nullable(),
         is_online: z.boolean(),
+        clans: z
+          .object({
+            id: z.number(),
+            acronym: z.string(),
+          })
+          .optional()
+          .nullable(),
       })
       .optional(),
   }),

package/package.json

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

package/types/database.ts

@@ -156,6 +156,7 @@ export type Database = {
       clans: {
         Row: {
           acronym: string | null
+          allowed_users: Json
           avatar_url: string | null
           created_at: string
           description: string | null
@@ -165,6 +166,7 @@ export type Database = {
         }
         Insert: {
           acronym?: string | null
+          allowed_users?: Json
           avatar_url?: string | null
           created_at?: string
           description?: string | null
@@ -174,6 +176,7 @@ export type Database = {
         }
         Update: {
           acronym?: string | null
+          allowed_users?: Json
           avatar_url?: string | null
           created_at?: string
           description?: string | null