Use new Discord display name, make showing unique username optional Closes #1391

2026-08-22 19:16:09 -05:00 · 2023-06-17 16:02:09 +03:00
parent 6ab512e5e1
commit 600c67f765
17 changed files with 389 additions and 201 deletions
--- a/app/db/models/users/queries.server.ts
+++ b/app/db/models/users/queries.server.ts
@@ -43,6 +43,7 @@ export function upsert(
    | "twitch"
    | "twitter"
    | "youtubeId"
+    | "discordUniqueName"
  >
 ) {
  return upsertStm.get(input) as User;
@@ -66,6 +67,7 @@ export const updateProfile = sql.transaction(
    | "inGameName"
    | "css"
    | "favoriteBadgeId"
+    | "showDiscordUniqueName"
  > & { weapons: MainWeaponId[] }) => {
    deleteUserWeaponsStm.run({ userId: rest.id });
    for (const [i, weaponSplId] of weapons.entries()) {
@@ -82,7 +84,7 @@ export const updateMany = sql.transaction(
    argsArr: Array<
      Pick<
        User,
-        "discordAvatar" | "discordName" | "discordDiscriminator" | "discordId"
+        "discordAvatar" | "discordName" | "discordUniqueName" | "discordId"
      >
    >
  ) => {
--- a/app/db/models/users/updateByDiscordId.sql
+++ b/app/db/models/users/updateByDiscordId.sql
@@ -2,7 +2,7 @@ update
  "User"
 set
  "discordAvatar" = @discordAvatar,
-  "discordName" = @discordName,
-  "discordDiscriminator" = @discordDiscriminator
+  "discordName" = coalesce(@discordName, "discordName"),
+  "discordUniqueName" = coalesce(@discordUniqueName, "discordUniqueName")
 where
-  "discordId" = @discordId
+  "discordId" = @discordId
--- a/app/db/models/users/updateProfile.sql
+++ b/app/db/models/users/updateProfile.sql
@@ -8,6 +8,7 @@ set
  "motionSens" = @motionSens,
  "inGameName" = @inGameName,
  "css" = @css,
-  "favoriteBadgeId" = @favoriteBadgeId
+  "favoriteBadgeId" = @favoriteBadgeId,
+  "showDiscordUniqueName" = @showDiscordUniqueName
 where
  "id" = @id returning *
--- a/app/db/models/users/upsert.sql
+++ b/app/db/models/users/upsert.sql
@@ -4,6 +4,7 @@ insert into
    "discordName",
    "discordDiscriminator",
    "discordAvatar",
+    "discordUniqueName",
    "twitch",
    "twitter",
    "youtubeId"
@@ -14,6 +15,7 @@ values
    @discordName,
    @discordDiscriminator,
    @discordAvatar,
+    @discordUniqueName,
    @twitch,
    @twitter,
    @youtubeId
@@ -23,6 +25,7 @@ set
  "discordName" = excluded."discordName",
  "discordDiscriminator" = excluded."discordDiscriminator",
  "discordAvatar" = excluded."discordAvatar",
+  "discordUniqueName" = excluded."discordUniqueName",
  "twitch" = excluded."twitch",
  "twitter" = excluded."twitter",
  "youtubeId" = excluded."youtubeId" returning *
--- a/app/db/seed/index.ts
+++ b/app/db/seed/index.ts
@@ -130,13 +130,14 @@ function wipeDB() {

 function adminUser() {
  db.users.upsert({
-    discordDiscriminator: "4059",
+    discordDiscriminator: "0",
    discordId: ADMIN_DISCORD_ID,
    discordName: "Sendou",
    twitch: "Sendou",
    youtubeId: "UCWbJLXByvsfQvTcR4HLPs5Q",
    discordAvatar: ADMIN_TEST_AVATAR,
    twitter: "sendouc",
+    discordUniqueName: "sendou",
  });
 }

@@ -174,6 +175,7 @@ function nzapUser() {
    youtubeId: null,
    discordAvatar: NZAP_TEST_AVATAR,
    twitter: null,
+    discordUniqueName: null,
  });
 }

@@ -242,6 +244,7 @@ function fakeUser(usedNames: Set<string>) {
    twitch: null,
    twitter: null,
    youtubeId: null,
+    discordUniqueName: null,
  });
 }

--- a/app/db/types.ts
+++ b/app/db/types.ts
@@ -11,9 +11,13 @@ import type allTags from "../routes/calendar/tags.json";
 export interface User {
  id: number;
  discordId: string;
+  /** Discord display name aka global name (non-unique) */
  discordName: string;
  discordDiscriminator: string;
  discordAvatar: string | null;
+  /** Discord username (unique) */
+  discordUniqueName: string | null;
+  showDiscordUniqueName: number;
  twitch: string | null;
  twitter: string | null;
  youtubeId: string | null;
--- a/app/modules/auth/DiscordStrategy.server.ts
+++ b/app/modules/auth/DiscordStrategy.server.ts
@@ -17,6 +17,7 @@ const partialDiscordUserSchema = z.object({
  discriminator: z.string(),
  id: z.string(),
  username: z.string(),
+  global_name: z.string().nullish(),
 });
 const partialDiscordConnectionsSchema = z.array(
  z.object({
@@ -79,7 +80,8 @@ export class DiscordStrategy extends OAuth2Strategy<
          discordAvatar: user.avatar ?? null,
          discordDiscriminator: user.discriminator,
          discordId: user.id,
-          discordName: user.username,
+          discordName: user.global_name ?? user.username,
+          discordUniqueName: user.global_name ? user.username : null,
          ...this.parseConnections(connections),
        });

--- a/app/routes/u.$identifier.tsx
+++ b/app/routes/u.$identifier.tsx
@@ -84,6 +84,10 @@ export const loader = async ({ params, request }: LoaderArgs) => {
    discordDiscriminator: user.discordDiscriminator,
    discordId: user.discordId,
    discordName: user.discordName,
+    discordUniqueName: user.showDiscordUniqueName
+      ? user.discordUniqueName
+      : null,
+    showDiscordUniqueName: user.showDiscordUniqueName,
    twitch: user.twitch,
    twitter: user.twitter,
    youtubeId: user.youtubeId,
--- a/app/routes/u.$identifier/edit.tsx
+++ b/app/routes/u.$identifier/edit.tsx
@@ -37,6 +37,8 @@ import { rawSensToString } from "~/utils/strings";
 import { FAQ_PAGE, isCustomUrl, userPage } from "~/utils/urls";
 import {
  actualNumber,
+  checkboxValueToDbBoolean,
+  dbBoolean,
  falsyToNull,
  id,
  jsonParseable,
@@ -46,6 +48,7 @@ import {
  undefinedToNull,
 } from "~/utils/zod";
 import { userParamsSchema, type UserPageLoaderData } from "../u.$identifier";
+import { Toggle } from "~/components/Toggle";

 export const links: LinksFunction = () => {
  return [{ rel: "stylesheet", href: styles }];
@@ -126,6 +129,7 @@ const userEditActionSchema = z
      processMany(actualNumber, undefinedToNull),
      id.nullable()
    ),
+    showDiscordUniqueName: z.preprocess(checkboxValueToDbBoolean, dbBoolean),
  })
  .refine(
    (val) => {
@@ -165,6 +169,7 @@ export const action: ActionFunction = async ({ request }) => {
          ? `${inGameNameText}#${inGameNameDiscriminator}`
          : null,
      id: user.id,
+      showDiscordUniqueName: data.showDiscordUniqueName,
    });

    return redirect(userPage(editedUser));
@@ -191,6 +196,7 @@ export const loader = async ({ request, params }: LoaderArgs) => {

  return {
    favoriteBadgeId: user.favoriteBadgeId,
+    discordUniqueName: userToBeEdited.discordUniqueName,
    countries: Object.entries(countries)
      .map(([code, country]) => ({
        code,
@@ -211,6 +217,7 @@ export default function UserEditPage() {
  const [, parentRoute] = useMatches();
  invariant(parentRoute);
  const parentRouteData = parentRoute.data as UserPageLoaderData;
+  const data = useLoaderData<typeof loader>();

  return (
    <div className="half-width">
@@ -225,6 +232,11 @@ export default function UserEditPage() {
        <FavBadgeSelect parentRouteData={parentRouteData} />
        <WeaponPoolSelect parentRouteData={parentRouteData} />
        <BioTextarea initialValue={parentRouteData.bio} />
+        {data.discordUniqueName ? (
+          <ShowUniqueDiscordNameToggle parentRouteData={parentRouteData} />
+        ) : (
+          <input type="hidden" name="showDiscordUniqueName" value="on" />
+        )}
        <FormMessage type="info">
          <Trans i18nKey={"user:discordExplanation"} t={t}>
            Username, profile picture, YouTube, Twitter and Twitch accounts come
@@ -494,3 +506,33 @@ function FavBadgeSelect({
    </div>
  );
 }
+
+function ShowUniqueDiscordNameToggle({
+  parentRouteData,
+}: {
+  parentRouteData: UserPageLoaderData;
+}) {
+  const { t } = useTranslation(["user"]);
+  const data = useLoaderData<typeof loader>();
+  const [checked, setChecked] = React.useState(
+    Boolean(parentRouteData.showDiscordUniqueName)
+  );
+
+  return (
+    <div>
+      <label htmlFor="showDiscordUniqueName">
+        {t("user:forms.showDiscordUniqueName")}
+      </label>
+      <Toggle
+        checked={checked}
+        setChecked={setChecked}
+        name="showDiscordUniqueName"
+      />
+      <FormMessage type="info">
+        {t("user:forms.showDiscordUniqueName.info", {
+          discordUniqueName: data.discordUniqueName,
+        })}
+      </FormMessage>
+    </div>
+  );
+}
--- a/app/routes/u.$identifier/index.tsx
+++ b/app/routes/u.$identifier/index.tsx
@@ -5,10 +5,10 @@ import invariant from "tiny-invariant";
 import { Avatar } from "~/components/Avatar";
 import { Badge } from "~/components/Badge";
 import { Flag } from "~/components/Flag";
+import { Image, WeaponImage } from "~/components/Image";
 import { TwitchIcon } from "~/components/icons/Twitch";
 import { TwitterIcon } from "~/components/icons/Twitter";
 import { YouTubeIcon } from "~/components/icons/YouTube";
-import { Image, WeaponImage } from "~/components/Image";
 import { useTranslation } from "~/hooks/useTranslation";
 import { modesShort } from "~/modules/in-game-lists";
 import { type SendouRouteHandle } from "~/utils/remix";
@@ -22,11 +22,12 @@ import { assertUnreachable } from "~/utils/types";
 import {
  modeImageUrl,
  teamPage,
-  userSubmittedImage,
  topSearchPlayerPage,
+  userSubmittedImage,
 } from "~/utils/urls";
 import { badgeExplanationText } from "../badges/$id";
 import type { UserPageLoaderData } from "../u.$identifier";
+import { DiscordIcon } from "~/components/icons/Discord";

 export const handle: SendouRouteHandle = {
  i18n: "badges",
@@ -169,12 +170,24 @@ function ExtraInfos() {
      ? ` / ${t("user:motion")} ${rawSensToString(data.motionSens)}`
      : "";

-  if (!data.inGameName && typeof data.stickSens !== "number") {
+  if (
+    !data.inGameName &&
+    typeof data.stickSens !== "number" &&
+    !data.discordUniqueName
+  ) {
    return null;
  }

  return (
    <div className="u__extra-infos">
+      {data.discordUniqueName && (
+        <div className="u__extra-info">
+          <span className="u__extra-info__heading">
+            <DiscordIcon />
+          </span>{" "}
+          {data.discordUniqueName}
+        </div>
+      )}
      {data.inGameName && (
        <div className="u__extra-info">
          <span className="u__extra-info__heading">{t("user:ign.short")}</span>{" "}
--- a/app/styles/u.css
+++ b/app/styles/u.css
@@ -100,6 +100,9 @@
  border-radius: var(--rounded);
  background-color: var(--bg-darker);
  font-size: var(--fonts-xxs);
+  display: flex;
+  align-items: center;
+  gap: var(--s-1);
 }

 .u__extra-info__heading {
@@ -107,6 +110,10 @@
  font-weight: var(--bold);
 }

+.u__extra-info__heading > svg {
+  width: 0.8rem;
+}
+
 .u__badges {
  display: flex;
  max-width: 24rem;
--- a/app/utils/strings.ts
+++ b/app/utils/strings.ts
@@ -8,7 +8,7 @@ export function discordFullName(
  user: Pick<User, "discordName" | "discordDiscriminator">
 ) {
  if (isNewDiscordUniqueName(user.discordDiscriminator)) {
-    return capitalize(user.discordName);
+    return user.discordName;
  }
  return `${user.discordName}#${user.discordDiscriminator}`;
 }
--- a/discord-bot/commands/updateall.ts
+++ b/discord-bot/commands/updateall.ts
@@ -38,12 +38,12 @@ export const updateAllCommand: BotCommand = {

 async function getUsersToUpdate(client: Client<boolean>) {
  const usersSeen = new Set<string>();
-  const userUpdates: Array<
-    Pick<
-      User,
-      "discordId" | "discordName" | "discordDiscriminator" | "discordAvatar"
-    >
-  > = [];
+  const userUpdates: Array<{
+    discordId: string;
+    discordAvatar: string | null;
+    discordName: string | null;
+    discordUniqueName: string | null;
+  }> = [];
  for (const guildId of guildsToCrawlForUpdates) {
    const guild = client.guilds.cache.find((g) => g.id === guildId);
    invariant(guild);
@@ -51,11 +51,14 @@ async function getUsersToUpdate(client: Client<boolean>) {
    for (const [, { user }] of await guild.members.fetch()) {
      if (usersSeen.has(user.id)) continue;

+      const hasUniqueUsername = user.discriminator === "0";
+
+      // TODO: global_name when discord.js supports it
      userUpdates.push({
        discordId: user.id,
        discordAvatar: user.avatar,
-        discordDiscriminator: user.discriminator,
-        discordName: user.username,
+        discordName: hasUniqueUsername ? null : user.username,
+        discordUniqueName: hasUniqueUsername ? user.username : null,
      });

      usersSeen.add(user.id);
--- a/discord-bot/package-lock.json
+++ b/discord-bot/package-lock.json
@@ -7,14 +7,14 @@
    "": {
      "name": "lohi",
      "dependencies": {
-        "@discordjs/rest": "^1.1.0",
-        "discord-api-types": "^0.37.7",
-        "discord.js": "^14.3.0",
-        "dotenv": "^16.0.2",
-        "tiny-invariant": "^1.2.0",
+        "@discordjs/rest": "^1.7.1",
+        "discord-api-types": "^0.37.45",
+        "discord.js": "^14.11.0",
+        "dotenv": "^16.3.0",
+        "tiny-invariant": "^1.3.1",
        "ts-node": "^10.9.1",
-        "tsconfig-paths": "^4.1.0",
-        "typescript": "^4.8.2"
+        "tsconfig-paths": "^4.2.0",
+        "typescript": "^5.1.3"
      }
    },
    "node_modules/@cspotcode/source-map-support": {
@@ -29,40 +29,81 @@
      }
    },
    "node_modules/@discordjs/builders": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-1.2.0.tgz",
-      "integrity": "sha512-ARy4BUTMU+S0ZI6605NDqfWO+qZqV2d/xfY32z3hVSsd9IaAKJBZ1ILTZLy87oIjW8+gUpQmk9Kt0ZP9bmmd8Q==",
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-1.6.3.tgz",
+      "integrity": "sha512-CTCh8NqED3iecTNuiz49mwSsrc2iQb4d0MjMdmS/8pb69Y4IlzJ/DIy/p5GFlgOrFbNO2WzMHkWKQSiJ3VNXaw==",
      "dependencies": {
-        "@sapphire/shapeshift": "^3.5.1",
-        "discord-api-types": "^0.37.3",
+        "@discordjs/formatters": "^0.3.1",
+        "@discordjs/util": "^0.3.1",
+        "@sapphire/shapeshift": "^3.8.2",
+        "discord-api-types": "^0.37.41",
        "fast-deep-equal": "^3.1.3",
-        "ts-mixer": "^6.0.1",
-        "tslib": "^2.4.0"
+        "ts-mixer": "^6.0.3",
+        "tslib": "^2.5.0"
      },
      "engines": {
        "node": ">=16.9.0"
      }
    },
    "node_modules/@discordjs/collection": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-1.1.0.tgz",
-      "integrity": "sha512-PQ2Bv6pnT7aGPCKWbvvNRww5tYCGpggIQVgpuF9TdDPeR6n6vQYxezXiLVOS9z2B62Dp4c+qepQ15SgJbLYtCQ==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-1.5.1.tgz",
+      "integrity": "sha512-aWEc9DCf3TMDe9iaJoOnO2+JVAjeRNuRxPZQA6GVvBf+Z3gqUuWYBy2NWh4+5CLYq5uoc3MOvUQ5H5m8CJBqOA==",
+      "engines": {
+        "node": ">=16.9.0"
+      }
+    },
+    "node_modules/@discordjs/formatters": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@discordjs/formatters/-/formatters-0.3.1.tgz",
+      "integrity": "sha512-M7X4IGiSeh4znwcRGcs+49B5tBkNDn4k5bmhxJDAUhRxRHTiFAOTVUNQ6yAKySu5jZTnCbSvTYHW3w0rAzV1MA==",
+      "dependencies": {
+        "discord-api-types": "^0.37.41"
+      },
      "engines": {
        "node": ">=16.9.0"
      }
    },
    "node_modules/@discordjs/rest": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@discordjs/rest/-/rest-1.1.0.tgz",
-      "integrity": "sha512-yCrthRTQeUyNThQEpCk7bvQJlwQmz6kU0tf3dcWBv2WX3Bncl41x7Wc+v5b5OsIxfNYq38PvVtWircu9jtYZug==",
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/@discordjs/rest/-/rest-1.7.1.tgz",
+      "integrity": "sha512-Ofa9UqT0U45G/eX86cURQnX7gzOJLG2oC28VhIk/G6IliYgQF7jFByBJEykPSHE4MxPhqCleYvmsrtfKh1nYmQ==",
      "dependencies": {
-        "@discordjs/collection": "^1.0.1",
+        "@discordjs/collection": "^1.5.1",
+        "@discordjs/util": "^0.3.0",
        "@sapphire/async-queue": "^1.5.0",
-        "@sapphire/snowflake": "^3.2.2",
-        "discord-api-types": "^0.37.3",
-        "file-type": "^17.1.6",
-        "tslib": "^2.4.0",
-        "undici": "^5.9.1"
+        "@sapphire/snowflake": "^3.4.2",
+        "discord-api-types": "^0.37.41",
+        "file-type": "^18.3.0",
+        "tslib": "^2.5.0",
+        "undici": "^5.22.0"
+      },
+      "engines": {
+        "node": ">=16.9.0"
+      }
+    },
+    "node_modules/@discordjs/util": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@discordjs/util/-/util-0.3.1.tgz",
+      "integrity": "sha512-HxXKYKg7vohx2/OupUN/4Sd02Ev3PBJ5q0gtjdcvXb0ErCva8jNHWfe/v5sU3UKjIB/uxOhc+TDOnhqffj9pRA==",
+      "engines": {
+        "node": ">=16.9.0"
+      }
+    },
+    "node_modules/@discordjs/ws": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/@discordjs/ws/-/ws-0.8.3.tgz",
+      "integrity": "sha512-hcYtppanjHecbdNyCKQNH2I4RP9UrphDgmRgLYrATEQF1oo4sYSve7ZmGsBEXSzH72MO2tBPdWSThunbxUVk0g==",
+      "dependencies": {
+        "@discordjs/collection": "^1.5.1",
+        "@discordjs/rest": "^1.7.1",
+        "@discordjs/util": "^0.3.1",
+        "@sapphire/async-queue": "^1.5.0",
+        "@types/ws": "^8.5.4",
+        "@vladfrangu/async_event_emitter": "^2.2.1",
+        "discord-api-types": "^0.37.41",
+        "tslib": "^2.5.0",
+        "ws": "^8.13.0"
      },
      "engines": {
        "node": ">=16.9.0"
@@ -100,12 +141,12 @@
      }
    },
    "node_modules/@sapphire/shapeshift": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/@sapphire/shapeshift/-/shapeshift-3.6.0.tgz",
-      "integrity": "sha512-tu2WLRdo5wotHRvsCkspg3qMiP6ETC3Q1dns1Q5V6zKUki+1itq6AbhMwohF9ZcLoYqg+Y8LkgRRtVxxTQVTBQ==",
+      "version": "3.9.2",
+      "resolved": "https://registry.npmjs.org/@sapphire/shapeshift/-/shapeshift-3.9.2.tgz",
+      "integrity": "sha512-YRbCXWy969oGIdqR/wha62eX8GNHsvyYi0Rfd4rNW6tSVVa8p0ELiMEuOH/k8rgtvRoM+EMV7Csqz77YdwiDpA==",
      "dependencies": {
        "fast-deep-equal": "^3.1.3",
-        "lodash.uniqwith": "^4.5.0"
+        "lodash": "^4.17.21"
      },
      "engines": {
        "node": ">=v14.0.0",
@@ -113,9 +154,9 @@
      }
    },
    "node_modules/@sapphire/snowflake": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/@sapphire/snowflake/-/snowflake-3.2.2.tgz",
-      "integrity": "sha512-ula2O0kpSZtX9rKXNeQMrHwNd7E4jPDJYUXmEGTFdMRfyfMw+FPyh04oKMjAiDuOi64bYgVkOV3MjK+loImFhQ==",
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/@sapphire/snowflake/-/snowflake-3.5.1.tgz",
+      "integrity": "sha512-BxcYGzgEsdlG0dKAyOm0ehLGm2CafIrfQTZGWgkfKYbj+pNNsorZ7EotuZukc2MT70E0UbppVbtpBrqpzVzjNA==",
      "engines": {
        "node": ">=v14.0.0",
        "npm": ">=7.0.0"
@@ -152,13 +193,22 @@
      "integrity": "sha512-Q5BPGyGKcvQgAMbsr7qEGN/kIPN6zZecYYABeTDBizOsau+2NMdSVTar9UQw21A2+JyA2KRNDYaYrPB0Rpk2oQ=="
    },
    "node_modules/@types/ws": {
-      "version": "8.5.3",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz",
-      "integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==",
+      "version": "8.5.5",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz",
+      "integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==",
      "dependencies": {
        "@types/node": "*"
      }
    },
+    "node_modules/@vladfrangu/async_event_emitter": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/@vladfrangu/async_event_emitter/-/async_event_emitter-2.2.2.tgz",
+      "integrity": "sha512-HIzRG7sy88UZjBJamssEczH5q7t5+axva19UbZLO6u0ySbYPrwzWiXBcC0WuHyhKKoeCyneH+FvYzKQq/zTtkQ==",
+      "engines": {
+        "node": ">=v14.0.0",
+        "npm": ">=7.0.0"
+      }
+    },
    "node_modules/acorn": {
      "version": "8.7.1",
      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
@@ -208,37 +258,43 @@
      }
    },
    "node_modules/discord-api-types": {
-      "version": "0.37.7",
-      "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.37.7.tgz",
-      "integrity": "sha512-aQEx4JP1wYn6vRsPsIuVdcQq9hB1EAw9vnQFtuciI3Uqgis0CP/hfJxDkY+hOoAwq6vcCl8kWuMoMK50agCg9w=="
+      "version": "0.37.45",
+      "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.37.45.tgz",
+      "integrity": "sha512-r9m/g+YQfo7XWMrl645jvMlYoWF8lvns/ch4NCxsz/FbingrECu97LFSD2zKOvgHaSc90BHP8wgshaMcA2/c6Q=="
    },
    "node_modules/discord.js": {
-      "version": "14.3.0",
-      "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-14.3.0.tgz",
-      "integrity": "sha512-CpIwoAAuELiHSgVKRMzsCADS6ZlJwAZ9RlvcJYdEgS00aW36dSvXyBgE+S3pigkc7G+jU6BEalMUWIJFveqrBQ==",
+      "version": "14.11.0",
+      "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-14.11.0.tgz",
+      "integrity": "sha512-CkueWYFQ28U38YPR8HgsBR/QT35oPpMbEsTNM30Fs8loBIhnA4s70AwQEoy6JvLcpWWJO7GY0y2BUzZmuBMepQ==",
      "dependencies": {
-        "@discordjs/builders": "^1.2.0",
-        "@discordjs/collection": "^1.1.0",
-        "@discordjs/rest": "^1.1.0",
-        "@sapphire/snowflake": "^3.2.2",
-        "@types/ws": "^8.5.3",
-        "discord-api-types": "^0.37.3",
+        "@discordjs/builders": "^1.6.3",
+        "@discordjs/collection": "^1.5.1",
+        "@discordjs/formatters": "^0.3.1",
+        "@discordjs/rest": "^1.7.1",
+        "@discordjs/util": "^0.3.1",
+        "@discordjs/ws": "^0.8.3",
+        "@sapphire/snowflake": "^3.4.2",
+        "@types/ws": "^8.5.4",
+        "discord-api-types": "^0.37.41",
        "fast-deep-equal": "^3.1.3",
        "lodash.snakecase": "^4.1.1",
-        "tslib": "^2.4.0",
-        "undici": "^5.9.1",
-        "ws": "^8.8.1"
+        "tslib": "^2.5.0",
+        "undici": "^5.22.0",
+        "ws": "^8.13.0"
      },
      "engines": {
        "node": ">=16.9.0"
      }
    },
    "node_modules/dotenv": {
-      "version": "16.0.2",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.2.tgz",
-      "integrity": "sha512-JvpYKUmzQhYoIFgK2MOnF3bciIZoItIIoryihy0rIA+H4Jy0FmgyKYAHCTN98P5ybGSJcIFbh6QKeJdtZd1qhA==",
+      "version": "16.3.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.0.tgz",
+      "integrity": "sha512-tHB+hmf8MRCkT3VVivGiG8kq9HiGTmQ3FzOKgztfpJQH1IWuZTOvKSJmHNnQPowecAmkCJhLrxdPhOr06LLqIQ==",
      "engines": {
        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/motdotla/dotenv?sponsor=1"
      }
    },
    "node_modules/fast-deep-equal": {
@@ -247,16 +303,16 @@
      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
    },
    "node_modules/file-type": {
-      "version": "17.1.6",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-17.1.6.tgz",
-      "integrity": "sha512-hlDw5Ev+9e883s0pwUsuuYNu4tD7GgpUnOvykjv1Gya0ZIjuKumthDRua90VUn6/nlRKAjcxLUnHNTIUWwWIiw==",
+      "version": "18.5.0",
+      "resolved": "https://registry.npmjs.org/file-type/-/file-type-18.5.0.tgz",
+      "integrity": "sha512-yvpl5U868+V6PqXHMmsESpg6unQ5GfnPssl4dxdJudBrr9qy7Fddt7EVX1VLlddFfe8Gj9N7goCZH22FXuSQXQ==",
      "dependencies": {
        "readable-web-to-node-stream": "^3.0.2",
-        "strtok3": "^7.0.0-alpha.9",
-        "token-types": "^5.0.0-alpha.2"
+        "strtok3": "^7.0.0",
+        "token-types": "^5.0.1"
      },
      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": ">=14.16"
      },
      "funding": {
        "url": "https://github.com/sindresorhus/file-type?sponsor=1"
@@ -297,16 +353,16 @@
        "node": ">=6"
      }
    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    },
    "node_modules/lodash.snakecase": {
      "version": "4.1.1",
      "resolved": "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz",
      "integrity": "sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw=="
    },
-    "node_modules/lodash.uniqwith": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniqwith/-/lodash.uniqwith-4.5.0.tgz",
-      "integrity": "sha512-7lYL8bLopMoy4CTICbxygAUq6CdRJ36vFc80DucPueUee+d5NBRxz3FdT9Pes/HEx5mPoT9jwnsEJWz1N7uq7Q=="
-    },
    "node_modules/make-error": {
      "version": "1.3.6",
      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
@@ -330,9 +386,9 @@
      }
    },
    "node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
      "dependencies": {
        "inherits": "^2.0.3",
        "string_decoder": "^1.1.1",
@@ -417,9 +473,9 @@
      }
    },
    "node_modules/tiny-invariant": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.2.0.tgz",
-      "integrity": "sha512-1Uhn/aqw5C6RI4KejVeTg6mIS7IqxnLJ8Mv2tV5rTc0qWobay7pDUz6Wi392Cnc8ak1H0F2cjoRzb2/AW4+Fvg=="
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz",
+      "integrity": "sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw=="
    },
    "node_modules/token-types": {
      "version": "5.0.1",
@@ -438,9 +494,9 @@
      }
    },
    "node_modules/ts-mixer": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ts-mixer/-/ts-mixer-6.0.1.tgz",
-      "integrity": "sha512-hvE+ZYXuINrx6Ei6D6hz+PTim0Uf++dYbK9FFifLNwQj+RwKquhQpn868yZsCtJYiclZF1u8l6WZxxKi+vv7Rg=="
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/ts-mixer/-/ts-mixer-6.0.3.tgz",
+      "integrity": "sha512-k43M7uCG1AkTyxgnmI5MPwKoUvS/bRvLvUb7+Pgpdlmok8AoqmUaZxUUw8zKM5B1lqZrt41GjYgnvAi0fppqgQ=="
    },
    "node_modules/ts-node": {
      "version": "10.9.1",
@@ -485,11 +541,11 @@
      }
    },
    "node_modules/tsconfig-paths": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.1.0.tgz",
-      "integrity": "sha512-AHx4Euop/dXFC+Vx589alFba8QItjF+8hf8LtmuiCwHyI4rHXQtOOENaM8kvYf5fR0dRChy3wzWIZ9WbB7FWow==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz",
+      "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==",
      "dependencies": {
-        "json5": "^2.2.1",
+        "json5": "^2.2.2",
        "minimist": "^1.2.6",
        "strip-bom": "^3.0.0"
      },
@@ -498,31 +554,31 @@
      }
    },
    "node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
+      "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
    },
    "node_modules/typescript": {
-      "version": "4.8.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.2.tgz",
-      "integrity": "sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.3.tgz",
+      "integrity": "sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw==",
      "bin": {
        "tsc": "bin/tsc",
        "tsserver": "bin/tsserver"
      },
      "engines": {
-        "node": ">=4.2.0"
+        "node": ">=14.17"
      }
    },
    "node_modules/undici": {
-      "version": "5.19.1",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-5.19.1.tgz",
-      "integrity": "sha512-YiZ61LPIgY73E7syxCDxxa3LV2yl3sN8spnIuTct60boiiRaE1J8mNWHO8Im2Zi/sFrPusjLlmRPrsyraSqX6A==",
+      "version": "5.22.1",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-5.22.1.tgz",
+      "integrity": "sha512-Ji2IJhFXZY0x/0tVBXeQwgPlLWw13GVzpsWPQ3rV50IFMMof2I55PZZxtm4P6iNq+L5znYN9nSTAq0ZyE6lSJw==",
      "dependencies": {
        "busboy": "^1.6.0"
      },
      "engines": {
-        "node": ">=12.18"
+        "node": ">=14.0"
      }
    },
    "node_modules/util-deprecate": {
@@ -536,15 +592,15 @@
      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg=="
    },
    "node_modules/ws": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.1.tgz",
-      "integrity": "sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
+      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
      "engines": {
        "node": ">=10.0.0"
      },
      "peerDependencies": {
        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+        "utf-8-validate": ">=5.0.2"
      },
      "peerDependenciesMeta": {
        "bufferutil": {
@@ -574,34 +630,66 @@
      }
    },
    "@discordjs/builders": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-1.2.0.tgz",
-      "integrity": "sha512-ARy4BUTMU+S0ZI6605NDqfWO+qZqV2d/xfY32z3hVSsd9IaAKJBZ1ILTZLy87oIjW8+gUpQmk9Kt0ZP9bmmd8Q==",
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-1.6.3.tgz",
+      "integrity": "sha512-CTCh8NqED3iecTNuiz49mwSsrc2iQb4d0MjMdmS/8pb69Y4IlzJ/DIy/p5GFlgOrFbNO2WzMHkWKQSiJ3VNXaw==",
      "requires": {
-        "@sapphire/shapeshift": "^3.5.1",
-        "discord-api-types": "^0.37.3",
+        "@discordjs/formatters": "^0.3.1",
+        "@discordjs/util": "^0.3.1",
+        "@sapphire/shapeshift": "^3.8.2",
+        "discord-api-types": "^0.37.41",
        "fast-deep-equal": "^3.1.3",
-        "ts-mixer": "^6.0.1",
-        "tslib": "^2.4.0"
+        "ts-mixer": "^6.0.3",
+        "tslib": "^2.5.0"
      }
    },
    "@discordjs/collection": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-1.1.0.tgz",
-      "integrity": "sha512-PQ2Bv6pnT7aGPCKWbvvNRww5tYCGpggIQVgpuF9TdDPeR6n6vQYxezXiLVOS9z2B62Dp4c+qepQ15SgJbLYtCQ=="
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-1.5.1.tgz",
+      "integrity": "sha512-aWEc9DCf3TMDe9iaJoOnO2+JVAjeRNuRxPZQA6GVvBf+Z3gqUuWYBy2NWh4+5CLYq5uoc3MOvUQ5H5m8CJBqOA=="
+    },
+    "@discordjs/formatters": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@discordjs/formatters/-/formatters-0.3.1.tgz",
+      "integrity": "sha512-M7X4IGiSeh4znwcRGcs+49B5tBkNDn4k5bmhxJDAUhRxRHTiFAOTVUNQ6yAKySu5jZTnCbSvTYHW3w0rAzV1MA==",
+      "requires": {
+        "discord-api-types": "^0.37.41"
+      }
    },
    "@discordjs/rest": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@discordjs/rest/-/rest-1.1.0.tgz",
