Better Embeds, Pardons + Purges

README.md

@@ -1,9 +1,11 @@
-# Chubby
-Discord moderation bot for Pretendo
+![Chubby Banner](./src/images/misc/chubby-banner.png)
+---
+Chubby, the official Pretendo Network Discord moderation bot.
 
-Features:
-
-- `/warn` command for warning users. Supports multiple users per warning. 3 warnings results in a kick. 4 warnings results in a ban
-- `/kick` command for kicking users. Supports multiple users per kick. 3 kicks results in a ban
-- `/ban` command for banning users. Supports multiple users per warning
-- NSFW content detection
+Chubby can:
+- Detect and remove NSFW content
+- Warn, kick, and ban multiple users at once
+- Pardon warns and kicks from multiple users
+- Purge messages from a channel or from a specified user
+- Log user and moderation events
+- Remove Discord polls

src/bot.js

@@ -1,6 +1,8 @@
 const Discord = require('discord.js');
 const guildMemberRemoveHandler = require('./events/guildMemberRemove');
 const guildMemberUpdateHandler = require('./events/guildMemberUpdate');
+const guildMemberAddHandler = require('./events/guildMemberAdd');
+const guildBanRemoveHandler = require('./events/guildBanRemove');
 const interactionCreateHandler = require('./events/interactionCreate');
 const messageCreateHandler = require('./events/messageCreate');
 const messageDeleteHandler = require('./events/messageDelete');
@@ -13,6 +15,7 @@ const client = new Discord.Client({
 		Discord.Intents.FLAGS.GUILDS,
 		Discord.Intents.FLAGS.GUILD_MESSAGES,
 		Discord.Intents.FLAGS.GUILD_MEMBERS,
+		Discord.Intents.FLAGS.GUILD_BANS,
 	]
 });
 
@@ -21,6 +24,8 @@ client.commands = new Discord.Collection();
 client.on('ready', readyHandler);
 client.on('guildMemberRemove', guildMemberRemoveHandler);
 client.on('guildMemberUpdate', guildMemberUpdateHandler);
+client.on('guildMemberAdd', guildMemberAddHandler);
+client.on('guildBanRemove', guildBanRemoveHandler);
 client.on('interactionCreate', interactionCreateHandler);
 client.on('messageCreate', messageCreateHandler);
 client.on('messageDelete', messageDeleteHandler);

src/check-nsfw.js

