General improvement

src/commands/discord/leaderboard.ts

@@ -36,6 +36,13 @@ export class leaderboardCommand extends baseCommand {
           username: true,
           points: true
         },
+        where: {
+          username: {
+            not: {
+              contains: "Deleted Account"
+            }
+          }
+        },
         orderBy: {
           points: 'desc'
         },

src/core/DiscordClient.ts

@@ -36,6 +36,7 @@ export class DiscordClient extends Client implements baseClient {
   events;
   twitch: TwitchClient;
   youtube: YoutubeClient;
+  trimCommitHash: string;
 
   constructor() {
     super({
@@ -55,6 +56,11 @@ export class DiscordClient extends Client implements baseClient {
       ]
     });
 
+    // Initalize fields
+    this.trimCommitHash = process.env['COMMITHASH'] ?? "???";
+    if(this.trimCommitHash && this.trimCommitHash.length > 7)
+      this.trimCommitHash = this.trimCommitHash.substring(0, 7);
+
     // Initalize components
     this.logger = new eventLogger(this);
     this.redis = new Redis((process.env["ISDOCKER"] && !process.env["REDIS_CONN"]) ?
@@ -130,15 +136,10 @@ export class DiscordClient extends Client implements baseClient {
   }
 
   public updateStatus() {
-    // Get and trim the commit hash
-    let commitHash = process.env['COMMITHASH'];
-    if(commitHash && commitHash.length > 7)
-      commitHash = commitHash.substring(0, 7);
-
     this.user?.setPresence({
       status: "online",
       activities: [{
-        name: `${this.guilds.cache.find(g=>g.id===this.config.guildID)?.memberCount} cuties :Þ | ver ${commitHash ?? "???"}`,
+        name: `${this.guilds.cache.find(g=>g.id===this.config.guildID)?.memberCount} cuties :Þ | ver ${this.trimCommitHash}`,
         type: ActivityType.Watching,
       }],
     });

src/core/helper/eventLogger.ts

@@ -67,7 +67,7 @@ export class eventLogger {
       .setDescription(log.message)
       .setColor(this.EmbedColor(log.type))
       .setTimestamp()
-      .setFooter({text: "Internal Report System"});
+      .setFooter({text: `Internal Report System | ver ${this.client.trimCommitHash}`});
 
     // Add the metadata if it exists
     if(log.metadata)

src/index.ts

@@ -40,10 +40,21 @@ CoreClient
  * Handle cleanups
  */
 async function quitSignalHandler() {
+  // Log initial shutdown message
+  await CoreClient.logger.sendLog({
+    type: "Info",
+    message: "Shutdown Initiated... View logs for shutdown completion."
+  });
+  console.log("Shutdown Initiated...");
+
+  // Perform cleanup
   await CoreClient.dispose();
   await CoreClient.twitch.dispose();
   await CoreClient.youtube.dispose();
   await flush(15000);
+
+  // Complete the shutdown
+  console.log("Shutdown Complete!");
   process.exit(0);
 }