rhythia-api 240.0.0 → 242.0.0

package/api/getProfile.ts

@@ -1,16 +1,18 @@
-import { geolocation } from "../utils/requestGeo";
-import { NextResponse } from "../utils/response";
-import z from "zod";
-import { Database } from "../types/database";
-import { protectedApi } from "../utils/requestUtils";
-import { supabase } from "../utils/supabase";
-import { getUserBySession } from "../utils/getUserBySession";
+import { geolocation } from "../utils/requestGeo";
+import { NextResponse } from "../utils/response";
+import z from "zod";
+import { Database } from "../types/database";
+import { protectedApi } from "../utils/requestUtils";
+import { supabase } from "../utils/supabase";
+import { getUserBySession } from "../utils/getUserBySession";
 import { User } from "@supabase/supabase-js";
 import {
   getActivityStatusForUserId,
   getScoreActivityCutoffIso,
 } from "../utils/activityStatus";
 
+const friendStateSchema = z.enum(["none", "added", "mutual"]);
+
 function getNextUsernameChangeAt(
   lastChangedAt: string | null | undefined
 ): string | null {
@@ -23,28 +25,73 @@ function getNextUsernameChangeAt(
   return nextAllowedAt.toISOString();
 }
 
+async function getViewerProfileId(session: string) {
+  if (!session) {
+    return null;
+  }
+
+  const viewer = await getUserBySession(session);
+
+  if (!viewer) {
+    return null;
+  }
+
+  const { data: viewerProfile } = await supabase
+    .from("profiles")
+    .select("id")
+    .eq("uid", viewer.id)
+    .single();
+
+  return viewerProfile?.id ?? null;
+}
+
+async function getFriendState(viewerProfileId: number | null, profileId: number) {
+  if (viewerProfileId === null || viewerProfileId === profileId) {
+    return "none" as const;
+  }
+
+  const [{ count: addedCount }, { count: mutualCount }] = await Promise.all([
+    supabase
+      .from("profileFriends")
+      .select("*", { count: "exact", head: true })
+      .eq("profile_id", viewerProfileId)
+      .eq("friend_id", profileId),
+    supabase
+      .from("profileFriends")
+      .select("*", { count: "exact", head: true })
+      .eq("profile_id", profileId)
+      .eq("friend_id", viewerProfileId),
+  ]);
+
+  if (!addedCount) {
+    return "none" as const;
+  }
+
+  return mutualCount ? ("mutual" as const) : ("added" as const);
+}
+
 export const Schema = {
   input: z.strictObject({
-    session: z.string(),
-    id: z.number().nullable().optional(),
-  }),
-  output: z.object({
-    error: z.string().optional(),
-    user: z
-      .object({
-        about_me: z.string().nullable(),
-        avatar_url: z.string().nullable(),
-        profile_image: z.string().nullable(),
-        badges: z.any().nullable(),
-        created_at: z.number().nullable(),
-        flag: z.string().nullable(),
-        id: z.number(),
-        uid: z.string().nullable(),
-        ban: z.string().nullable(),
-        username: z.string().nullable(),
-        verified: z.boolean().nullable(),
-        verificationDeadline: z.number().nullable(),
-        play_count: z.number().nullable(),
+    session: z.string(),
+    id: z.number().nullable().optional(),
+  }),
+  output: z.object({
+    error: z.string().optional(),
+    user: z
+      .object({
+        about_me: z.string().nullable(),
+        avatar_url: z.string().nullable(),
+        profile_image: z.string().nullable(),
+        badges: z.any().nullable(),
+        created_at: z.number().nullable(),
+        flag: z.string().nullable(),
+        id: z.number(),
+        uid: z.string().nullable(),
+        ban: z.string().nullable(),
+        username: z.string().nullable(),
+        verified: z.boolean().nullable(),
+        verificationDeadline: z.number().nullable(),
+        play_count: z.number().nullable(),
         skill_points: z.number().nullable(),
         squares_hit: z.number().nullable(),
         total_score: z.number().nullable(),
@@ -53,6 +100,8 @@ export const Schema = {
         activity_status: z.enum(["active", "inactive"]),
         is_online: z.boolean(),
         last_active_timestamp: z.number().nullable(),
+        friend_count: z.number(),
+        friend_state: friendStateSchema,
         can_change_flag: z.boolean(),
         next_username_change_at: z.string().nullable(),
         previous_usernames: z.array(
@@ -66,105 +115,122 @@ export const Schema = {
             id: z.number(),
             acronym: z.string(),
           })
-          .optional()
-          .nullable(),
-      })
-      .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"],
-  req: Request
-): Promise<NextResponse<(typeof Schema)["output"]["_type"]>> {
-  let profiles: Database["public"]["Tables"]["profiles"]["Row"][] = [];
-  let isOnline = false;
-  // Fetch by id
-  if (data.id !== undefined && data.id !== null) {
-    let { data: queryData, error } = await supabase
-      .from("profiles")
-      .select(`*,clans:clan(id,acronym)`)
-      .eq("id", data.id);
-
-    console.log(profiles, error);
-
-    if (!queryData?.length) {
-      return NextResponse.json(
-        {
-          error: "User not found",
-        },
-        { status: 404 }
-      );
-    }
-
-    profiles = queryData;
-  } else {
-    // Fetch by session id
-    const user = (await getUserBySession(data.session)) as User;
-
-    if (user) {
-      let { data: queryData, error } = await supabase
-        .from("profiles")
-        .select("*")
-        .eq("uid", user.id);
-
-      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${Math.round(Math.random() * 900000 + 100000)}`,
-          computedUsername: `user${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 {
-        profiles = queryData;
-      }
-    }
-  }
-
-  const user = profiles[0];
-
-  const activityStatus = await getActivityStatusForUserId(user.id);
-
-  const { data: activityData } = await supabase
-    .from("profileActivities")
-    .select("last_activity")
-    .eq("uid", user.uid || "")
-    .single();
+          .optional()
+          .nullable(),
+      })
+      .optional(),
+  }),
+};
 
-  const { data: usernameHistoryData } = await supabase
-    .from("profileUsernames")
-    .select("username,changed_at")
-    .eq("profile_id", user.id)
-    .order("changed_at", { ascending: false });
+export async function POST(request: Request): Promise<NextResponse> {
+  return protectedApi({
+    request,
+    schema: Schema,
+    authorization: () => {},
+    activity: handler,
+  });
+}
 
-  const { data: flagHistoryData } = await supabase
-    .from("profileFlags")
-    .select("id")
-    .eq("profile_id", user.id)
-    .limit(1);
-
-  //last 30 minutes
-  if (activityData && activityData.last_activity) {
-    isOnline = Date.now() - activityData.last_activity < 1800000;
-  }
+export async function handler(
+  data: (typeof Schema)["input"]["_type"],
+  req: Request
+): Promise<NextResponse<(typeof Schema)["output"]["_type"]>> {
+  let profiles: Database["public"]["Tables"]["profiles"]["Row"][] = [];
+  let isOnline = false;
+  let viewerProfileId =
+    data.id !== undefined && data.id !== null
+      ? await getViewerProfileId(data.session)
+      : null;
+  // Fetch by id
+  if (data.id !== undefined && data.id !== null) {
+    let { data: queryData, error } = await supabase
+      .from("profiles")
+      .select(`*,clans:clan(id,acronym)`)
+      .eq("id", data.id);
+
+    console.log(profiles, error);
+
+    if (!queryData?.length) {
+      return NextResponse.json(
+        {
+          error: "User not found",
+        },
+        { status: 404 }
+      );
+    }
+
+    profiles = queryData;
+  } else {
+    // Fetch by session id
+    const user = (await getUserBySession(data.session)) as User;
+
+    if (user) {
+      let { data: queryData, error } = await supabase
+        .from("profiles")
+        .select("*")
+        .eq("uid", user.id);
+
+      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${Math.round(Math.random() * 900000 + 100000)}`,
+          computedUsername: `user${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 {
+        profiles = queryData;
+      }
+
+      viewerProfileId = profiles[0]?.id ?? null;
+    }
+  }
+
+  const user = profiles[0];
+
+  const activityStatus = await getActivityStatusForUserId(user.id);
+
+  const [
+    { data: activityData },
+    { data: usernameHistoryData },
+    { data: flagHistoryData },
+    { count: friendCount },
+    friendState,
+  ] = await Promise.all([
+    supabase
+      .from("profileActivities")
+      .select("last_activity")
+      .eq("uid", user.uid || "")
+      .single(),
+    supabase
+      .from("profileUsernames")
+      .select("username,changed_at")
+      .eq("profile_id", user.id)
+      .order("changed_at", { ascending: false }),
+    supabase
+      .from("profileFlags")
+      .select("id")
+      .eq("profile_id", user.id)
+      .limit(1),
+    supabase
+      .from("profileFriends")
+      .select("*", { count: "exact", head: true })
+      .eq("friend_id", user.id),
+    getFriendState(viewerProfileId, user.id),
+  ]);
+
+  //last 30 minutes
+  if (activityData && activityData.last_activity) {
+    isOnline = Date.now() - activityData.last_activity < 1800000;
+  }
 
   let position: number | null = null;
   let countryPosition: number | null = null;
@@ -196,13 +262,13 @@ export async function handler(
         ? (countryPlayersWithMorePoints || 0) + 1
         : null;
   }
-
+
   if (user.verificationDeadline < Date.now()) {
     await supabase
       .from("profiles")
       .upsert({
-        id: user.id,
-        verified: false,
+        id: user.id,
+        verified: false,
       })
       .select();
   }
@@ -221,6 +287,8 @@ export async function handler(
       activity_status: activityStatus,
       is_online: isOnline,
       last_active_timestamp: activityData?.last_activity ?? null,
+      friend_count: friendCount || 0,
+      friend_state: friendState,
       can_change_flag: !flagHistoryData?.length,
       next_username_change_at: getNextUsernameChangeAt(latestUsernameChangeAt),
       previous_usernames: previousUsernames,

package/index.ts

@@ -321,6 +321,25 @@ import { Schema as EditProfile } from "./api/editProfile"
 export { Schema as SchemaEditProfile } from "./api/editProfile"
 export const editProfile = handleApi({url:"/api/editProfile",...EditProfile})
 
+// ./api/editProfileFriend.ts API
+
+/*
+export const Schema = {
+  input: z.strictObject({
+    session: z.string(),
+    profileId: z.number(),
+    action: z.enum(["add", "remove"]),
+  }),
+  output: z.strictObject({
+    error: z.string().optional(),
+    friend_count: z.number().optional(),
+    friend_state: friendStateSchema.optional(),
+  }),
+};*/
+import { Schema as EditProfileFriend } from "./api/editProfileFriend"
+export { Schema as SchemaEditProfileFriend } from "./api/editProfileFriend"
+export const editProfileFriend = handleApi({url:"/api/editProfileFriend",...EditProfileFriend})
+
 // ./api/enhancedSearch.ts API
 
 /*
@@ -840,6 +859,22 @@ import { Schema as GetCollections } from "./api/getCollections"
 export { Schema as SchemaGetCollections } from "./api/getCollections"
 export const getCollections = handleApi({url:"/api/getCollections",...GetCollections})
 
+// ./api/getFriends.ts API
+
+/*
+export const Schema = {
+  input: z.strictObject({
+    session: z.string(),
+  }),
+  output: z.strictObject({
+    error: z.string().optional(),
+    friends: z.array(friendUserSchema),
+  }),
+};*/
+import { Schema as GetFriends } from "./api/getFriends"
+export { Schema as SchemaGetFriends } from "./api/getFriends"
+export const getFriends = handleApi({url:"/api/getFriends",...GetFriends})
+
 // ./api/getInventory.ts API
 
 /*
@@ -967,26 +1002,26 @@ export const getPassToken = handleApi({url:"/api/getPassToken",...GetPassToken})
 /*
 export const Schema = {
   input: z.strictObject({
-    session: z.string(),
-    id: z.number().nullable().optional(),
-  }),
-  output: z.object({
-    error: z.string().optional(),
-    user: z
-      .object({
-        about_me: z.string().nullable(),
-        avatar_url: z.string().nullable(),
-        profile_image: z.string().nullable(),
-        badges: z.any().nullable(),
-        created_at: z.number().nullable(),
-        flag: z.string().nullable(),
-        id: z.number(),
-        uid: z.string().nullable(),
-        ban: z.string().nullable(),
-        username: z.string().nullable(),
-        verified: z.boolean().nullable(),
-        verificationDeadline: z.number().nullable(),
-        play_count: z.number().nullable(),
+    session: z.string(),
+    id: z.number().nullable().optional(),
+  }),
+  output: z.object({
+    error: z.string().optional(),
+    user: z
+      .object({
+        about_me: z.string().nullable(),
+        avatar_url: z.string().nullable(),
+        profile_image: z.string().nullable(),
+        badges: z.any().nullable(),
+        created_at: z.number().nullable(),
+        flag: z.string().nullable(),
+        id: z.number(),
+        uid: z.string().nullable(),
+        ban: z.string().nullable(),
+        username: z.string().nullable(),
+        verified: z.boolean().nullable(),
+        verificationDeadline: z.number().nullable(),
+        play_count: z.number().nullable(),
         skill_points: z.number().nullable(),
         squares_hit: z.number().nullable(),
         total_score: z.number().nullable(),
@@ -995,6 +1030,8 @@ export const Schema = {
         activity_status: z.enum(["active", "inactive"]),
         is_online: z.boolean(),
         last_active_timestamp: z.number().nullable(),
+        friend_count: z.number(),
+        friend_state: friendStateSchema,
         can_change_flag: z.boolean(),
         next_username_change_at: z.string().nullable(),
         previous_usernames: z.array(
@@ -1008,11 +1045,11 @@ export const Schema = {
             id: z.number(),
             acronym: z.string(),
           })
-          .optional()
-          .nullable(),
-      })
-      .optional(),
-  }),
+          .optional()
+          .nullable(),
+      })
+      .optional(),
+  }),
 };*/
 import { Schema as GetProfile } from "./api/getProfile"
 export { Schema as SchemaGetProfile } from "./api/getProfile"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rhythia-api",
-  "version": "240.0.0",
+  "version": "242.0.0",
   "main": "index.ts",
   "author": "online-contributors-cunev",
   "scripts": {
@@ -11,6 +11,7 @@
     "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-flags": "node scripts/create-profile-flags-table.ts",
+    "db:create-profile-friends": "node scripts/create-profile-friends-table.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",

package/types/database.ts

@@ -558,6 +558,42 @@ export type Database = {
           },
         ]
       }
+      profileFriends: {
+        Row: {
+          created_at: string
+          friend_id: number
+          id: number
+          profile_id: number
+        }
+        Insert: {
+          created_at?: string
+          friend_id: number
+          id?: number
+          profile_id: number
+        }
+        Update: {
+          created_at?: string
+          friend_id?: number
+          id?: number
+          profile_id?: number
+        }
+        Relationships: [
+          {
+            foreignKeyName: "profileFriends_friend_id_fkey"
+            columns: ["friend_id"]
+            isOneToOne: false
+            referencedRelation: "profiles"
+            referencedColumns: ["id"]
+          },
+          {
+            foreignKeyName: "profileFriends_profile_id_fkey"
+            columns: ["profile_id"]
+            isOneToOne: false
+            referencedRelation: "profiles"
+            referencedColumns: ["id"]
+          },
+        ]
+      }
       profileFlags: {
         Row: {
           changed_at: string

package/utils/countryList.ts

@@ -0,0 +1,141 @@
+export const COUNTRY_LIST = [
+  "US",
+  "AE",
+  "AM",
+  "AR",
+  "AT",
+  "AU",
+  "AZ",
+  "BA",
+  "BB",
+  "BD",
+  "BE",
+  "BG",
+  "BH",
+  "BN",
+  "BO",
+  "BR",
+  "BT",
+  "BW",
+  "BY",
+  "CA",
+  "CH",
+  "CI",
+  "CL",
+  "CN",
+  "CO",
+  "CR",
+  "CU",
+  "CW",
+  "CY",
+  "CZ",
+  "DE",
+  "DJ",
+  "DK",
+  "DO",
+  "DZ",
+  "EC",
+  "EE",
+  "EG",
+  "ES",
+  "ET",
+  "FI",
+  "FJ",
+  "FO",
+  "FR",
+  "GA",
+  "GB",
+  "GE",
+  "GH",
+  "GR",
+  "GT",
+  "GU",
+  "HK",
+  "HN",
+  "HR",
+  "HU",
+  "ID",
+  "IE",
+  "IL",
+  "IM",
+  "IN",
+  "IQ",
+  "IR",
+  "IS",
+  "IT",
+  "JE",
+  "JM",
+  "JO",
+  "JP",
+  "KE",
+  "KG",
+  "KH",
+  "KR",
+  "KW",
+  "LI",
+  "LK",
+  "LT",
+  "LU",
+  "LV",
+  "MA",
+  "MC",
+  "MD",
+  "MG",
+  "MK",
+  "MM",
+  "MN",
+  "MT",
+  "MU",
+  "MV",
+  "MX",
+  "MY",
+  "NA",
+  "NC",
+  "NG",
+  "NL",
+  "NO",
+  "NP",
+  "NZ",
+  "OM",
+  "PA",
+  "PE",
+  "PG",
+  "PH",
+  "PK",
+  "PL",
+  "PR",
+  "PS",
+  "PT",
+  "PY",
+  "QA",
+  "RE",
+  "RO",
+  "RU",
+  "SA",
+  "SD",
+  "SE",
+  "SG",
+  "SI",
+  "SK",
+  "SL",
+  "SN",
+  "SR",
+  "SV",
+  "SY",
+  "TG",
+  "TH",
+  "TN",
+  "TR",
+  "TT",
+  "TW",
+  "TZ",
+  "UA",
+  "UY",
+  "UZ",
+  "KZ",
+  "VE",
+  "VN",
+  "XK",
+  "ZA",
+  "ZW",
+] as const;