-      "integrity": "sha512-yCrthRTQeUyNThQEpCk7bvQJlwQmz6kU0tf3dcWBv2WX3Bncl41x7Wc+v5b5OsIxfNYq38PvVtWircu9jtYZug==",
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/@discordjs/rest/-/rest-1.7.1.tgz",
+      "integrity": "sha512-Ofa9UqT0U45G/eX86cURQnX7gzOJLG2oC28VhIk/G6IliYgQF7jFByBJEykPSHE4MxPhqCleYvmsrtfKh1nYmQ==",
      "requires": {
-        "@discordjs/collection": "^1.0.1",
+        "@discordjs/collection": "^1.5.1",
+        "@discordjs/util": "^0.3.0",
        "@sapphire/async-queue": "^1.5.0",
-        "@sapphire/snowflake": "^3.2.2",
-        "discord-api-types": "^0.37.3",
-        "file-type": "^17.1.6",
-        "tslib": "^2.4.0",
-        "undici": "^5.9.1"
+        "@sapphire/snowflake": "^3.4.2",
+        "discord-api-types": "^0.37.41",
+        "file-type": "^18.3.0",
+        "tslib": "^2.5.0",
+        "undici": "^5.22.0"
+      }
+    },
+    "@discordjs/util": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@discordjs/util/-/util-0.3.1.tgz",
+      "integrity": "sha512-HxXKYKg7vohx2/OupUN/4Sd02Ev3PBJ5q0gtjdcvXb0ErCva8jNHWfe/v5sU3UKjIB/uxOhc+TDOnhqffj9pRA=="
+    },
+    "@discordjs/ws": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/@discordjs/ws/-/ws-0.8.3.tgz",
+      "integrity": "sha512-hcYtppanjHecbdNyCKQNH2I4RP9UrphDgmRgLYrATEQF1oo4sYSve7ZmGsBEXSzH72MO2tBPdWSThunbxUVk0g==",
+      "requires": {
+        "@discordjs/collection": "^1.5.1",
+        "@discordjs/rest": "^1.7.1",
+        "@discordjs/util": "^0.3.1",
+        "@sapphire/async-queue": "^1.5.0",
+        "@types/ws": "^8.5.4",
+        "@vladfrangu/async_event_emitter": "^2.2.1",
+        "discord-api-types": "^0.37.41",
+        "tslib": "^2.5.0",
+        "ws": "^8.13.0"
      }
    },
    "@jridgewell/resolve-uri": {
@@ -629,18 +717,18 @@
      "integrity": "sha512-JkLdIsP8fPAdh9ZZjrbHWR/+mZj0wvKS5ICibcLrRI1j84UmLMshx5n9QmL8b95d4onJ2xxiyugTgSAX7AalmA=="
    },
    "@sapphire/shapeshift": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/@sapphire/shapeshift/-/shapeshift-3.6.0.tgz",
