Added close command, bug fixes and improvements

src/commands/close.js

@@ -1,5 +1,7 @@
 const Command = require('../modules/commands/command');
-const { MessageEmbed } = require('discord.js');
+const { MessageEmbed, MessageMentions } = require('discord.js');
+const { Op } = require('sequelize');
+const toTime = require('to-time-monthsfork');
 const { footer } = require('../utils/discord');
 
 module.exports = class CloseCommand extends Command {
@@ -11,24 +13,232 @@ module.exports = class CloseCommand extends Command {
 			description: i18n('commands.close.description'),
 			aliases: [
 				i18n('commands.close.aliases.delete'),
+				i18n('commands.close.aliases.lock'),
 			],
-			process_args: false,
+			process_args: true,
 			args: [
 				{
 					name: i18n('commands.close.args.ticket.name'),
 					description: i18n('commands.close.args.ticket.description'),
 					example: i18n('commands.close.args.ticket.example'),
 					required: false,
+					// for arg parsing
+					alias: i18n('commands.close.args.ticket.alias'),
+					type: String
+				},
+				{
+					name: i18n('commands.close.args.reason.name'),
+					description: i18n('commands.close.args.reason.description'),
+					example: i18n('commands.close.args.reason.example'),
+					required: false,
+					// for arg parsing
+					alias: i18n('commands.close.args.reason.alias'),
+					type: String
+				},
+				{
+					name: i18n('commands.close.args.time.name'),
+					description: i18n('commands.close.args.time.description'),
+					example: i18n('commands.close.args.time.example'),
+					required: false,
+					// for arg parsing
+					alias: i18n('commands.close.args.time.alias'),
+					type: String
 				}
 			]
 		});
 	}
 
 	async execute(message, args) {
+		const arg_ticket = this.args[0].name;
+		const arg_reason = this.args[1].name;
+		const arg_time = this.args[2].name;
+
 		let settings = await message.guild.settings;
 		const i18n = this.client.i18n.getLocale(settings.locale);
-	
-		this.client.log.info(args)
-		message.channel.send(args[0])
+
+		if (args[arg_time]) {
+			let period;
+
+			try {
+				period = toTime(args[arg_time]).ms();
+			} catch {
+				return await message.channel.send(
+					new MessageEmbed()
+						.setColor(settings.error_colour)
+						.setTitle(i18n('commands.close.response.invalid_time.title'))
+						.setDescription(i18n('commands.close.response.invalid_time.description'))
+						.setFooter(settings.footer, message.guild.iconURL())
+				);
+			}
+
+			let tickets = await this.client.db.models.Ticket.findAndCountAll({
+				where: {
+					last_message: {
+						[Op.lte]: new Date(Date.now() - period)
+					},
+					guild: message.guild.id
+				}
+			});
+
+			if (tickets.count === 0) {
+				return await message.channel.send(
+					new MessageEmbed()
+						.setColor(settings.error_colour)
+						.setTitle(i18n('commands.close.response.no_tickets.title'))
+						.setDescription(i18n('commands.close.response.no_tickets.description'))
+						.setFooter(settings.footer, message.guild.iconURL())
+				);
+			} else {
+				let collector_message = await message.channel.send(
+					new MessageEmbed()
+						.setColor(settings.colour)
+						.setTitle(i18n('commands.close.response.confirm_multiple.title'))
+						.setDescription(i18n('commands.close.response.confirm_multiple.description', tickets.count, tickets.count))
+						.setFooter(settings.footer, message.guild.iconURL())
+				);
+
+				await collector_message.react('✅');
+
+				const collector_filter = (reaction, user) => {
+					return user.id === message.author.id && reaction.emoji.name === '✅';
+				};
+
+				let collector = collector_message.createReactionCollector(collector_filter, {
+					time: 30000
+				});
+
+				collector.on('collect', async () => {
+					await collector_message.reactions.removeAll();
+
+					await message.channel.send(
+						new MessageEmbed()
+							.setColor(settings.success_colour)
+							.setTitle(i18n('commands.close.response.closed_multiple.title', tickets.count, tickets.count))
+							.setDescription(i18n('commands.close.response.closed_multiple.description', tickets.count, tickets.count))
+							.setFooter(settings.footer, message.guild.iconURL())
+					);
+
+					for (let ticket of tickets.rows) {
+						await this.client.tickets.close(ticket.id, message.author.id, message.guild.id, args[arg_reason]);
+					}
+
+				});
+
+				collector.on('end', async (collected) => {
+					if (collected.size === 0) {
+						await collector_message.reactions.removeAll();
+						await collector_message.edit(
+							new MessageEmbed()
+								.setColor(settings.error_colour)
+								.setAuthor(message.author.username, message.author.displayAvatarURL())
+								.setTitle(i18n('commands.close.response.confirmation_timeout.title'))
+								.setDescription(i18n('commands.close.response.confirmation_timeout.description'))
+								.setFooter(footer(settings.footer, i18n('message_will_be_deleted_in', 15)), message.guild.iconURL())
+						);
+						setTimeout(async () => {
+							await collector_message
+								.delete()
+								.catch(() => this.client.log.warn('Failed to delete response (collector) message'));
+							await message
+								.delete()
+								.catch(() => this.client.log.warn('Failed to delete original message'));
+						}, 15000);
+					}
+				});
+			}
+
+		} else {
+			let t_row;
+			if (args[arg_ticket]) {
+				args[arg_ticket] = args[arg_ticket].replace(MessageMentions.CHANNELS_PATTERN, '$1');
+				t_row = await this.client.tickets.resolve(args[arg_ticket], message.guild.id);
+
+				if (!t_row) {
+					return await message.channel.send(
+						new MessageEmbed()
+							.setColor(settings.error_colour)
+							.setTitle(i18n('commands.close.response.unresolvable.title'))
+							.setDescription(i18n('commands.close.response.unresolvable.description', args[arg_ticket]))
+							.setFooter(settings.footer, message.guild.iconURL())
+					);
+				}
+			} else {
+				t_row = await this.client.db.models.Ticket.findOne({
+					where: {
+						id: message.channel.id
+					}
+				});
+
+				if (!t_row) {
+					return await message.channel.send(
+						new MessageEmbed()
+							.setColor(settings.error_colour)
+							.setTitle(i18n('commands.close.response.not_a_ticket.title'))
+							.setDescription(i18n('commands.close.response.not_a_ticket.description', settings.command_prefix))
+							.setFooter(settings.footer, message.guild.iconURL())
+					);
+				}
+			}
+
+			let collector_message = await message.channel.send(
+				new MessageEmbed()
+					.setColor(settings.colour)
+					.setTitle(i18n('commands.close.response.confirm.title'))
+					.setDescription(i18n('commands.close.response.confirm.description', t_row.number))
+					.setFooter(settings.footer, message.guild.iconURL())
+			);
+
+			await collector_message.react('✅');
+
+			const collector_filter = (reaction, user) => {
+				return user.id === message.author.id && reaction.emoji.name === '✅';
+			};
+
+			let collector = collector_message.createReactionCollector(collector_filter, {
+				time: 30000
+			});
+
+			collector.on('collect', async () => {
+				collector.stop();
+
+				if (message.channel.id === t_row.id) {
+					await collector_message.delete();
+				} else {
+					await collector_message.reactions.removeAll();
+					await collector_message.edit(
+						new MessageEmbed()
+							.setColor(settings.success_colour)
+							.setTitle(i18n('commands.close.response.closed.title'))
+							.setDescription(i18n('commands.close.response.closed.description', t_row.number))
+							.setFooter(settings.footer, message.guild.iconURL())
+					);
+				}
+
+				await this.client.tickets.close(t_row.id, message.author.id, message.guild.id, args[arg_reason]);
+			});
+
+			collector.on('end', async (collected) => {
+				if (collected.size === 0) {
+					await collector_message.reactions.removeAll();
+					await collector_message.edit(
+						new MessageEmbed()
+							.setColor(settings.error_colour)
+							.setAuthor(message.author.username, message.author.displayAvatarURL())
+							.setTitle(i18n('commands.close.response.confirmation_timeout.title'))
+							.setDescription(i18n('commands.close.response.confirmation_timeout.description'))
+							.setFooter(footer(settings.footer, i18n('message_will_be_deleted_in', 15)), message.guild.iconURL())
+					);
+					setTimeout(async () => {
+						await collector_message
+							.delete()
+							.catch(() => this.client.log.warn('Failed to delete response (collector) message'));
+						await message
+							.delete()
+							.catch(() => this.client.log.warn('Failed to delete original message'));
+					}, 15000);
+				}
+			});
+			
+		}
 	}
 };

