rhythia-api 238.0.0 → 240.0.0

package/api/editProfile.ts

@@ -1,26 +1,63 @@
 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 { User } from "@supabase/supabase-js";
-import validator from "validator";
-import removeZeroWidth from "zero-width";
-
-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(),
-    }),
-  }),
-  output: z.object({
-    error: z.string().optional(),
-  }),
-};
+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
+): string | null {
+  if (!lastChangedAt) {
+    return null;
+  }
+
+  const nextAllowedAt = new Date(lastChangedAt);
+  nextAllowedAt.setUTCMonth(nextAllowedAt.getUTCMonth() + 6);
+  return nextAllowedAt.toISOString();
+}
+
+function formatUsernameChangeDate(date: string): string {
+  return new Intl.DateTimeFormat("en-US", {
+    year: "numeric",
+    month: "short",
+    day: "numeric",
+  }).format(new Date(date));
+}
+
+function isUsernameChangeLocked(
+  lastChangedAt: string | null | undefined,
+  now = Date.now()
+): boolean {
+  const nextAllowedAt = getNextUsernameChangeAt(lastChangedAt);
+  return nextAllowedAt !== null && new Date(nextAllowedAt).getTime() > now;
+}
+
+export const Schema = {
+  input: z.strictObject({
+    session: z.string(),
+    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({
@@ -63,18 +100,33 @@ export async function handler(
     }
   }
 
-  if (validator.trim(data.data.username || "") !== (data.data.username || "")) {
-    return NextResponse.json(
-      {
-        error: "Username can't start or end with spaces.",
-      },
+  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;
+  }
+
+  data.data.username = removeZeroWidth(data.data.username || "");
+
+  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"];
 
@@ -96,24 +148,94 @@ export async function handler(
     userData = queryUserData[0];
   }
 
-  if (
-    userData.ban == "excluded" ||
-    userData.ban == "restricted" ||
-    userData.ban == "silenced"
-  ) {
+  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 }
-    );
-  }
-
-  const upsertPayload: Database["public"]["Tables"]["profiles"]["Update"] = {
-    id: userData.id,
-    computedUsername: data.data.username?.toLowerCase(),
-    ...data.data,
+    );
+  }
+
+  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
+      .from("profileUsernames")
+      .select("changed_at")
+      .eq("profile_id", userData.id!)
+      .order("changed_at", { ascending: false })
+      .limit(1);
+
+    if (usernameHistoryError) {
+      return NextResponse.json(
+        {
+          error: "Could not verify username change availability.",
+        },
+        { status: 500 }
+      );
+    }
+
+    const lastChangedAt = usernameHistory?.[0]?.changed_at ?? null;
+    nextUsernameChangeAt = getNextUsernameChangeAt(lastChangedAt);
+
+    if (isUsernameChangeLocked(lastChangedAt)) {
+      return NextResponse.json(
+        {
+          error: `${USERNAME_CHANGE_COOLDOWN_ERROR}. Next change available ${formatUsernameChangeDate(
+            nextUsernameChangeAt!
+          )}.`,
+          next_username_change_at: nextUsernameChangeAt,
+        },
+        { status: 404 }
+      );
+    }
+  }
+
+  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
@@ -121,14 +243,54 @@ export async function handler(
     .upsert(upsertPayload)
     .select();
 
-  if (upsertResult.error) {
-    return NextResponse.json(
-      {
-        error: "Can't update, username might be used by someone else!",
+  if (upsertResult.error) {
+    if (
+      usernameHasChanged &&
+      upsertResult.error.message.includes(USERNAME_CHANGE_COOLDOWN_ERROR)
+    ) {
+      if (!nextUsernameChangeAt) {
+        const { data: usernameHistory } = await supabase
+          .from("profileUsernames")
+          .select("changed_at")
+          .eq("profile_id", userData.id!)
+          .order("changed_at", { ascending: false })
+          .limit(1);
+
+        nextUsernameChangeAt = getNextUsernameChangeAt(
+          usernameHistory?.[0]?.changed_at ?? null
+        );
+      }
+
+      return NextResponse.json(
+        {
+          error: `${USERNAME_CHANGE_COOLDOWN_ERROR}. Next change available ${
+            nextUsernameChangeAt
+              ? formatUsernameChangeDate(nextUsernameChangeAt)
+              : "later"
+          }.`,
+          next_username_change_at: nextUsernameChangeAt,
+        },
+        { status: 404 }
+      );
+    }
+
+    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 }
     );
   }
-
-  return NextResponse.json({});
-}
+
+  return NextResponse.json({});
+}

package/api/getProfile.ts

@@ -5,14 +5,26 @@ 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";
-
-export const Schema = {
-  input: z.strictObject({
+import { User } from "@supabase/supabase-js";
+import {
+  getActivityStatusForUserId,
+  getScoreActivityCutoffIso,
+} from "../utils/activityStatus";
+
+function getNextUsernameChangeAt(
+  lastChangedAt: string | null | undefined
+): string | null {
+  if (!lastChangedAt) {
+    return null;
+  }
+
+  const nextAllowedAt = new Date(lastChangedAt);
+  nextAllowedAt.setUTCMonth(nextAllowedAt.getUTCMonth() + 6);
+  return nextAllowedAt.toISOString();
+}
+
+export const Schema = {
+  input: z.strictObject({
     session: z.string(),
     id: z.number().nullable().optional(),
   }),
@@ -41,6 +53,14 @@ 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({
+            username: z.string(),
+            changed_at: z.string(),
+          })
+        ),
         clans: z
           .object({
             id: z.number(),
@@ -128,6 +148,18 @@ export async function handler(
     .select("last_activity")
     .eq("uid", user.uid || "")
     .single();
+
+  const { data: usernameHistoryData } = await supabase
+    .from("profileUsernames")
+    .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) {
@@ -165,24 +197,33 @@ export async function handler(
         : null;
   }
 
-  if (user.verificationDeadline < Date.now()) {
-    await supabase
-      .from("profiles")
-      .upsert({
+  if (user.verificationDeadline < Date.now()) {
+    await supabase
+      .from("profiles")
+      .upsert({
         id: user.id,
         verified: false,
-      })
-      .select();
-  }
-
-  return NextResponse.json({
-    user: {
+      })
+      .select();
+  }
+
+  const previousUsernames = (usernameHistoryData || []).filter((entry) => {
+    return entry.username.toLowerCase() !== (user.username || "").toLowerCase();
+  });
+
+  const latestUsernameChangeAt = usernameHistoryData?.[0]?.changed_at ?? null;
+
+  return NextResponse.json({
+    user: {
       ...user,
       position,
       country_position: countryPosition,
       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

@@ -301,18 +301,21 @@ export const editCollection = handleApi({url:"/api/editCollection",...EditCollec
 // ./api/editProfile.ts API
 
 /*
-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(),
-    }),
-  }),
-  output: z.object({
-    error: z.string().optional(),
-  }),
+export const Schema = {
+  input: z.strictObject({
+    session: z.string(),
+    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(),
+  }),
 };*/
 import { Schema as EditProfile } from "./api/editProfile"
 export { Schema as SchemaEditProfile } from "./api/editProfile"
@@ -962,8 +965,8 @@ export const getPassToken = handleApi({url:"/api/getPassToken",...GetPassToken})
 // ./api/getProfile.ts API
 
 /*
-export const Schema = {
-  input: z.strictObject({
+export const Schema = {
+  input: z.strictObject({
     session: z.string(),
     id: z.number().nullable().optional(),
   }),
@@ -992,6 +995,14 @@ 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({
+            username: z.string(),
+            changed_at: z.string(),
+          })
+        ),
         clans: z
           .object({
             id: z.number(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rhythia-api",
-  "version": "238.0.0",
+  "version": "240.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,64 @@ 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
+          id: number
+          profile_id: number
+          username: string
+        }
+        Insert: {
+          changed_at?: string
+          id?: number
+          profile_id: number
+          username: string
+        }
+        Update: {
+          changed_at?: string
+          id?: number
+          profile_id?: number
+          username?: string
+        }
+        Relationships: [
+          {
+            foreignKeyName: "profileUsernames_profile_id_fkey"
+            columns: ["profile_id"]
+            isOneToOne: false
+            referencedRelation: "profiles"
+            referencedColumns: ["id"]
+          },
+        ]
+      }
       profiles: {
         Row: {
           about_me: string | null