-      "integrity": "sha512-tu2WLRdo5wotHRvsCkspg3qMiP6ETC3Q1dns1Q5V6zKUki+1itq6AbhMwohF9ZcLoYqg+Y8LkgRRtVxxTQVTBQ==",
+      "version": "3.9.2",
+      "resolved": "https://registry.npmjs.org/@sapphire/shapeshift/-/shapeshift-3.9.2.tgz",
+      "integrity": "sha512-YRbCXWy969oGIdqR/wha62eX8GNHsvyYi0Rfd4rNW6tSVVa8p0ELiMEuOH/k8rgtvRoM+EMV7Csqz77YdwiDpA==",
      "requires": {
        "fast-deep-equal": "^3.1.3",
-        "lodash.uniqwith": "^4.5.0"
+        "lodash": "^4.17.21"
      }
    },
    "@sapphire/snowflake": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/@sapphire/snowflake/-/snowflake-3.2.2.tgz",
-      "integrity": "sha512-ula2O0kpSZtX9rKXNeQMrHwNd7E4jPDJYUXmEGTFdMRfyfMw+FPyh04oKMjAiDuOi64bYgVkOV3MjK+loImFhQ=="
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/@sapphire/snowflake/-/snowflake-3.5.1.tgz",
+      "integrity": "sha512-BxcYGzgEsdlG0dKAyOm0ehLGm2CafIrfQTZGWgkfKYbj+pNNsorZ7EotuZukc2MT70E0UbppVbtpBrqpzVzjNA=="
    },
    "@tokenizer/token": {
      "version": "0.3.0",
@@ -673,13 +761,18 @@
      "integrity": "sha512-Q5BPGyGKcvQgAMbsr7qEGN/kIPN6zZecYYABeTDBizOsau+2NMdSVTar9UQw21A2+JyA2KRNDYaYrPB0Rpk2oQ=="
    },
    "@types/ws": {
-      "version": "8.5.3",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz",
-      "integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==",
+      "version": "8.5.5",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz",
+      "integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==",
      "requires": {
        "@types/node": "*"
      }
    },