src/commands/new.js

@@ -12,8 +12,9 @@ module.exports = class NewCommand extends Command {
 			name: i18n('commands.new.name'),
 			description: i18n('commands.new.description'),
 			aliases: [
-				i18n('commands.new.aliases.open'),
 				i18n('commands.new.aliases.create'),
+				i18n('commands.new.aliases.open'),
+				i18n('commands.new.aliases.ticket'),
 			],
 			process_args: false,
 			args: [
@@ -151,8 +152,11 @@ module.exports = class NewCommand extends Command {
 			});
 
 			collector.on('collect', async (reaction) => {
+				collector.stop();
 				let index = letters_array.findIndex(value => value === reaction.emoji.name); // find where the letter is in the alphabet
-				if (index === -1) return await collector_message.delete({ timeout: 15000 });
+				if (index === -1) return setTimeout(async () => {
+					await collector_message.delete();
+				}, 15000);
 				await collector_message.reactions.removeAll();
 				create(categories.rows[index], collector_message); // create the ticket, passing the existing response message to be edited instead of creating a new one
 			});
@@ -165,7 +169,7 @@ module.exports = class NewCommand extends Command {
 							.setColor(settings.error_colour)
 							.setAuthor(message.author.username, message.author.displayAvatarURL())
 							.setTitle(i18n('commands.new.response.select_category_timeout.title'))
-							.setDescription(i18n('commands.new.response.select_category_timeout.description', category_list.join('\n')))
+							.setDescription(i18n('commands.new.response.select_category_timeout.description'))
 							.setFooter(footer(settings.footer, i18n('message_will_be_deleted_in', 15)), message.guild.iconURL())
 					);
 					setTimeout(async () => {

src/commands/settings.js

@@ -81,7 +81,7 @@ module.exports = class SettingsCommand extends Command {
 					let cat_channel = await message.guild.channels.create(c.name, {
 						type: 'category',
 						reason: `Tickets category created by ${message.member.user.tag}`,
-						position: 0,
+						position: 1,
 						permissionOverwrites: [
 							...[
 								{