feat: new username support

backend/src/data/GuildArchives.ts

@@ -3,7 +3,7 @@ import moment from "moment-timezone";
 import { isDefaultSticker } from "src/utils/isDefaultSticker";
 import { Repository, getRepository } from "typeorm";
 import { TemplateSafeValueContainer, renderTemplate } from "../templateFormatter";
-import { trimLines } from "../utils";
+import { renderUsername, trimLines } from "../utils";
 import { decrypt, encrypt } from "../utils/crypt";
 import { channelToTemplateSafeChannel, guildToTemplateSafeGuild } from "../utils/templateSafeObjects";
 import { BaseGuildRepository } from "./BaseGuildRepository";
@@ -16,7 +16,7 @@ const MESSAGE_ARCHIVE_HEADER_FORMAT = trimLines(`
   Server: {guild.name} ({guild.id})
 `);
 const MESSAGE_ARCHIVE_MESSAGE_FORMAT =
-  "[#{channel.name}] [{user.id}] [{timestamp}] {user.username}#{user.discriminator}: {content}{attachments}{stickers}";
+  "[#{channel.name}] [{user.id}] [{timestamp}] {username}: {content}{attachments}{stickers}";
 
 export class GuildArchives extends BaseGuildRepository<ArchiveEntry> {
   protected archives: Repository<ArchiveEntry>;
@@ -97,6 +97,7 @@ export class GuildArchives extends BaseGuildRepository<ArchiveEntry> {
           }),
           user: partialUser,
           channel: channel ? channelToTemplateSafeChannel(channel) : null,
+          username: renderUsername(msg.data.author.username, msg.data.author.discriminator),
         }),
       );
 

backend/src/plugins/Automod/functions/matchMultipleTextTypesOnMessage.ts

@@ -1,7 +1,7 @@
 import { ActivityType, Embed } from "discord.js";
 import { GuildPluginData } from "knub";
 import { SavedMessage } from "../../../data/entities/SavedMessage";
-import { resolveMember } from "../../../utils";
+import { renderUsername, resolveMember } from "../../../utils";
 import { DeepMutable } from "../../../utils/typeUtils.js";
 import { AutomodPluginType } from "../types";
 
@@ -46,7 +46,7 @@ export async function* matchMultipleTextTypesOnMessage(
   }
 
   if (trigger.match_usernames) {
-    yield ["username", `${msg.data.author.username}#${msg.data.author.discriminator}`];
+    yield ["username", renderUsername(msg.data.author.username, msg.data.author.discriminator)];
   }
 
   if (trigger.match_nicknames && member.nickname) {

backend/src/plugins/ChannelArchiver/commands/ArchiveChannelCmd.ts

@@ -2,7 +2,7 @@ import { Snowflake } from "discord.js";
 import moment from "moment-timezone";
 import { commandTypeHelpers as ct } from "../../../commandTypes";
 import { isOwner, sendErrorMessage } from "../../../pluginUtils";
-import { SECONDS, confirm, noop } from "../../../utils";
+import { SECONDS, confirm, noop, renderUsername } from "../../../utils";
 import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin";
 import { rehostAttachment } from "../rehostAttachment";
 import { channelArchiverCmd } from "../types";
@@ -68,9 +68,10 @@ export const ArchiveChannelCmd = channelArchiverCmd({
 
       for (const message of messages.values()) {
         const ts = moment.utc(message.createdTimestamp).format("YYYY-MM-DD HH:mm:ss");
-        let content = `[${ts}] [${message.author.id}] [${message.author.username}#${message.author.discriminator}]: ${
-          message.content || "<no text content>"
-        }`;
+        let content = `[${ts}] [${message.author.id}] [${renderUsername(
+          message.author.username,
+          message.author.discriminator,
+        )}]: ${message.content || "<no text content>"}`;
 
         if (message.attachments.size) {
           if (args["attachment-channel"]) {

backend/src/plugins/Utility/functions/getUserInfoEmbed.ts

@@ -7,6 +7,7 @@ import {
   EmbedWith,
   messageLink,
   preEmbedPadding,
+  renderUsername,
   resolveMember,
   resolveUser,
   sorter,
@@ -43,7 +44,7 @@ export async function getUserInfoEmbed(
   const timeAndDate = pluginData.getPlugin(TimeAndDatePlugin);
 
   embed.author = {
-    name: `${user.bot ? "Bot" : "User"}:  ${user.tag}`,
+    name: `${user.bot ? "Bot" : "User"}:  ${renderUsername(user.username, user.discriminator)}`,
   };
 
   const avatarURL = user.displayAvatarURL();
@@ -89,14 +90,16 @@ export async function getUserInfoEmbed(
     return embed;
   }
 
+  const userInfoLines = [`ID: \`${user.id}\``, `Username: **${user.username}**`];
+  if (user.discriminator !== "0") {
+    userInfoLines.push(`Discriminator: **${user.discriminator}**`);
+  }
+  userInfoLines.push(`Created: **${accountAge} ago** (\`${prettyCreatedAt}\`)`);
+  userInfoLines.push(`Mention: <@!${user.id}>`);
+
   embed.fields.push({
     name: preEmbedPadding + `${user.bot ? "Bot" : "User"} information`,
-    value: trimLines(`
-        Name: **${user.tag}**
-        ID: \`${user.id}\`
-        Created: **${accountAge} ago** (\`${prettyCreatedAt}\`)
-        Mention: <@!${user.id}>
-        `),
+    value: userInfoLines.join("\n"),
   });
 
   if (member) {

backend/src/utils.ts

@@ -1602,3 +1602,10 @@ export function isTruthy<T>(value: T): value is Exclude<T, false | null | undefi
 }
 
 export const DBDateFormat = "YYYY-MM-DD HH:mm:ss";
+
+export function renderUsername(username: string, discriminator: string) {
+  if (discriminator === "0") {
+    return username;
+  }
+  return `${username}#${discriminator}`;
+}