+    "@vladfrangu/async_event_emitter": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/@vladfrangu/async_event_emitter/-/async_event_emitter-2.2.2.tgz",
+      "integrity": "sha512-HIzRG7sy88UZjBJamssEczH5q7t5+axva19UbZLO6u0ySbYPrwzWiXBcC0WuHyhKKoeCyneH+FvYzKQq/zTtkQ=="
+    },
    "acorn": {
      "version": "8.7.1",
      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
@@ -714,32 +807,35 @@
      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="
    },
    "discord-api-types": {
-      "version": "0.37.7",
-      "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.37.7.tgz",
-      "integrity": "sha512-aQEx4JP1wYn6vRsPsIuVdcQq9hB1EAw9vnQFtuciI3Uqgis0CP/hfJxDkY+hOoAwq6vcCl8kWuMoMK50agCg9w=="
+      "version": "0.37.45",
+      "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.37.45.tgz",
+      "integrity": "sha512-r9m/g+YQfo7XWMrl645jvMlYoWF8lvns/ch4NCxsz/FbingrECu97LFSD2zKOvgHaSc90BHP8wgshaMcA2/c6Q=="
    },
    "discord.js": {
-      "version": "14.3.0",
-      "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-14.3.0.tgz",
-      "integrity": "sha512-CpIwoAAuELiHSgVKRMzsCADS6ZlJwAZ9RlvcJYdEgS00aW36dSvXyBgE+S3pigkc7G+jU6BEalMUWIJFveqrBQ==",
+      "version": "14.11.0",
+      "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-14.11.0.tgz",
+      "integrity": "sha512-CkueWYFQ28U38YPR8HgsBR/QT35oPpMbEsTNM30Fs8loBIhnA4s70AwQEoy6JvLcpWWJO7GY0y2BUzZmuBMepQ==",
      "requires": {
-        "@discordjs/builders": "^1.2.0",
-        "@discordjs/collection": "^1.1.0",
-        "@discordjs/rest": "^1.1.0",
-        "@sapphire/snowflake": "^3.2.2",
-        "@types/ws": "^8.5.3",
-        "discord-api-types": "^0.37.3",
+        "@discordjs/builders": "^1.6.3",
+        "@discordjs/collection": "^1.5.1",
+        "@discordjs/formatters": "^0.3.1",
+        "@discordjs/rest": "^1.7.1",
+        "@discordjs/util": "^0.3.1",
+        "@discordjs/ws": "^0.8.3",
+        "@sapphire/snowflake": "^3.4.2",
+        "@types/ws": "^8.5.4",
+        "discord-api-types": "^0.37.41",
        "fast-deep-equal": "^3.1.3",
        "lodash.snakecase": "^4.1.1",
-        "tslib": "^2.4.0",
-        "undici": "^5.9.1",
-        "ws": "^8.8.1"
+        "tslib": "^2.5.0",
+        "undici": "^5.22.0",
+        "ws": "^8.13.0"
      }
    },
    "dotenv": {
-      "version": "16.0.2",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.2.tgz",
-      "integrity": "sha512-JvpYKUmzQhYoIFgK2MOnF3bciIZoItIIoryihy0rIA+H4Jy0FmgyKYAHCTN98P5ybGSJcIFbh6QKeJdtZd1qhA=="
+      "version": "16.3.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.0.tgz",
+      "integrity": "sha512-tHB+hmf8MRCkT3VVivGiG8kq9HiGTmQ3FzOKgztfpJQH1IWuZTOvKSJmHNnQPowecAmkCJhLrxdPhOr06LLqIQ=="
    },
    "fast-deep-equal": {
      "version": "3.1.3",
@@ -747,13 +843,13 @@
      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
    },
    "file-type": {
-      "version": "17.1.6",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-17.1.6.tgz",
-      "integrity": "sha512-hlDw5Ev+9e883s0pwUsuuYNu4tD7GgpUnOvykjv1Gya0ZIjuKumthDRua90VUn6/nlRKAjcxLUnHNTIUWwWIiw==",
+      "version": "18.5.0",
+      "resolved": "https://registry.npmjs.org/file-type/-/file-type-18.5.0.tgz",
+      "integrity": "sha512-yvpl5U868+V6PqXHMmsESpg6unQ5GfnPssl4dxdJudBrr9qy7Fddt7EVX1VLlddFfe8Gj9N7goCZH22FXuSQXQ==",
      "requires": {
        "readable-web-to-node-stream": "^3.0.2",
-        "strtok3": "^7.0.0-alpha.9",
-        "token-types": "^5.0.0-alpha.2"
+        "strtok3": "^7.0.0",
+        "token-types": "^5.0.1"
      }
    },
    "ieee754": {
@@ -771,16 +867,16 @@
      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
    },
