fix spelling errors and db errors

Project-Coda · Jul 8, 2022 · ac6945d · ac6945d
1 parent dc43c43
commit ac6945d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 11 deletions.
diff --git a/commands/notify.js b/commands/notify.js
@@ -50,7 +50,7 @@ module.exports = {
 			global.client.channels.cache.get(env.discord.logs_channel).send({
 				embeds: [ embedcreator.setembed(
 					{
-						title: 'Incedent Detected',
+						title: 'Incident Detected',
 						description: `${interaction.member.user} tried to use the notify command but did not have the correct role.
                         Detailed information:
                         User ID : ${userId}`,
@@ -62,7 +62,7 @@ module.exports = {
 			return interaction.reply({
 				embeds: [ embedcreator.setembed(
 					{
-						title: 'Incedent Reported',
+						title: 'Incident Reported',
 						description: 'You do not have permission to use this command. This incident has been reported.',
 						color: '#e74c3c',
 					},
@@ -104,7 +104,7 @@ module.exports = {
 					embeds: [ embedcreator.setembed(
 						{
 							title: 'Error',
-							description: 'An error occured while adding the user to the notify list',
+							description: 'An error occurred while adding the user to the notify list',
 							color: '#e74c3c',
 						},
 					)], ephemeral: true,
@@ -145,7 +145,7 @@ module.exports = {
 					embeds: [ embedcreator.setembed(
 						{
 							title: 'Error',
-							description: 'An error occured while removing the user from the notify list',
+							description: 'An error occurred while removing the user from the notify list',
 							color: '#e74c3c',
 						},
 					)], ephemeral: true,

diff --git a/commands/reaction.js b/commands/reaction.js
@@ -45,7 +45,7 @@ module.exports = {
 			global.client.channels.cache.get(env.discord.logs_channel).send({
 				embeds: [ embedcreator.setembed(
 					{
-						title: 'Incedent Detected',
+						title: 'Incident Detected',
 						description: `${interaction.member.user} tried to use the addrole command but did not have the Founders role.
 						Detailed information:
 						Message Link : ${messageLink}
@@ -59,7 +59,7 @@ module.exports = {
 			return interaction.reply({
 				embeds: [ embedcreator.setembed(
 					{
-						title: 'Incedent Reported',
+						title: 'Incident Reported',
 						description: 'You do not have permission to use this command. This incident has been reported.',
 						color: '#e74c3c',
 					},
@@ -104,8 +104,9 @@ module.exports = {
 				const channel = global.client.channels.cache.get(channelId);
 				const message = await channel.messages.fetch(messageId);
 				// Add to roles table if it doesn't exist
-				const db = await mariadb.getConnection();
+				db = await mariadb.getConnection();
 				await db.query('INSERT INTO roles (id, emoji, raw_emoji, message_id, channel_id) VALUES (?, ?, ?, ?, ?)', [roleid, emojiname, emoji, messageId, channelId]);
+				db.end();
 				message.react(emoji).then(() => {
 					console.log(`Added ${emojiname} to database`);
 					interaction.reply({
@@ -167,9 +168,10 @@ module.exports = {
 					return;
 				}
 				console.log(`roleId: ${roleid}`);
-				const db = await mariadb.getConnection();
-				// get messige id from the role database
+				db = await mariadb.getConnection();
+				// get message id from the role database
 				const result = await db.query('SELECT * FROM roles WHERE id = ?', [roleid]);
+				db.end();
 				if (result.length === 0) {
 					interaction.reply({
 						embeds: [ embedcreator.setembed(
@@ -195,7 +197,9 @@ module.exports = {
 				const message = await global.client.channels.cache.get(channel).messages.fetch(messageId);
 				// remove the role from the message
 				// remove the role from the table roles if it exists
+
 				await db.query('DELETE FROM roles WHERE id = ?', [roleid]);
+				db.end();
 				// lookup emoji id in guild
 				message.reactions.cache.get(emojiId).remove().then(() => {
 					console.log(`Removed ${roleName} from database`);

diff --git a/commands/vc.js b/commands/vc.js
@@ -26,7 +26,7 @@ module.exports = {
 			global.client.channels.cache.get(env.discord.logs_channel).send({
 				embeds: [ embedcreator.setembed(
 					{
-						title: 'Incedent Detected',
+						title: 'Incident Detected',
 						description: `${interaction.member.user} tried to use the vc move command but did not have the correct role.`,
 						color: '#e74c3c',
 					},
@@ -36,7 +36,7 @@ module.exports = {
 			return interaction.reply({
 				embeds: [ embedcreator.setembed(
 					{
-						title: 'Incedent Reported',
+						title: 'Incident Reported',
 						description: 'You do not have permission to use this command. This incident has been reported.',
 						color: '#e74c3c',
 					},

diff --git a/index.js b/index.js
@@ -28,6 +28,7 @@ global.client.once('ready', async () => {
 	await db.query('CREATE TABLE IF NOT EXISTS roles (id BIGINT PRIMARY KEY, emoji VARCHAR(255), raw_emoji VARCHAR(255), message_id BIGINT, channel_id BIGINT)');
 	// create notify table if it doesn't exist
 	await db.query('CREATE TABLE IF NOT EXISTS notify (user_id VARCHAR(255) PRIMARY KEY, name VARCHAR(255))');
+	db.end();
 }
 )();
 const commands = [];
@@ -95,7 +96,9 @@ global.client.on('messageReactionAdd', async (reaction, user) => {
 	const guild = channel.guild;
 	const emoji = reaction.emoji.name;
 	// query db for role
+	db = await mariadb.getConnection();
 	const role = await db.query('SELECT * FROM roles WHERE emoji = ? AND message_id = ?', [emoji, message.id]);
+	db.end();
 	if (role.length === 0) return;
 	const roleId = String(role[0].id);
 	const roleName = guild.roles.cache.get(roleId).name;
@@ -122,7 +125,9 @@ global.client.on('messageReactionRemove', async (reaction, user) => {
 	const guild = channel.guild;
 	const emoji = reaction.emoji.name;
 	// query db for role
+	db = await mariadb.getConnection();
 	const role = await db.query('SELECT * FROM roles WHERE emoji = ? AND message_id = ?', [emoji, message.id]);
+	db.end();
 	if (role.length === 0) return;
 	const roleId = String(role[0].id);
 	const member = guild.members.cache.get(user.id);