Better Embeds, Pardons + Purges #11

DirectorReiuji · 2022-11-25T06:35:19Z

Additions

Redesign of all embeds, with Bandwidth-esque icons
Now detects member joins
Mod logs now implemented
Pardon and Purge commands
Joke Regexes (Current list is Redux, Rawr, 2014, Linux, and Chubby)
Switches out /setting-which to just Discord options
Bugfixes

Overhaulled all embeds within the bot, added mod logs, and first implantation of buttons.

Added purge.js command, which can either delete 2-99 messages or delete 100 messages from a user.

Added pardon command, removed useless ??? else comment, replaced generic icon in purge, and other misc. fixes.

Logs unbans and now follows the correct naming convention.

Fixed the major issue within this PR with nsfw-check.js, and fixed an error within guildMemberUpdate.js, which would crash Chubby if a timedout was revoked.

DirectorReiuji · 2022-12-01T23:52:50Z

Ok, all issues I can think of has been fix, this should be able to be merged without causing too much issues.

Adds joke regexes, which will reply (within the select channel) with a certain prompt.

Adds the missing bracket of the switch function

Fixes problem where it'd ping the bot itself instead of the user, and removed useless switch function.

Some minor bugfixes, just to wrap the joke regexes perfectly.

Makes sure to check hierarchy before banning/kicking/warning, also fixes crashing in the case no reasoning is given when manually banning/kicking.

Replaces settings-which to discord options, similarly to Bandwidth.

Fixed a lil bug where it would say "Undefined cannot be warned". Also added Eyad's warnings suggestion.

jonbarrow

There's quite a few spacing/indentation issues in various files, and several pieces of information that were there to give context to the user was removed without reason

example.config.json

jonbarrow · 2023-12-03T00:48:13Z

src/commands/ban.js

-	bansListEmbed.setColor(0xFFA500);
+	bansListEmbed.setTitle('User Bans');
+	bansListEmbed.setColor(0xa30000);
+	const image = new Discord.MessageAttachment('./src/images/mod/mod-ban.png');


This is a very awkward place to define this image variable, it should either be moved to above the embed creation or further down closer to where it's used

It's positioned there due to the fact of where it's used. However, I have moved it to be closer to the related functions.

jonbarrow · 2023-12-03T00:49:38Z

src/commands/ban.js

-		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);
-		}
-


What is the reason for this removal?

It's due to possible errors with the new pardon system.

What possible errors? Can you be more specific?

src/commands/ban.js

jonbarrow · 2023-12-03T01:14:20Z

src/events/guildMemberAdd.js

Is this neccessary? There's already a channel which logs this

Yeah, but it does clean it up a bit. If you do want me to simply use the default one, then I'll remove this.

No I'm saying we have a channel which logs joins. What is the point of this?

jonbarrow · 2023-12-03T01:18:27Z

src/util.js

+		if (components === null) {
+			await logChannel.send({ embeds: [embed], files: [file] });
+		} else {
+			await logChannel.send({ embeds: [embed], files: [file], components: [components] });
+		}


Is this check neccessary? Won't Discord.JS just not do anything with components if it's falsey?

Perhaps, might need some testing.

README.md

src/events/messageCreate.js

jonbarrow · 2023-12-03T01:21:24Z

src/events/messageDelete.js

+
+	const { executor } = latestLog;
+
+	if (executor.id = guild.me.id) return;


Bad equals check

Possibly fixed?

DirectorReiuji · 2024-03-06T04:48:56Z

Outside of spacing, most issues should be resolved. although in my end it's hard to deal with indents/spacing since i cannot discern which is which, and it seems like they do mix around indents with spacing, making fixing said issues harder. If you could do a quick re-review, that'd be great.

jonbarrow · 2024-03-06T18:16:41Z

although in my end it's hard to deal with indents/spacing since i cannot discern which is which

There are tools for this. Depending on your editor there's usually a setting to show indentation. In VS Code this is the editor.renderWhitespace setting. Using all will render spaces with a dot and tabs as a small arrow

This project also uses ESLint for linting, and has a rule for indentation. Depending on your editor, there is usually some setting or plugin/extension which shows ESLint errors in the editor. You can also run npm run lint to run ESLint from the command line. For VS Code I use both:

Also for your browser there's an extension called Refined GitHub which adds many missing QoL features to the site, one of which is showing spaces vs tabs

If you could do a quick re-review, that'd be great.

I'll do another review once the spacing issues are fixed and the previous comments are resolved, just to save everyone some time

DirectorReiuji · 2024-03-07T00:55:35Z

Fixed spacing and fixed some other stuff that was clearly broken via testing. Feel free to review now.

DirectorReiuji · 2024-03-07T13:10:35Z

Actually, I have noticed that this one doesn’t have an easy way to see amount of kicks, so don’t merge the PR just yet until I add that, but a review of anything I need to fix/revise as of now would be good.