+    "lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    },
    "lodash.snakecase": {
      "version": "4.1.1",
      "resolved": "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz",
      "integrity": "sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw=="
    },
-    "lodash.uniqwith": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniqwith/-/lodash.uniqwith-4.5.0.tgz",
-      "integrity": "sha512-7lYL8bLopMoy4CTICbxygAUq6CdRJ36vFc80DucPueUee+d5NBRxz3FdT9Pes/HEx5mPoT9jwnsEJWz1N7uq7Q=="
-    },
    "make-error": {
      "version": "1.3.6",
      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
@@ -797,9 +893,9 @@
      "integrity": "sha512-YtCKvLUOvwtMGmrniQPdO7MwPjgkFBtFIrmfSbYmYuq3tKDV/mcfAhBth1+C3ru7uXIZasc/pHnb+YDYNkkj4A=="
    },
    "readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
      "requires": {
        "inherits": "^2.0.3",
        "string_decoder": "^1.1.1",
@@ -847,9 +943,9 @@
      }
    },
    "tiny-invariant": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.2.0.tgz",
-      "integrity": "sha512-1Uhn/aqw5C6RI4KejVeTg6mIS7IqxnLJ8Mv2tV5rTc0qWobay7pDUz6Wi392Cnc8ak1H0F2cjoRzb2/AW4+Fvg=="
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz",
+      "integrity": "sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw=="
    },
    "token-types": {
      "version": "5.0.1",
@@ -861,9 +957,9 @@
      }
    },
    "ts-mixer": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ts-mixer/-/ts-mixer-6.0.1.tgz",
