compartible with discord's new username system

src/client/Client.ts

@@ -5,6 +5,7 @@ import { MovCommand } from './Command';
 import { MovPlugin } from './Plugin';
 import { Collection } from '@discordjs/collection';
 import { ISettingsDB, IUserDB } from '../interfaces/database';
+import { parseName } from '../utils/get';
 
 export interface ClientDatabase {
  level: MovDB
@@ -229,7 +230,7 @@ class Mov extends CommandClient {
  }
 
  this.on("ready", () => {
- console.log(`Logged as ${this.user.username}#${this.user.discriminator}!`);
+ console.log(`Logged as ${parseName(this.user)}!`);
  })
  }
 }

src/commands/level/removeuserxp.ts

@@ -1,7 +1,7 @@
 import { Message, TextChannel } from "eris";
 import { client } from "../../client/Client";
 import { MovCommand } from "../../client/Command";
-import { getUser } from "../../utils/get";
+import { getUser, parseName } from "../../utils/get";
 import { MessageCollector } from "eris-collect";
 async function generator(msg: Message, args: string[]) {
  if (!isNaN(Number(args[0]))) {
@@ -33,7 +33,7 @@ async function generator(msg: Message, args: string[]) {
  });
  client.createMessage(
  msg.channel.id,
- `Are you sure you want to remove **${user.username}#${user.discriminator}**'s level? [Type 'yes' or 'y' to confirm]`,
+ `Are you sure you want to remove **${parseName(user)}**'s level? [Type 'yes' or 'y' to confirm]`,
  );
  collector.on("end", (c) => {
  const msg = c[0];

src/utils/canvas.ts

@@ -10,7 +10,7 @@ import { Message, User } from "eris";
 import { ILevelDB, IUserDB } from "../interfaces/database";
 import { client } from "../client/Client";
 import { getLeaderboardRank } from "./getLeaderboardRank";
-import { getUserByID } from "./get";
+import { getUserByID, parseName } from "./get";
 import { DEFAULT_USER_SETTINGS } from "../constant/defaultConfig";
 
 registerFont("./assets/Roboto-Bold.ttf", {
@@ -177,7 +177,7 @@ export async function genXPRank(user: User, level: ILevelDB): Promise<Buffer> {
 
  ctx.globalAlpha = 1;
 
- const name = `${user.username}#${user.discriminator}`;
+ const name = parseName(user);
 
  await genAvatar(ctx, user, 40, canvas.height / 2 - 60, true);
 
@@ -254,7 +254,7 @@ async function leaderboardContent(
  ctx.closePath();
 
  const u = await getUserByID(entry.id, true);
- const name = u ? `${u.username}#${u.discriminator}` : entry.id;
+ const name = u ? parseName(u) : entry.id;
 
  ctx.fillStyle = labels.text.mocha.hex;
  ctx.font = "16px 'RobotoB'";
@@ -352,7 +352,7 @@ export async function leaderboardCanvas(
 
  ctx.globalCompositeOperation = "difference";
  ctx.fillStyle = "#ffffff";
- const name = `${msg.author.username}#${msg.author.discriminator}`;
+ const name = parseName(msg.author);
  let size = 16;
  let nameN = ctx.measureText(name);
  while (nameN.width > 200) {
@@ -368,8 +368,7 @@ export async function leaderboardCanvas(
 
  ctx.fillStyle = "#ffffff";
  ctx.fillText(
- `Level ${
- yourRank.data.level
+ `Level ${yourRank.data.level
  } | Total XP: ${yourRank.data.totalxp.toLocaleString()}`,
  280,
  positionI,

src/utils/get.ts

@@ -10,6 +10,15 @@ export async function getUserByID(id: string, cacheOnly?: boolean) {
  }
 }
 
+// Dynamically use discriminator or Discord's new username system
+export function parseName(user: User) {
+ if (user.discriminator.length === 1) {
+ return user.username
+ } else {
+ return `${user.username}#${user.discriminator}`
+ }
+}
+
 export async function getGuildByID(id: string) {
  const cache = client.guilds.get(id);
  if (!cache) {

src/utils/greeting.ts

@@ -1,6 +1,7 @@
 import { Guild, Member, MemberPartial } from "eris";
 import { client } from "../client/Client";
 import { ISettingsDB } from "../interfaces/database";
+import { parseName } from "./get";
 
 export async function greeting(
  type: "w" | "g",
@@ -29,16 +30,16 @@ export async function greeting(
  let content = !w.message
  ? "Hello {mention} and welcome to the server! We now have {memberCount}!"
  : w.message
-  .replace("{server}", guild.name)
-  .replace("{memberCount}", guild.memberCount.toString())
-  .replace(
-  "{name}",
-  `${member.user.username}#${member.user.discriminator}`,
-  )
-  .replace(
-  "{user}",
-  `${member.user.username}#${member.user.discriminator}`,
-  );
+ .replace("{server}", guild.name)
+ .replace("{memberCount}", guild.memberCount.toString())
+ .replace(
+ "{name}",
+ parseName(member.user),
+ )
+ .replace(
+ "{user}",
+ parseName(member.user),
+ );
 
  if (type === "w") {
  content = content.replace("{mention}", `<@${member.id}>`);

src/utils/levelUtils.ts

@@ -1,7 +1,7 @@
 import { Message } from "eris";
 import { client } from "../client/Client";
 import { ILevelDB, ISettingsDB, IUserDB } from "../interfaces/database";
-import { getMemberByID } from "./get";
+import { getMemberByID, parseName } from "./get";
 import { probability } from "./math";
 
 export function formulaXP(level: number) {
@@ -17,7 +17,7 @@ export async function sendLvlUP(user: string, msg: Message, level: ILevelDB) {
 
  let target = `<@${user}>`;
  if (userPref?.noMentionOnLevelUP) {
- target = `**${msg.author.username}#${msg.author.discriminator}**`;
+ target = `**${parseName(msg.author)}**`;
  }
 
  const roleRewards = levelDB.modules.level.roleRewards;