DirectorReiuji · 2024-03-07T23:12:39Z

Alright, did all of the last minute tweaks, feel free to do a re-review.

Chubby can now delete polls

No longer removes attachments

jonbarrow · 2024-04-11T23:07:17Z

README.md

+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


You removed the names of the commands for these features?

Apologies, re-added them in the next commit.

jonbarrow · 2024-04-11T23:09:37Z

src/commands/ban.js

+	bansListEmbed.setColor(0xa30000);
+	bansListEmbed.setThumbnail('attachment://mod-ban.png');
+
+	const image = new Discord.MessageAttachment('./src/images/mod/mod-ban.png');


Mostly a nitpick, but please try to define variables like these close to where they will be used. Right now the way code like this reads, it's not clear right away where image is used when going top down. If going bottom up then it's not clear where image comes from

Again, I can't get as close as I wish I could, however I will rename them to be more specific.

No you're correct. I missed where this was used inside the loop. This placement is fine

jonbarrow · 2024-04-11T23:11:01Z

src/commands/ban.js


 	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


This goes for all comments. We use the syntax from Better Comments now. I've been migrating our older code to use it, but newer code should use it by default

Ah, I use VS2022, so I'm not certain if I'll be able to see them, but nonetheless, I'll try implementing that after I resolve everything else.

jonbarrow · 2024-04-11T23:13:51Z

src/commands/kick.js

-				name: 'From bot /kick command',
+				name: 'From Bot',


It's already clear this is from the bot, that's the only way these messages get sent. The point of this naming convention was to note if the kick was specifically from calling the /kick command, or if it was from the result of multiple warnings. Both of those actions come from the bot, this is used to know WHICH action it was

Ahhh, gotcha. Sorry, I have reverted that change now.

jonbarrow · 2024-04-11T23:14:40Z

src/commands/kick.js

-		await util.sendEventLogMessage(guild, null, eventLogEmbed);
-
-		if (count > 0) {
-			const pastKicksEmbed = new Discord.MessageEmbed();
-			pastKicksEmbed.setTitle('Past Kicks');
-			pastKicksEmbed.setDescription('For clarifty purposes here is a list of your past kicks');
-			pastKicksEmbed.setColor(0xEF7F31);
-			pastKicksEmbed.setTimestamp(Date.now());
-			pastKicksEmbed.setFooter({
-				text: 'Pretendo Network',
-				iconURL: guild.iconURL()
-			});
-
-			for (let i = 0; i < rows.length; i++) {
-				const kick = rows[i];
-				const kickedBy = await interaction.client.users.fetch(kick.admin_user_id);
-
-				pastKicksEmbed.addFields(
-					{
-						name: `${util.ordinal(i + 1)} Kick`,
-						value: kick.reason
-					},
-					{
-						name: 'Punished By',
-						value: kickedBy.tag,
-						inline: true
-					},
-					{
-						name: 'Date',
-						value: kick.timestamp.toLocaleDateString(),
-						inline: true
-					}
-				);
-			}
-
-			sendMemberEmbeds.push(pastKicksEmbed);
-		}


What breaks? I'm confused what specific issues this caused. All this seems to do is removed additional context?

jonbarrow · 2024-04-11T23:41:53Z

src/commands/warnings.js

+		warningListEmbed.addFields(
+			{
+				name: `${user.username}'s warns`,
+				value: count.toString()
+			},
+			{
+				name: 'Warnings Left Until Kick',
+				value: Math.max(0, 3 - count).toString()
+			},
+			{
+				name: 'Warnings Left Until Ban',
+				value: Math.max(0, 4 - count).toString()
+			}
+		);


Information about the warnings?

jonbarrow · 2024-04-11T23:43:36Z

src/events/guildMemberAdd.js

No I'm saying we have a channel which logs joins. What is the point of this?

jonbarrow · 2024-04-11T23:45:41Z

src/events/messageCreate.js

Suggested change

if (message.content == '' && message.attachments.size == 0)

message.delete();

if (!message.content.trim() && message.attachments.size == 0) {

await message.delete();

return

}

jonbarrow · 2024-04-11T23:47:21Z

src/events/messageDelete.js

+	eventLogEmbed.setTitle('_Poll Delete_');
+	eventLogEmbed.setDescription(`${user.username}'s poll in ${message.channel.name} has been deleted`);


Why was this changed to only mention polls...? This should trigger on any message being deleted?

It does, the function prior to this makes sure to only make these the string if the message was infact a poll. On any other occassion, it will show up as message deleted.

The image below shows off attachment deletion, poll deletion, and message deletion all working as intended.

I'm unsure how I feel about using just the message content check to assume it's a poll. Messages seem to have a poll field now, according to this screenshot from Discord? Does Discord.js support this already? Checking for the actual poll data feels like a much better check imo