-      "integrity": "sha512-hvE+ZYXuINrx6Ei6D6hz+PTim0Uf++dYbK9FFifLNwQj+RwKquhQpn868yZsCtJYiclZF1u8l6WZxxKi+vv7Rg=="
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/ts-mixer/-/ts-mixer-6.0.3.tgz",
+      "integrity": "sha512-k43M7uCG1AkTyxgnmI5MPwKoUvS/bRvLvUb7+Pgpdlmok8AoqmUaZxUUw8zKM5B1lqZrt41GjYgnvAi0fppqgQ=="
    },
    "ts-node": {
      "version": "10.9.1",
@@ -886,29 +982,29 @@
      }
    },
    "tsconfig-paths": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.1.0.tgz",
-      "integrity": "sha512-AHx4Euop/dXFC+Vx589alFba8QItjF+8hf8LtmuiCwHyI4rHXQtOOENaM8kvYf5fR0dRChy3wzWIZ9WbB7FWow==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz",
+      "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==",
      "requires": {
-        "json5": "^2.2.1",
+        "json5": "^2.2.2",
        "minimist": "^1.2.6",
        "strip-bom": "^3.0.0"
      }
    },
    "tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
+      "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
    },
    "typescript": {
-      "version": "4.8.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.2.tgz",
-      "integrity": "sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw=="
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.3.tgz",
+      "integrity": "sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw=="
    },
    "undici": {
-      "version": "5.19.1",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-5.19.1.tgz",
-      "integrity": "sha512-YiZ61LPIgY73E7syxCDxxa3LV2yl3sN8spnIuTct60boiiRaE1J8mNWHO8Im2Zi/sFrPusjLlmRPrsyraSqX6A==",
+      "version": "5.22.1",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-5.22.1.tgz",
+      "integrity": "sha512-Ji2IJhFXZY0x/0tVBXeQwgPlLWw13GVzpsWPQ3rV50IFMMof2I55PZZxtm4P6iNq+L5znYN9nSTAq0ZyE6lSJw==",
      "requires": {
        "busboy": "^1.6.0"
      }
@@ -924,9 +1020,9 @@
      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg=="
    },
    "ws": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.1.tgz",