@@ -150,8 +150,9 @@ async function punishUserNSFW(message, suspectedUrls, suspectedFiles, prediction
 		console.log('Missing NSFW log channel!');
 	} else {
 		const embed = new Discord.MessageEmbed();
-		embed.setTitle(`Suspected NSFW Material sent by ${message.author.tag}`);
-		embed.setColor(0xffa500);
+		embed.setTitle('_NSFW Blocked_');
+		embed.setDescription(`Suspected NSFW Material sent by ${message.author.tag}`);
+		embed.setColor(0xdf005d);
 		embed.addFields([
 			{
 				name: 'Suspected URLs',

src/commands/ban.js

@@ -21,19 +21,33 @@ async function banHandler(interaction) {
 	const userIds = [...new Set(Array.from(users.matchAll(Discord.MessageMentions.USERS_PATTERN), match => match[1]))];
 
 	const bansListEmbed = new Discord.MessageEmbed();
-	bansListEmbed.setTitle('User Bans :thumbsdown:');
-	bansListEmbed.setColor(0xFFA500);
+	bansListEmbed.setTitle('User Bans');
+	bansListEmbed.setColor(0xa30000);
+	bansListEmbed.setThumbnail('attachment://mod-ban.png');
+
+	const image = new Discord.MessageAttachment('./src/images/mod/mod-ban.png');
 
 	for (const userId of userIds) {
 		const member = await interaction.guild.members.fetch(userId);
 		const user = member.user;
 
+		// Checks if they're above/equal to the executor
+		if (member.roles.highest.position >= executingMember.roles.highest.position) {
+			await interaction.editReply(`You cannot ban ${user.username} as they have a higher role compared to you.`);
+			return;
+		}
+
+		// Creates mod logs
 		const eventLogEmbed = new Discord.MessageEmbed();
 
-		eventLogEmbed.setColor(0xF24E43);
-		eventLogEmbed.setDescription('――――――――――――――――――――――――――――――――――');
+		eventLogEmbed.setAuthor({
+			name: user.tag,
+			iconURL: user.avatarURL()
+		});
+		eventLogEmbed.setColor(0xa30000);
+		eventLogEmbed.setDescription(`${user.username} has been banned by ${executor.username}`);
 		eventLogEmbed.setTimestamp(Date.now());
-		eventLogEmbed.setTitle('Event Type: _Member Banned_');
+		eventLogEmbed.setTitle('_Member Banned_');
 		eventLogEmbed.setFields(
 			{
 				name: 'User',
@@ -44,96 +58,59 @@ async function banHandler(interaction) {
 				value: user.id
 			},
 			{
-				name: 'Executor',
+				name: 'Moderator',
 				value: `<@${executor.id}>`
 			},
 			{
-				name: 'Executor User ID',
+				name: 'Moderator User ID',
 				value: executor.id
 			},
 			{
 				name: 'Reason',
 				value: reason
 			},
 			{
-				name: 'From bot /ban command',
+				name: 'From Bot',
 				value: 'true'
 			}
 		);
 		eventLogEmbed.setFooter({
 			text: 'Pretendo Network',
 			iconURL: guild.iconURL()
 		});
+		eventLogEmbed.setThumbnail('attachment://mod-ban.png');
 
-		await util.sendEventLogMessage(guild, null, eventLogEmbed);
+		await util.sendEventLogMessage('channels.mod-logs', guild, null, eventLogEmbed, image, null);
 
-		const { count, rows } = await Bans.findAndCountAll({
+		const { count } = await Bans.findAndCountAll({
 			where: {
 				user_id: member.id
 			}
 		});
-
-		const sendMemberEmbeds = [];
-
+
 		const banEmbed = new Discord.MessageEmbed();
 
-		banEmbed.setTitle('Punishment Details');
+		banEmbed.setTitle('_Member Banned_');
 		banEmbed.setDescription('You have been banned from the Pretendo Network server. You may not rejoin at this time, and an appeal may not be possible\nYou may review the details of your ban below');
-		banEmbed.setColor(0xF24E43);
+		banEmbed.setThumbnail('attachment://mod-ban.png');
+		banEmbed.setColor(0xa30000);
 		banEmbed.setTimestamp(Date.now());
-		banEmbed.setAuthor({
-			name: `Banned by: ${executingMember.user.tag}`,
-			iconURL: executingMember.user.avatarURL()
-		});
 		banEmbed.setFooter({
 			text: 'Pretendo Network',
 			iconURL: guild.iconURL()
 		});
 		banEmbed.setFields({
 			name: 'Ban Reason',
 			value: reason
+		},
+		{
+			name: 'Amount Of Times Banned',
+			value: (count + 1).toString()
 		});
 
-		sendMemberEmbeds.push(banEmbed);
-
-		if (count > 0) {
-			const pastBansEmbed = new Discord.MessageEmbed();
-			pastBansEmbed.setTitle('Past Bans');
-			pastBansEmbed.setDescription('For clarifty purposes here is a list of your past bans');
-			pastBansEmbed.setColor(0xEF7F31);
-			pastBansEmbed.setTimestamp(Date.now());
-			pastBansEmbed.setFooter({
-				text: 'Pretendo Network',
-				iconURL: guild.iconURL()
-			});
-
-			for (let i = 0; i < rows.length; i++) {
-				const ban = rows[i];
-				const bannedBy = await interaction.client.users.fetch(ban.admin_user_id);
-
-				pastBansEmbed.addFields(
-					{
-						name: `${util.ordinal(i + 1)} Ban`,
-						value: ban.reason
-					},
-					{
-						name: 'Punished By',
-						value: bannedBy.tag,
-						inline: true
-					},
-					{
-						name: 'Date',
-						value: ban.timestamp.toLocaleDateString(),
-						inline: true
-					}
-				);
-			}
-
-			sendMemberEmbeds.push(pastBansEmbed);
-		}
-
 		await member.send({
-			embeds: sendMemberEmbeds
+			embeds: [banEmbed],
+			files: [image]
 		}).catch(() => console.log('Failed to DM user'));
 
 		await member.ban({
@@ -146,10 +123,17 @@ async function banHandler(interaction) {
 			reason: reason
 		});
 
+		bansListEmbed.setDescription(`${user.username} has been successfully banned`)
 		bansListEmbed.addField(`${member.user.username}'s bans`, (count + 1).toString(), true);
+		bansListEmbed.setFooter({
+			text: 'Pretendo Network',
+			iconURL: guild.iconURL()
+		});
+		bansListEmbed.setTimestamp(Date.now());
+
 	}
 
-	await interaction.editReply({ embeds: [bansListEmbed], ephemeral: true });
+	await interaction.editReply({ embeds: [bansListEmbed], files: [image], ephemeral: true });
 }
 
 const command = new SlashCommandBuilder()