Merge branch 'main' of github.com:uwcsc/codeybot into Issue495

Author: davidgan1218

src/commandDetails/admin/ban.ts

@@ -1,14 +1,18 @@
-import { CodeyUserError } from './../../codeyUserError';
 import { container } from '@sapphire/framework';
-import { PermissionsBitField, User } from 'discord.js';
+import { EmbedBuilder, PermissionsBitField, TextChannel, User } from 'discord.js';
 import {
   CodeyCommandDetails,
   CodeyCommandOptionType,
   SapphireMessageExecuteType,
+  getUserFromMessage,
 } from '../../codeyCommand';
 import { banUser } from '../../components/admin';
 import { vars } from '../../config';
+import { DEFAULT_EMBED_COLOUR } from '../../utils/embeds.js';
 import { pluralize } from '../../utils/pluralize';
+import { CodeyUserError } from './../../codeyUserError';
+
+const NOTIF_CHANNEL_ID: string = vars.NOTIF_CHANNEL_ID;
 
 // Ban a user
 const banExecuteCommand: SapphireMessageExecuteType = async (client, messageFromUser, args) => {
@@ -35,6 +39,25 @@ const banExecuteCommand: SapphireMessageExecuteType = async (client, messageFrom
     // get Guild object corresponding to server
     const guild = await client.guilds.fetch(vars.TARGET_GUILD_ID);
     if (await banUser(guild, user, reason, days)) {
+      const mod = getUserFromMessage(messageFromUser);
+      const banEmbed = new EmbedBuilder()
+        .setTitle('Ban')
+        .setColor(DEFAULT_EMBED_COLOUR)
+        .addFields([
+          { name: 'User', value: `${user.tag} (${user.id})` },
+          {
+            name: 'Banned By',
+            value: `${mod.tag} (${mod.id})`,
+          },
+          { name: 'Reason', value: reason },
+          {
+            name: 'Messages Purged',
+            value: !days ? 'None' : `Past ${days} ${pluralize('day', days)}`,
+          },
+        ]);
+      (client.channels.cache.get(NOTIF_CHANNEL_ID) as TextChannel).send({
+        embeds: [banEmbed],
+      });
       return `Successfully banned user ${user.tag} (id: ${user.id}) ${
         days ? `and deleted their messages in the past ${days} ${pluralize('day', days)} ` : ``
       }for the following reason: ${reason}`;

src/commandDetails/coin/leaderboard.ts

@@ -1,5 +1,5 @@
 import { container, SapphireClient } from '@sapphire/framework';
-import { EmbedBuilder, User } from 'discord.js';
+import { EmbedBuilder } from 'discord.js';
 import {
   CodeyCommandDetails,
   getUserFromMessage,
@@ -36,17 +36,12 @@ const getCoinLeaderboardEmbed = async (
       leaderboard = await getCoinLeaderboard(LEADERBOARD_LIMIT_FETCH, offset);
       i = 0;
     }
-    if (leaderboard.length === 0) {
+    if (i >= leaderboard.length) {
       break;
     }
     const userCoinEntry = leaderboard[i++];
-    let user: User;
-    try {
-      user = await client.users.fetch(userCoinEntry.user_id);
-    } catch (e) {
-      continue;
-    }
-    if (user.bot) continue;
+    const user = await client.users.fetch(userCoinEntry.user_id).catch(() => null);
+    if (user?.bot) continue;
     if (previousBalance === userCoinEntry.balance) {
       previousBalance = userCoinEntry.balance;
       // rank does not change
@@ -60,18 +55,7 @@ const getCoinLeaderboardEmbed = async (
       position = rank;
     }
     if (leaderboardArray.length < LEADERBOARD_LIMIT_DISPLAY) {
-      const userTag = user?.tag ?? '<unknown>';
-      const cleanUserTag = userTag
-        .split('~')
-        .join('\\~')
-        .split('*')
-        .join('\\*')
-        .split('_')
-        .join('\\_')
-        .split('`')
-        .join('\\`');
-      // added a "\\" below in ${rank}\\. ${cleanUserTag} so that Markdown does not automatically increment by 1 each time
-      const userCoinEntryText = `${rank}\\. ${cleanUserTag} - ${
+      const userCoinEntryText = `${rank}\\. <@${userCoinEntry.user_id}> - ${
         userCoinEntry.balance
       } ${getCoinEmoji()}`;
       leaderboardArray.push(userCoinEntryText);