a few small changes

2 files changed, 33 insertions, 32 deletions

diff --git a/src/listeners/guild/guildMemberAdd.ts b/src/listeners/guild/guildMemberAdd.ts
index f10255d..4c7d498 100644
--- a/src/listeners/guild/guildMemberAdd.ts
+++ b/src/listeners/guild/guildMemberAdd.ts
@@ -1,5 +1,5 @@
 import { BushListener, StickyRole, type BushClientEvents, type BushGuildMember, type BushTextChannel } from '#lib';
-import { MessageEmbed, Util, type Snowflake } from 'discord.js';
+import { MessageEmbed, type Snowflake } from 'discord.js';
 
 export default class GuildMemberAddListener extends BushListener {
 	public constructor() {
@@ -24,9 +24,9 @@ export default class GuildMemberAddListener extends BushListener {
 		if (member.guild.id !== welcome?.guild.id) throw new Error('Welcome channel must be in the guild.');
 		const embed = new MessageEmbed()
 			.setDescription(
-				`${util.emojis.join} **${util.sanitizeWtlAndControl(
-					Util.escapeMarkdown(member.user.tag)
-				)}** joined the server. There are now ${member.guild.memberCount.toLocaleString()} members.`
+				`${util.emojis.join} ${util.format.input(
+					member.user.tag
+				)} joined the server. There are now ${member.guild.memberCount.toLocaleString()} members.`
 			)
 			.setColor(util.colors.green);
 		await welcome
@@ -34,13 +34,13 @@ export default class GuildMemberAddListener extends BushListener {
 			.then(() =>
 				client.console.info(
 					'guildMemberAdd',
-					`Sent a message for <<${util.sanitizeWtlAndControl(member.user.tag)}>> in <<${member.guild.name}>>.`
+					`Sent a message for ${util.format.inputLog(member.user.tag)} in ${util.format.inputLog(member.guild.name)}.`
 				)
 			)
 			.catch(() =>
 				client.console.warn(
 					'guildMemberAdd',
-					`Failed to send message for <<${util.sanitizeWtlAndControl(member.user.tag)}>> in <<${member.guild.name}>>.`
+					`Failed to send message for ${util.format.inputLog(member.user.tag)} in ${util.format.inputLog(member.guild.name)}.`
 				)
 			);
 	}
@@ -62,19 +62,21 @@ export default class GuildMemberAddListener extends BushListener {
 					void member.setNickname(hadRoles.nickname).catch(() => {});
 				}
 				if (rolesArray?.length) {
-					const addedRoles = await member.roles
-						.add(rolesArray, "Returning member's previous roles.")
-						.catch(
-							() =>
-								void client.console.warn(
-									'guildMemberAdd',
-									`There was an error returning <<${util.sanitizeWtlAndControl(member.user.tag)}>>'s roles.`
-								)
-						);
+					const addedRoles = await member.roles.add(rolesArray, "Returning member's previous roles.").catch(() =>
+						member.guild.sendLogChannel('error', {
+							embeds: [
+								{
+									title: 'Sticky Roles Error',
+									description: `There was an error returning ${util.format.input(member.user.tag)}'s roles.`,
+									color: util.colors.error
+								}
+							]
+						})
+					);
 					if (addedRoles) {
 						void client.console.info(
 							'guildMemberAdd',
-							`Assigned sticky roles to <<${util.sanitizeWtlAndControl(member.user.tag)}>> in <<${member.guild.name}>>.`
+							`Assigned sticky roles to ${util.format.inputLog(member.user.tag)} in ${util.format.inputLog(member.guild.name)}.`
 						);
 					} else if (!addedRoles) {
 						const failedRoles: string[] = [];
@@ -88,9 +90,9 @@ export default class GuildMemberAddListener extends BushListener {
 						} else {
 							void client.console.info(
 								'guildMemberAdd',
-								`[Fallback] Assigned sticky roles to <<${util.sanitizeWtlAndControl(member.user.tag)}>> in <<${
+								`[Fallback] Assigned sticky roles to ${util.format.inputLog(member.user.tag)} in ${util.format.inputLog(
 									member.guild.name
-								}>>.`
+								)}.`
 							);
 						}
 					}
@@ -103,15 +105,14 @@ export default class GuildMemberAddListener extends BushListener {
 					.then(() =>
 						client.console.info(
 							'guildMemberAdd',
-							`Assigned join roles to <<${util.sanitizeWtlAndControl(member.user.tag)}>> in <<${member.guild.name}>>.`
+							`Assigned join roles to ${util.format.inputLog(member.user.tag)} in ${util.format.inputLog(member.guild.name)}.`
 						)
 					)
-					.catch(
-						() =>
-							void client.console.warn(
-								'guildMemberAdd',
-								`Failed to assign join roles to <<${util.sanitizeWtlAndControl(member.user.tag)}>>, in <<${member.guild.name}>>.`
-							)
+					.catch(() =>
+						member.guild.error(
+							'Join Roles Error',
+							`Failed to assign join roles to ${util.format.input(member.user.tag)}, in ${util.format.input(member.guild.name)}.`
+						)
 					);
 			}
 		}
diff --git a/src/listeners/guild/guildMemberRemove.ts b/src/listeners/guild/guildMemberRemove.ts
index 393eea6..6181d52 100644
--- a/src/listeners/guild/guildMemberRemove.ts
+++ b/src/listeners/guild/guildMemberRemove.ts
@@ -6,7 +6,7 @@ import {
 	type BushClientEvents,
 	type PartialBushGuildMember
 } from '#lib';
-import { MessageEmbed, Util } from 'discord.js';
+import { MessageEmbed } from 'discord.js';
 
 export default class GuildMemberRemoveListener extends BushListener {
 	public constructor() {
@@ -33,7 +33,7 @@ export default class GuildMemberRemoveListener extends BushListener {
 		if (member.guild.id !== welcome?.guild.id) throw new Error('Welcome channel must be in the guild.');
 		const embed: MessageEmbed = new MessageEmbed()
 			.setDescription(
-				`${util.emojis.leave} **${util.sanitizeWtlAndControl(Util.escapeBold(user.tag))}** ${
+				`${util.emojis.leave} ${util.format.input(user.tag)} ${
 					isBan ? 'got banned from' : 'left'
 				} the server. There are now ${welcome.guild.memberCount.toLocaleString()} members.`
 			)
@@ -43,13 +43,13 @@ export default class GuildMemberRemoveListener extends BushListener {
 			.then(() =>
 				client.console.info(
 					'guildMemberRemove',
-					`Sent a message for <<${util.sanitizeWtlAndControl(user.tag)}>> in <<${member.guild.name}>>.`
+					`Sent a message for ${util.format.inputLog(user.tag)} in ${util.format.inputLog(member.guild.name)}.`
 				)
 			)
 			.catch(() =>
-				client.console.warn(
-					'guildMemberRemove',
-					`Failed to send message for <<${util.sanitizeWtlAndControl(user.tag)}>> in <<${member.guild.name}>>.`
+				member.guild.error(
+					'Welcome Message Error',
+					`Failed to send message for ${util.format.input(user.tag)} in ${util.format.input(member.guild.name)}.`
 				)
 			);
 	}
@@ -81,7 +81,7 @@ export default class GuildMemberRemoveListener extends BushListener {
 				.then(() =>
 					client.console.info(
 						'guildMemberRemove',
-						`${isNew ? 'Created' : 'Updated'} info for <<${util.sanitizeWtlAndControl(member.user.tag)}>>.`
+						`${isNew ? 'Created' : 'Updated'} info for ${util.format.inputLog(member.user.tag)}.`
 					)
 				);
 		}