minor refactors

mlomb · Nov 22, 2023 · cd99f45 · cd99f45
1 parent 2f302e1
commit cd99f45
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/pipeline/parse/parsers/DiscordParser.ts b/pipeline/parse/parsers/DiscordParser.ts
@@ -102,7 +102,7 @@ export class DiscordParser extends Parser {
         const pauthor: PAuthor = {
             id: message.author.id,
             bot: message.author.isBot,
-            name: name,
+            name,
             avatar: avatar ? (" " + avatar).substring(1) : undefined, // avoid leak
         };
         this.emit("author", pauthor, this.lastMessageTimestampInFile);

diff --git a/report/components/core/labels/AuthorLabel.tsx b/report/components/core/labels/AuthorLabel.tsx
@@ -18,14 +18,16 @@ const _AuthorLabel = ({ index }: LabelProps) => {
 
     // add discriminator in Discord
     if (db.config.platform === "discord") {
-        const discr = author.n.split("#").pop();
+        const parts = author.n.split("#");
+        const nick = parts[0];
+        const discr: string | undefined = parts[1];
 
         // only keep if it's 4 chars (and not a deleted ID)
-        if (discr && discr.length === 4) {
+        if (!isDemo && discr && discr.length === 4) {
             name = (
                 <>
-                    {author.n.slice(0, -5)}
-                    <span className="Label__discriminator">#{`${isDemo ? "0000" : discr}`}</span>
+                    {nick}
+                    <span className="Label__discriminator">#{discr}</span>
                 </>
             );
         }