rhythia-api 239.0.0 → 241.0.0

package/api/editProfile.ts

@@ -1,15 +1,18 @@
-import { NextResponse } from "../utils/response";
-import z from "zod";
-import { Database } from "../types/database";
-import { protectedApi, validUser } from "../utils/requestUtils";
+import { NextResponse } from "../utils/response";
+import z from "zod";
+import { Database } from "../types/database";
+import { protectedApi, validUser } from "../utils/requestUtils";
 import { supabase } from "../utils/supabase";
 import { getUserBySession } from "../utils/getUserBySession";
+import { COUNTRY_LIST } from "../utils/countryList";
 import { User } from "@supabase/supabase-js";
 import validator from "validator";
 import removeZeroWidth from "zero-width";
 
 const USERNAME_CHANGE_COOLDOWN_ERROR =
   "Username can only be changed once every 6 months";
+const FLAG_CHANGE_ERROR = "Flag can only be changed once";
+const countryCodes = new Set(COUNTRY_LIST);
 
 function getNextUsernameChangeAt(
   lastChangedAt: string | null | undefined
@@ -42,110 +45,130 @@ function isUsernameChangeLocked(
 export const Schema = {
   input: z.strictObject({
     session: z.string(),
-    data: z.object({
-      avatar_url: z.string().optional(),
-      profile_image: z.string().optional(),
-      username: z.string().optional(),
-    }),
+    data: z.object({
+      avatar_url: z.string().optional(),
+      flag: z.string().optional(),
+      profile_image: z.string().optional(),
+      username: z.string().optional(),
+    }),
   }),
   output: z.object({
     error: z.string().optional(),
+    can_change_flag: z.boolean().optional(),
     next_username_change_at: z.string().nullable().optional(),
   }),
 };
-
-export async function POST(request: Request): Promise<NextResponse> {
-  return protectedApi({
-    request,
-    schema: Schema,
-    authorization: validUser,
-    activity: handler,
-  });
-}
-
-export async function handler(
-  data: (typeof Schema)["input"]["_type"]
-): Promise<NextResponse<(typeof Schema)["output"]["_type"]>> {
-  if (data.data.username !== undefined) {
-    if (data.data.username.length < 3) {
-      return NextResponse.json(
-        {
-          error: "Username must be at least 3 characters long",
-        },
-        { status: 404 }
-      );
-    }
-
-    if (data.data.username.length > 20) {
-      return NextResponse.json(
-        {
-          error: "Username too long.",
-        },
-        { status: 404 }
-      );
-    }
-
-    if (!/^[a-z0-9]+$/i.test(data.data.username)) {
-      return NextResponse.json(
-        {
-          error: "Username can only contain letters (a-z) and numbers (0-9)",
-        },
-        { status: 404 }
-      );
-    }
-  }
-
-  if (validator.trim(data.data.username || "") !== (data.data.username || "")) {
-    return NextResponse.json(
-      {
-        error: "Username can't start or end with spaces.",
-      },
-      { status: 404 }
-    );
+
+export async function POST(request: Request): Promise<NextResponse> {
+  return protectedApi({
+    request,
+    schema: Schema,
+    authorization: validUser,
+    activity: handler,
+  });
+}
+
+export async function handler(
+  data: (typeof Schema)["input"]["_type"]
+): Promise<NextResponse<(typeof Schema)["output"]["_type"]>> {
+  if (data.data.username !== undefined) {
+    if (data.data.username.length < 3) {
+      return NextResponse.json(
+        {
+          error: "Username must be at least 3 characters long",
+        },
+        { status: 404 }
+      );
+    }
+
+    if (data.data.username.length > 20) {
+      return NextResponse.json(
+        {
+          error: "Username too long.",
+        },
+        { status: 404 }
+      );
+    }
+
+    if (!/^[a-z0-9]+$/i.test(data.data.username)) {
+      return NextResponse.json(
+        {
+          error: "Username can only contain letters (a-z) and numbers (0-9)",
+        },
+        { status: 404 }
+      );
+    }
+  }
+
+  if (validator.trim(data.data.username || "") !== (data.data.username || "")) {
+    return NextResponse.json(
+      {
+        error: "Username can't start or end with spaces.",
+      },
+      { status: 404 }
+    );
   }
 
   data.data.username = removeZeroWidth(data.data.username || "");
-
-  const user = (await getUserBySession(data.session)) as User;
-
-  let userData: Database["public"]["Tables"]["profiles"]["Update"];
-
-  // Find user's entry
-  {
-    let { data: queryUserData, error } = await supabase
-      .from("profiles")
-      .select("*")
-      .eq("uid", user.id);
-
-    if (!queryUserData?.length) {
-      return NextResponse.json(
-        {
-          error: "User cannot be retrieved from session",
-        },
-        { status: 404 }
-      );
-    }
-    userData = queryUserData[0];
-  }
-
+
+  if (data.data.flag !== undefined) {
+    const normalizedFlag = validator.trim(data.data.flag).toUpperCase();
+
+    if (!countryCodes.has(normalizedFlag as (typeof COUNTRY_LIST)[number])) {
+      return NextResponse.json(
+        {
+          error: "Flag must be a valid country code.",
+        },
+        { status: 404 }
+      );
+    }
+
+    data.data.flag = normalizedFlag;
+  }
+
+  const user = (await getUserBySession(data.session)) as User;
+
+  let userData: Database["public"]["Tables"]["profiles"]["Update"];
+
+  // Find user's entry
+  {
+    let { data: queryUserData, error } = await supabase
+      .from("profiles")
+      .select("*")
+      .eq("uid", user.id);
+
+    if (!queryUserData?.length) {
+      return NextResponse.json(
+        {
+          error: "User cannot be retrieved from session",
+        },
+        { status: 404 }
+      );
+    }
+    userData = queryUserData[0];
+  }
+
   if (
     userData.ban == "excluded" ||
     userData.ban == "restricted" ||
     userData.ban == "silenced"
   ) {
-    return NextResponse.json(
-      {
-        error:
-          "Silenced, restricted or excluded players can't update their profile.",
-      },
-      { status: 404 }
+    return NextResponse.json(
+      {
+        error:
+          "Silenced, restricted or excluded players can't update their profile.",
+      },
+      { status: 404 }
     );
   }
 
   const usernameHasChanged =
     data.data.username !== undefined && data.data.username !== userData.username;
+  const flagHasChanged =
+    data.data.flag !== undefined && data.data.flag !== userData.flag;
 
   let nextUsernameChangeAt: string | null = null;
+  let canChangeFlag = true;
 
   if (usernameHasChanged) {
     const { data: usernameHistory, error: usernameHistoryError } = await supabase
@@ -180,17 +203,46 @@ export async function handler(
     }
   }
 
+  if (flagHasChanged) {
+    const { data: flagHistory, error: flagHistoryError } = await supabase
+      .from("profileFlags")
+      .select("id")
+      .eq("profile_id", userData.id!)
+      .limit(1);
+
+    if (flagHistoryError) {
+      return NextResponse.json(
+        {
+          error: "Could not verify flag change availability.",
+        },
+        { status: 500 }
+      );
+    }
+
+    canChangeFlag = !flagHistory?.length;
+
+    if (!canChangeFlag) {
+      return NextResponse.json(
+        {
+          error: FLAG_CHANGE_ERROR,
+          can_change_flag: false,
+        },
+        { status: 404 }
+      );
+    }
+  }
+
   const upsertPayload: Database["public"]["Tables"]["profiles"]["Update"] = {
     id: userData.id,
     computedUsername: data.data.username?.toLowerCase(),
     ...data.data,
-  };
-
-  const upsertResult = await supabase
-    .from("profiles")
-    .upsert(upsertPayload)
-    .select();
-
+  };
+
+  const upsertResult = await supabase
+    .from("profiles")
+    .upsert(upsertPayload)
+    .select();
+
   if (upsertResult.error) {
     if (
       usernameHasChanged &&
@@ -222,13 +274,23 @@ export async function handler(
       );
     }
 
+    if (flagHasChanged && upsertResult.error.message.includes(FLAG_CHANGE_ERROR)) {
+      return NextResponse.json(
+        {
+          error: FLAG_CHANGE_ERROR,
+          can_change_flag: false,
+        },
+        { status: 404 }
+      );
+    }
+
     return NextResponse.json(
       {
         error: "Can't update, username might be used by someone else!",
-      },
-      { status: 404 }
-    );
-  }
+      },
+      { status: 404 }
+    );
+  }
 
   return NextResponse.json({});
 }

package/api/getProfile.ts

@@ -53,6 +53,7 @@ export const Schema = {
         activity_status: z.enum(["active", "inactive"]),
         is_online: z.boolean(),
         last_active_timestamp: z.number().nullable(),
+        can_change_flag: z.boolean(),
         next_username_change_at: z.string().nullable(),
         previous_usernames: z.array(
           z.object({
@@ -153,6 +154,12 @@ export async function handler(
     .select("username,changed_at")
     .eq("profile_id", user.id)
     .order("changed_at", { ascending: false });
+
+  const { data: flagHistoryData } = await supabase
+    .from("profileFlags")
+    .select("id")
+    .eq("profile_id", user.id)
+    .limit(1);
 
   //last 30 minutes
   if (activityData && activityData.last_activity) {
@@ -214,6 +221,7 @@ export async function handler(
       activity_status: activityStatus,
       is_online: isOnline,
       last_active_timestamp: activityData?.last_activity ?? null,
+      can_change_flag: !flagHistoryData?.length,
       next_username_change_at: getNextUsernameChangeAt(latestUsernameChangeAt),
       previous_usernames: previousUsernames,
     },

package/index.ts

@@ -304,14 +304,16 @@ export const editCollection = handleApi({url:"/api/editCollection",...EditCollec
 export const Schema = {
   input: z.strictObject({
     session: z.string(),
-    data: z.object({
-      avatar_url: z.string().optional(),
-      profile_image: z.string().optional(),
-      username: z.string().optional(),
-    }),
+    data: z.object({
+      avatar_url: z.string().optional(),
+      flag: z.string().optional(),
+      profile_image: z.string().optional(),
+      username: z.string().optional(),
+    }),
   }),
   output: z.object({
     error: z.string().optional(),
+    can_change_flag: z.boolean().optional(),
     next_username_change_at: z.string().nullable().optional(),
   }),
 };*/
@@ -993,6 +995,7 @@ export const Schema = {
         activity_status: z.enum(["active", "inactive"]),
         is_online: z.boolean(),
         last_active_timestamp: z.number().nullable(),
+        can_change_flag: z.boolean(),
         next_username_change_at: z.string().nullable(),
         previous_usernames: z.array(
           z.object({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rhythia-api",
-  "version": "239.0.0",
+  "version": "241.0.0",
   "main": "index.ts",
   "author": "online-contributors-cunev",
   "scripts": {
@@ -10,6 +10,7 @@
     "test": "tsx ./scripts/test.ts",
     "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-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,35 @@ export type Database = {
           },
         ]
       }
+      profileFlags: {
+        Row: {
+          changed_at: string
+          flag: string | null
+          id: number
+          profile_id: number
+        }
+        Insert: {
+          changed_at?: string
+          flag?: string | null
+          id?: number
+          profile_id: number
+        }
+        Update: {
+          changed_at?: string
+          flag?: string | null
+          id?: number
+          profile_id?: number
+        }
+        Relationships: [
+          {
+            foreignKeyName: "profileFlags_profile_id_fkey"
+            columns: ["profile_id"]
+            isOneToOne: false
+            referencedRelation: "profiles"
+            referencedColumns: ["id"]
+          },
+        ]
+      }
       profileUsernames: {
         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;