No, Discord.js doesn’t support polls yet, which is why most of the poll deletion is hacky. Ideally, you would have some sort of “event/PollRemove.js” event which fires off when client detects a poll deletion.

Technically, you could call some function after poll deletion in “event/MessageCreate.js”, but again not ideal.

src/util.js

…hubby-v2 into chubby-overhaul

embed-overhaul

3b21377

Overhaulled all embeds within the bot, added mod logs, and first implantation of buttons.

DirectorReiuji marked this pull request as draft November 25, 2022 09:26

DirectorReiuji added 2 commits November 27, 2022 22:01

purge-command

c429f4a

Added purge.js command, which can either delete 2-99 messages or delete 100 messages from a user.

pardon-and-misc

43c75a8

Added pardon command, removed useless ??? else comment, replaced generic icon in purge, and other misc. fixes.

DirectorReiuji changed the title ~~embed-overhaul~~ embed-overhaul-and-misc Nov 29, 2022

DirectorReiuji marked this pull request as ready for review November 29, 2022 03:49

log-unbans-and-consistency

7f0bbe6

Logs unbans and now follows the correct naming convention.

DirectorReiuji changed the title ~~embed-overhaul-and-misc~~ Better Embeds, Pardons + Purges Nov 30, 2022

bugfixes

4a35b85

Fixed the major issue within this PR with nsfw-check.js, and fixed an error within guildMemberUpdate.js, which would crash Chubby if a timedout was revoked.

DirectorReiuji and others added 7 commits December 1, 2022 19:41

Joke Regexes

6133180

Adds joke regexes, which will reply (within the select channel) with a certain prompt.

Fix switch function

24e2ccd

Adds the missing bracket of the switch function

Fixed broken regex

29db884

Fixes problem where it'd ping the bot itself instead of the user, and removed useless switch function.

Minor fixes

3f14f4c

Some minor bugfixes, just to wrap the joke regexes perfectly.

Fixes critical issue

637cc2c

Makes sure to check hierarchy before banning/kicking/warning, also fixes crashing in the case no reasoning is given when manually banning/kicking.

Replaces settings-which

afc8adb

Replaces settings-which to discord options, similarly to Bandwidth.

Added Warnings

51419ab

Fixed a lil bug where it would say "Undefined cannot be warned". Also added Eyad's warnings suggestion.

jonbarrow requested changes Dec 3, 2023

View reviewed changes

Fixed issues (minus spacing)

791a73f

Added fixes and fixed spacing

5ec875c

DirectorReiuji added 3 commits March 7, 2024 17:09

Added README banner

f22dfec

Updated README to be more inline with Bandwidth's branding

e2b6b39

Added view kicks function

05e4770

DirectorReiuji requested a review from jonbarrow March 7, 2024 23:30

Added poll deletion

11f336c

Chubby can now delete polls

DirectorReiuji added 2 commits April 10, 2024 18:14

Added poll deletion info

4606c5c

Added attachment fix

cfbdc86

No longer removes attachments

jonbarrow requested changes Apr 11, 2024

View reviewed changes

DirectorReiuji and others added 7 commits April 11, 2024 21:12

Resolve hunting part one

560d2e2

Accidentally blocked package-lock

a55e42d

Actual Resolve hunting

c94428d

Merge branch 'chubby-overhaul' of https://github.com/DirectorReiuji/c…

00fce5c

…hubby-v2 into chubby-overhaul

Even more resolve hunting

6555d29

Reworked remove punishment command and made Poll Delete function

147a211

Removed useless check from pollDelete

489cdaa


		const { executor } = latestLog;

		if (executor.id = guild.me.id) return;

-	if (message.content == '' && message.attachments.size == 0)
-		message.delete();
+	if (!message.content.trim() && message.attachments.size == 0) {
+		await message.delete();
+		return
+	}

		eventLogEmbed.setTitle('_Poll Delete_');
		eventLogEmbed.setDescription(`${user.username}'s poll in ${message.channel.name} has been deleted`);

Better Embeds, Pardons + Purges #11

Are you sure you want to change the base?

Better Embeds, Pardons + Purges #11

Conversation

DirectorReiuji commented Nov 25, 2022 • edited Loading

DirectorReiuji commented Dec 1, 2022

jonbarrow left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

DirectorReiuji Mar 6, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

DirectorReiuji commented Mar 6, 2024

jonbarrow commented Mar 6, 2024 • edited Loading

DirectorReiuji commented Mar 7, 2024

DirectorReiuji commented Mar 7, 2024

DirectorReiuji commented Mar 7, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

DirectorReiuji commented Nov 25, 2022 •

edited

Loading

DirectorReiuji Mar 6, 2024 •

edited

Loading

jonbarrow commented Mar 6, 2024 •

edited

Loading