consistency and more work on settings command

4 files changed, 30 insertions, 13 deletions

diff --git a/src/listeners/guild/guildCreate.ts b/src/listeners/guild/guildCreate.ts
index bc5694a..64e5285 100644
--- a/src/listeners/guild/guildCreate.ts
+++ b/src/listeners/guild/guildCreate.ts
@@ -11,7 +11,10 @@ export default class GuildCreateListener extends BushListener {
 	}
 
 	public override async exec(...[guild]: BushClientEvents['guildCreate']): Promise<void> {
-		void client.console.info('JoinGuild', `Joined <<${guild.name}>> with <<${guild.memberCount?.toLocaleString()}>> members.`);
+		void client.console.info(
+			'guildCreate',
+			`Joined <<${guild.name}>> with <<${guild.memberCount?.toLocaleString()}>> members.`
+		);
 		const g = await Guild.findByPk(guild.id);
 		if (!g) void Guild.create({ id: guild.id });
 	}
diff --git a/src/listeners/guild/guildDelete.ts b/src/listeners/guild/guildDelete.ts
index 3126bd6..e260a63 100644
--- a/src/listeners/guild/guildDelete.ts
+++ b/src/listeners/guild/guildDelete.ts
@@ -11,6 +11,6 @@ export default class GuildDeleteListener extends BushListener {
 	}
 
 	public override exec(...[guild]: BushClientEvents['guildDelete']): void {
-		void client.console.info('LeaveGuild', `Left <<${guild.name}>> with <<${guild.memberCount?.toLocaleString()}>> members.`);
+		void client.console.info('guildDelete', `Left <<${guild.name}>> with <<${guild.memberCount?.toLocaleString()}>> members.`);
 	}
 }
diff --git a/src/listeners/guild/guildMemberAdd.ts b/src/listeners/guild/guildMemberAdd.ts
index 7bef6b8..e0a0426 100644
--- a/src/listeners/guild/guildMemberAdd.ts
+++ b/src/listeners/guild/guildMemberAdd.ts
@@ -32,9 +32,14 @@ export default class GuildMemberAddListener extends BushListener {
 			.setColor(this.client.util.colors.green);
 		await welcome
 			.send({ embeds: [embed] })
-			.then(() => this.client.console.info('OnJoin', `Sent a message for <<${member.user.tag}>> in <<${member.guild.name}>>.`))
+			.then(() =>
+				this.client.console.info('guildMemberAdd', `Sent a message for <<${member.user.tag}>> in <<${member.guild.name}>>.`)
+			)
 			.catch(() =>
-				this.client.console.warn('OnJoin', `Failed to send message for <<${member.user.tag}>> in <<${member.guild.name}>>.`)
+				this.client.console.warn(
+					'guildMemberAdd',
+					`Failed to send message for <<${member.user.tag}>> in <<${member.guild.name}>>.`
+				)
 			);
 	}
 
@@ -58,11 +63,12 @@ export default class GuildMemberAddListener extends BushListener {
 					const addedRoles = await member.roles
 						.add(rolesArray, "Returning member's previous roles.")
 						.catch(
-							() => void this.client.console.warn('ReturnRoles', `There was an error returning <<${member.user.tag}>>'s roles.`)
+							() =>
+								void this.client.console.warn('guildMemberAdd', `There was an error returning <<${member.user.tag}>>'s roles.`)
 						);
 					if (addedRoles) {
 						void this.client.console.info(
-							'RoleData',
+							'guildMemberAdd',
 							`Assigned sticky roles to <<${member.user.tag}>> in <<${member.guild.name}>>.`
 						);
 					} else if (!addedRoles) {
@@ -73,10 +79,13 @@ export default class GuildMemberAddListener extends BushListener {
 								.catch(() => failedRoles.push(rolesArray[i]));
 						}
 						if (failedRoles.length) {
-							void this.client.console.warn('RoleData', 'Failed assigning the following roles on Fallback:' + failedRoles);
+							void this.client.console.warn(
+								'guildMemberAdd',
+								'Failed assigning the following roles on Fallback:' + failedRoles
+							);
 						} else {
 							void this.client.console.info(
-								'RoleData',
+								'guildMemberAdd',
 								`[Fallback] Assigned sticky roles to <<${member.user.tag}>> in <<${member.guild.name}>>.`
 							);
 						}
@@ -89,12 +98,15 @@ export default class GuildMemberAddListener extends BushListener {
 			await member.roles
 				.add(joinRoles, 'Join roles.')
 				.then(() =>
-					this.client.console.info('RoleData', `Assigned join roles to <<${member.user.tag}>> in <<${member.guild.name}>>.`)
+					this.client.console.info(
+						'guildMemberAdd',
+						`Assigned join roles to <<${member.user.tag}>> in <<${member.guild.name}>>.`
+					)
 				)
 				.catch(
 					() =>
 						void this.client.console.warn(
-							'OnJoin',
+							'guildMemberAdd',
 							`Failed to assign join roles to <<${member.user.tag}>>, in <<${member.guild.name}>>.`
 						)
 				);
diff --git a/src/listeners/guild/guildMemberRemove.ts b/src/listeners/guild/guildMemberRemove.ts
index f25108f..f72f061 100644
--- a/src/listeners/guild/guildMemberRemove.ts
+++ b/src/listeners/guild/guildMemberRemove.ts
@@ -34,9 +34,9 @@ export default class GuildMemberRemoveListener extends BushListener {
 			.setColor(isBan ? util.colors.orange : util.colors.red);
 		welcome
 			.send({ embeds: [embed] })
-			.then(() => client.console.info('OnLeave', `Sent a message for <<${user.tag}>> in <<${member.guild.name}>>.`))
+			.then(() => client.console.info('guildMemberRemove', `Sent a message for <<${user.tag}>> in <<${member.guild.name}>>.`))
 			.catch(() =>
-				this.client.console.warn('OnLeave', `Failed to send message for <<${user.tag}>> in <<${member.guild.name}>>.`)
+				this.client.console.warn('guildMemberRemove', `Failed to send message for <<${user.tag}>> in <<${member.guild.name}>>.`)
 			);
 	}
 
@@ -61,7 +61,9 @@ export default class GuildMemberRemoveListener extends BushListener {
 			if (nickname) row.nickname = nickname;
 			await row
 				.save()
-				.then(() => this.client.console.info('RoleData', `${isNew ? 'Created' : 'Updated'} info for <<${member.user.tag}>>.`));
+				.then(() =>
+					this.client.console.info('guildMemberRemove', `${isNew ? 'Created' : 'Updated'} info for <<${member.user.tag}>>.`)
+				);
 		}
 	}
 }