feat: handle discord username changes

hyperbeam · May 10, 2023 · 6af8c2e · 6af8c2e
1 parent 33b9aa7
commit 6af8c2e
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 5 deletions.
diff --git a/bot/classes/discord.ts b/bot/classes/discord.ts
@@ -17,7 17,7 @@ type BasicUser = {
  id: string;
  avatar: string | null;
  username: string;
- discriminator: string;
  discriminator: string | null;
 };
 
 type AuthorizedUserData = BasicUser & { token: string };

diff --git a/bot/classes/sessions.ts b/bot/classes/sessions.ts
@@ -62,10 62,12 @@ export async function authenticateUser(
  member.isAuthenticated = true;
  member.id = user.id;
  member.color = color(user.id) || swatches[Math.floor(Math.random() * swatches.length)];
- member.name = user.username   "#"   user.discriminator;
  member.name = `${user.username}${
  user.discriminator ? (user.discriminator === "0" ? "" : `#${user.discriminator}`) : ""
  }`;
  member.avatarUrl = user.avatar
  ? `https://cdn.discordapp.com/avatars/${user.id}/${user.avatar}.png`
- : `https://cdn.discordapp.com/embed/avatars/${ user.discriminator % 5}.png`;
  : `https://cdn.discordapp.com/embed/avatars/${parseInt(user.id) % 5}.png`;
  }
  if (!member) throw new ServerError(401, "Could not authenticate user");
  ctx.client.userData = member;

diff --git a/bot/index.ts b/bot/index.ts
@@ -50,7 50,12 @@ creator.on("error", (error) => console.error(error));
 creator.on("synced", () => console.info("Commands synced!"));
 creator.on("commandRun", (command, _, ctx) => {
  updateUser(ctx.user);
- console.info(`${ctx.user.username}#${ctx.user.discriminator} (${ctx.user.id}) ran command ${command.commandName}`);
  const { id, username, discriminator } = ctx.user;
  console.info(
  `${username}${discriminator ? (discriminator === "0" ? "" : `#${discriminator}`) : ""} (${id}) ran command ${
  command.commandName
  }`,
  );
 });
 creator.on("commandRegister", (command) => console.info(`Registered command ${command.commandName}`));
 creator.on("commandError", (command, error) => console.error(`Command ${command.commandName}:`, error));

diff --git a/bot/prisma/migrations/20230510193702_updated_discriminator_to_be_optional/migration.sql b/bot/prisma/migrations/20230510193702_updated_discriminator_to_be_optional/migration.sql
@@ -0,0 1,21 @@
 -- RedefineTables
 PRAGMA foreign_keys=OFF;
 CREATE TABLE "new_User" (
  "id" TEXT NOT NULL PRIMARY KEY,
  "hash" TEXT,
  "email" TEXT,
  "avatar" TEXT,
  "username" TEXT NOT NULL,
  "discriminator" TEXT,
  "accessToken" TEXT,
  "refreshToken" TEXT,
  "updatedAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP
 );
 INSERT INTO "new_User" ("accessToken", "avatar", "discriminator", "email", "hash", "id", "refreshToken", "updatedAt", "username") SELECT "accessToken", "avatar", "discriminator", "email", "hash", "id", "refreshToken", "updatedAt", "username" FROM "User";
 DROP TABLE "User";
 ALTER TABLE "new_User" RENAME TO "User";
 CREATE UNIQUE INDEX "User_id_key" ON "User"("id");
 CREATE UNIQUE INDEX "User_hash_key" ON "User"("hash");
 CREATE UNIQUE INDEX "User_email_key" ON "User"("email");
 PRAGMA foreign_key_check;
 PRAGMA foreign_keys=ON;
diff --git a/bot/prisma/schema.prisma b/bot/prisma/schema.prisma
@@ -13,7 13,7 @@ model User {
  email String? @unique
  avatar String?
  username String
- discriminator String
  discriminator String?
  accessToken String? // keep serverside only
  refreshToken String? // keep serverside only
  ownedSessions Session[] @relation("owner")