-      "integrity": "sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
+      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
      "requires": {}
    },
    "yn": {
--- a/discord-bot/package.json
+++ b/discord-bot/package.json
@@ -7,13 +7,13 @@
    "typecheck": "tsc --noEmit"
  },
  "dependencies": {
-    "@discordjs/rest": "^1.1.0",
-    "discord-api-types": "^0.37.7",
-    "discord.js": "^14.3.0",
-    "dotenv": "^16.0.2",
-    "tiny-invariant": "^1.2.0",
+    "@discordjs/rest": "^1.7.1",
+    "discord-api-types": "^0.37.45",
+    "discord.js": "^14.11.0",
+    "dotenv": "^16.3.0",
+    "tiny-invariant": "^1.3.1",
    "ts-node": "^10.9.1",
-    "tsconfig-paths": "^4.1.0",
-    "typescript": "^4.8.2"
+    "tsconfig-paths": "^4.2.0",
+    "typescript": "^5.1.3"
  }
 }
--- a/migrations/028-user-changes.js
+++ b/migrations/028-user-changes.js
@@ -0,0 +1,6 @@
+module.exports.up = function (db) {
+  db.prepare(/* sql */ `alter table "User" add "discordUniqueName" text`).run();
+  db.prepare(
+    /* sql */ `alter table "User" add "showDiscordUniqueName" integer not null default 1`
+  ).run();
+};
--- a/public/locales/en/user.json
+++ b/public/locales/en/user.json
@@ -31,6 +31,8 @@
  "forms.errors.invalidCustomUrl.duplicate": "Someone is already using this custom URL",
  "forms.errors.invalidSens": "Motion sens can't be set if R-stick sens isn't",
  "forms.info.favoriteBadge": "Your favorite badge is shown as big by default on your profile.",
+  "forms.showDiscordUniqueName": "Show Discord username",
+  "forms.showDiscordUniqueName.info": "Show your unique Discord name ({{discordUniqueName}}) publicly?",

  "search.info": "Search for users by Discord, Splatoon 3 or Twitter name",
  "search.noResults": "No users found matching '{{query}}'"