Merge pull request #38 from DerpyForks/master

features

.eslintrc.js

@@ -32,6 +32,9 @@ module.exports = {
 		],
 		'no-control-regex': [
 			'off'
+		],
+		'no-console': [
+			'off'
 		]
 	}
 };

README.md

@@ -9,10 +9,10 @@ DiscordTickets is a Discord bot for managing support ticket channels, to allow y
 - Highly customisable
 - Ticket "panel" / "widget" (react to embed to create ticket)
 - Simple commands
-- SQLite (easy, default) **or** MySQL (recommend) storage
+- Supports multiple databases: SQLite (easy, default), MySQL (recommend) storage, MariaDB, PostgresSQL and Microsoft SQL Server
 - Most (all of the best) features of the premium bots, for free
 - Self-hosted with your bot application, your logo and guild name
-- Optional express.js server for web archvies: [DiscordTickets-Portal](https://github.com/eartharoid/DiscordTickets-Portal/)
+- Optional express.js server for web archives: [DiscordTickets-Portal](https://github.com/eartharoid/DiscordTickets-Portal/)
 
 ## Screenshot
 
@@ -31,4 +31,4 @@ For installation, configuration, usage, and other information, **go to the [wiki
 
 ## Donate
 
-[![ko-fi](https://www.ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/B0B214BHI)
+[![ko-fi](https://www.ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/eartharoid)

package.json

@@ -19,7 +19,10 @@
 		"sqlite3": "^5.0.0"
 	},
 	"peerDependencies": {
-		"mysql2": "2.x"
+		"mysql2": "2.x",
+		"mariadb": "2.x",
+		"pg": "8.x",
+		"tedious": "9.x"
 	},
 	"devDependencies": {
 		"eslint": "^7.10.0",

src/commands/add.js

@@ -18,7 +18,6 @@ module.exports = {
 	example: 'add @member to #ticket-23',
 	args: true,
 	async execute(client, message, args, {config, Ticket}) {
-
 		const guild = client.guilds.cache.get(config.guild);
 
 		const notTicket = new MessageEmbed()
@@ -35,14 +34,11 @@ module.exports = {
 		let channel = message.mentions.channels.first();
 
 		if (!channel) {
-
 			channel = message.channel;
 			ticket = await Ticket.findOne({ where: { channel: message.channel.id } });
-			if(!ticket) 
+			if (!ticket) return message.channel.send(notTicket);
-				return message.channel.send(notTicket);
 
 		} else {
-		
 			ticket = await Ticket.findOne({ where: { channel: channel.id } });
 			if (!ticket) {
 				notTicket
@@ -52,7 +48,7 @@ module.exports = {
 			}
 		}
 
-		if(message.author.id !== ticket.creator && !message.member.roles.cache.has(config.staff_role))
+		if (message.author.id !== ticket.creator && !message.member.roles.cache.has(config.staff_role)) {
 			return message.channel.send(
 				new MessageEmbed()
 					.setColor(config.err_colour)
@@ -63,12 +59,11 @@ module.exports = {
 					.addField('Help', `Type \`${config.prefix}help ${this.name}\` for more information`)
 					.setFooter(guild.name, guild.iconURL())
 			);
-		
+		}
-		
 
 		let member = guild.member(message.mentions.users.first() || guild.members.cache.get(args[0]));
 
-		if(!member) 
+		if (!member) {
 			return message.channel.send(
 				new MessageEmbed()
 					.setColor(config.err_colour)
@@ -79,6 +74,7 @@ module.exports = {
 					.addField('Help', `Type \`${config.prefix}help ${this.name}\` for more information`)
 					.setFooter(guild.name, guild.iconURL())
 			);
+		}
 
 		try {
 			channel.updateOverwrite(member.user, {
@@ -88,7 +84,7 @@ module.exports = {
 				READ_MESSAGE_HISTORY: true
 			});
 
-			if(channel.id !== message.channel.id)
+			if (channel.id !== message.channel.id) {
 				channel.send(
 					new MessageEmbed()
 						.setColor(config.colour)
@@ -97,8 +93,7 @@ module.exports = {
 						.setDescription(`${member} has been added by ${message.author}`)
 						.setFooter(guild.name, guild.iconURL())
 				);
-
+			}
-
 
 			message.channel.send(
 				new MessageEmbed()

src/commands/close.js

@@ -21,11 +21,7 @@ module.exports = {
 	aliases: ['none'],
 	example: 'close #ticket-17',
 	args: false,
-	async execute(client, message, args, {
+	async execute(client, message, args, { config, Ticket }) {
-		config,
-		Ticket
-	}) {
-
 		const guild = client.guilds.cache.get(config.guild);
 
 		const notTicket = new MessageEmbed()
@@ -49,11 +45,8 @@ module.exports = {
 					channel: channel.id
 				}
 			});
-			if (!ticket)
+			if (!ticket) return channel.send(notTicket);
-				return channel.send(notTicket);
-
 		} else {
-
 			ticket = await Ticket.findOne({
 				where: {
 					channel: channel.id
@@ -102,7 +95,7 @@ module.exports = {
 			});
 
 		collector.on('collect', async () => {
-			if (channel.id !== message.channel.id)
+			if (channel.id !== message.channel.id) {
 				channel.send(
 					new MessageEmbed()
 						.setColor(config.colour)
@@ -111,6 +104,7 @@ module.exports = {
 						.setDescription(`Ticket closed by ${message.author}`)
 						.setFooter(guild.name, guild.iconURL())
 				);
+			}
 
 			confirm.reactions.removeAll();
 			confirm.edit(
@@ -149,16 +143,13 @@ module.exports = {
 						}];
 					}
 
-					if (
+					if (fs.existsSync(`user/transcripts/raw/${ticket.get('channel')}.log`) && fs.existsSync(`user/transcripts/raw/entities/${ticket.get('channel')}.json`)) {
-						fs.existsSync(`user/transcripts/raw/${ticket.get('channel')}.log`)
-						&&
-						fs.existsSync(`user/transcripts/raw/entities/${ticket.get('channel')}.json`)
-					) 
 						embed.addField('Web archive', await archive.export(Ticket, channel));
+					}
 
-			
+					if (embed.fields.length < 1) {
-					if (embed.fields.length < 1)
 						embed.setDescription(`No text transcripts or archive data exists for ticket ${ticket.id}`);
+					}
 
 					res.embed = embed;
 
@@ -166,7 +157,6 @@ module.exports = {
 				}
 			}
 
-
 			// update database
 			success = true;
 			ticket.update({
@@ -187,7 +177,7 @@ module.exports = {
 
 			log.info(`${message.author.tag} closed a ticket (#ticket-${ticket.id})`);
 
-			if (config.logs.discord.enabled)
+			if (config.logs.discord.enabled) {
 				client.channels.cache.get(config.logs.discord.channel).send(
 					new MessageEmbed()
 						.setColor(config.colour)
@@ -198,6 +188,7 @@ module.exports = {
 						.setFooter(guild.name, guild.iconURL())
 						.setTimestamp()
 				);
+			}
 		});
 
 

src/commands/delete.js

@@ -24,7 +24,6 @@ module.exports = {
 		config,
 		Ticket
 	}) {
-
 		const guild = client.guilds.cache.get(config.guild);
 
 		const notTicket = new MessageEmbed()
@@ -48,11 +47,9 @@ module.exports = {
 					channel: channel.id
 				}
 			});
-			if (!ticket)
+			if (!ticket) return channel.send(notTicket);
-				return channel.send(notTicket);
 
 		} else {
-
 			ticket = await Ticket.findOne({
 				where: {
 					channel: channel.id
@@ -65,7 +62,7 @@ module.exports = {
 				return message.channel.send(notTicket);
 			}
 
-			if (message.author.id !== ticket.creator && !message.member.roles.cache.has(config.staff_role))
+			if (message.author.id !== ticket.creator && !message.member.roles.cache.has(config.staff_role)) {
 				return channel.send(
 					new MessageEmbed()
 						.setColor(config.err_colour)
@@ -77,6 +74,7 @@ module.exports = {
 						.setFooter(guild.name, guild.iconURL())
 				);
 			}
+		}
 
 		let success;
 
@@ -124,14 +122,9 @@ module.exports = {
 				raw = `user/transcripts/raw/${ticket.get('channel')}.log`,
 				json = `user/transcripts/raw/entities/${ticket.get('channel')}.json`;
 
-			if (fs.existsSync(txt)) 
+			if (fs.existsSync(txt)) fs.unlinkSync(txt);
-				fs.unlinkSync(txt);
+			if (fs.existsSync(raw)) fs.unlinkSync(raw);
-
+			if (fs.existsSync(json)) fs.unlinkSync(json);
-			if (fs.existsSync(raw)) 
-				fs.unlinkSync(raw);
-
-			if (fs.existsSync(json)) 
-				fs.unlinkSync(json);
 
 			// update database
 			success = true;
@@ -147,7 +140,7 @@ module.exports = {
 
 			log.info(`${message.author.tag} deleted a ticket (#ticket-${ticket.id})`);
 
-			if (config.logs.discord.enabled)
+			if (config.logs.discord.enabled) {
 				client.channels.cache.get(config.logs.discord.channel).send(
 					new MessageEmbed()
 						.setColor(config.colour)
@@ -158,6 +151,7 @@ module.exports = {
 						.setFooter(guild.name, guild.iconURL())
 						.setTimestamp()
 				);
+			}
 		});
 
 

src/commands/help.js

@@ -18,7 +18,6 @@ module.exports = {
 	example: 'help new',
 	args: false,
 	execute(client, message, args, {config}) {
-
 		const guild = client.guilds.cache.get(config.guild);
 
 		const commands = Array.from(client.commands.values());
@@ -27,15 +26,12 @@ module.exports = {
 			let cmds = [];
 
 			for (let command of commands) {
-				if (command.hide)
+				if (command.hide) continue;
-					continue;
+				if (command.permission && !message.member.hasPermission(command.permission)) continue;
-				if (command.permission && !message.member.hasPermission(command.permission)) 
-					continue;
 
 				let desc = command.description;
 
-				if (desc.length > 50)
+				if (desc.length > 50) desc = desc.substring(0, 50) + '...';
-					desc = desc.substring(0, 50) + '...';
 				cmds.push(`**${config.prefix}${command.name}** **·** ${desc}`);
 			}
 
@@ -71,11 +67,9 @@ module.exports = {
 				.setTitle(command.name);
 
 
-			if (command.long) {
+			if (command.long) cmd.setDescription(command.long);
-				cmd.setDescription(command.long);
+			else cmd.setDescription(command.description);
-			} else {
+
-				cmd.setDescription(command.description);
-			}
 			if (command.aliases) cmd.addField('Aliases', `\`${command.aliases.join(', ')}\``, true);
 
 			if (command.usage) cmd.addField('Usage', `\`${config.prefix}${command.name} ${command.usage}\``, false);
@@ -85,12 +79,9 @@ module.exports = {
 
 			if (command.permission && !message.member.hasPermission(command.permission)) {
 				cmd.addField('Required Permission', `\`${command.permission}\` :exclamation: You don't have permission to use this command`, true);
-			} else {
+			} else cmd.addField('Required Permission', `\`${command.permission || 'none'}\``, true);
-				cmd.addField('Required Permission', `\`${command.permission || 'none'}\``, true);
-			}
 
 			message.channel.send(cmd);
-
 		}
 
 		// command ends here

src/commands/new.js

@@ -19,7 +19,6 @@ module.exports = {
 	example: 'new my server won\'t start',
 	args: false,
 	async execute(client, message, args, {config, Ticket}) {
-		
 		const guild = client.guilds.cache.get(config.guild);
 
 		const supportRole = guild.roles.cache.get(config.staff_role);
@@ -75,9 +74,7 @@ module.exports = {
 					.setDescription('Please limit your ticket topic to less than 256 characters. A short sentence will do.')
 					.setFooter(guild.name, guild.iconURL())
 			);
-		else if (topic.length < 1)
+		else if (topic.length < 1) topic = 'No topic given';
-			topic = 'No topic given';
-
 
 		let ticket = await Ticket.create({
 			channel: '',
@@ -175,8 +172,7 @@ module.exports = {
 					.setFooter(guild.name, guild.iconURL())
 			);
 
-			if (config.tickets.pin)
+			if (config.tickets.pin) await w.pin();
-				await w.pin();
 			// await w.pin().then(m => m.delete()); // oopsie, this deletes the pinned message
 
 			if (config.logs.discord.enabled)

src/commands/panel.js

@@ -18,19 +18,19 @@ module.exports = {
 	example: '',
 	args: false,
 	permission: 'MANAGE_GUILD',
-	async execute(client, message, args, {config, Setting}) {
+	async execute(client, message, _args, {config, Setting}) {
-
 		const guild = client.guilds.cache.get(config.guild);
 
 		let msgID = await Setting.findOne({ where: { key: 'panel_msg_id' } });
 		let chanID = await Setting.findOne({ where: { key: 'panel_chan_id' } });
 		let panel;
 
-		if(!chanID) 
+		if (!chanID) {
 			chanID = await Setting.create({
 				key: 'panel_chan_id',
 				value: message.channel.id,
 			});
+		}
 
 		if (!msgID) {
 			msgID = await Setting.create({
@@ -40,12 +40,12 @@ module.exports = {
 		} else {
 			try {
 				panel = await client.channels.cache.get(chanID.get('value')).messages.fetch(msgID.get('value')); // get old panel message
-				if (panel)
+				if (panel) {
 					panel.delete({ reason: 'Creating new panel/widget' }).then(() => log.info('Deleted old panel')).catch(e => log.warn(e)); // delete old panel
+				}
 			} catch (e) {
 				log.warn('Couldn\'t delete old panel');
 			}
-			
 		}
 
 		message.delete();

src/commands/remove.js

@@ -18,7 +18,6 @@ module.exports = {
 	example: 'remove @member from #ticket-23',
 	args: true,
 	async execute(client, message, args, {config, Ticket}) {
-
 		const guild = client.guilds.cache.get(config.guild);
 
 		const notTicket = new MessageEmbed()
@@ -52,7 +51,7 @@ module.exports = {
 			}
 		}
 
-		if(message.author.id !== ticket.creator && !message.member.roles.cache.has(config.staff_role))
+		if (message.author.id !== ticket.creator && !message.member.roles.cache.has(config.staff_role)) {
 			return message.channel.send(
 				new MessageEmbed()
 					.setColor(config.err_colour)
@@ -63,8 +62,7 @@ module.exports = {
 					.addField('Help', `Type \`${config.prefix}help ${this.name}\` for more information`)
 					.setFooter(guild.name, guild.iconURL())
 			);
-		
+		}
-		
 
 		let member = guild.member(message.mentions.users.first() || guild.members.cache.get(args[0]));
 
@@ -88,7 +86,7 @@ module.exports = {
 				READ_MESSAGE_HISTORY: false
 			});
 
-			if(channel.id !== message.channel.id)
+			if (channel.id !== message.channel.id) {
 				channel.send(
 					new MessageEmbed()
 						.setColor(config.colour)
@@ -97,8 +95,7 @@ module.exports = {
 						.setDescription(`${member} has been removed by ${message.author}`)
 						.setFooter(guild.name, guild.iconURL())
 				);
-
+			}
-
 
 			message.channel.send(
 				new MessageEmbed()

src/commands/stats.js

@@ -15,8 +15,7 @@ module.exports = {
 	aliases: ['data', 'statistics'],
 	example: '',
 	args: false,
-	async execute(client, message, args, {config, Ticket}) {
+	async execute(client, message, _args, {config, Ticket}) {
-
 		const guild = client.guilds.cache.get(config.guild);
 
 		let open = await Ticket.count({ where: { open: true } });

src/commands/tickets.js

@@ -17,11 +17,10 @@ module.exports = {
 	example: '',
 	args: false,
 	async execute(client, message, args, {config, Ticket}) {
-
 		const guild = client.guilds.cache.get(config.guild);
 
 		const supportRole = guild.roles.cache.get(config.staff_role);
-		if (!supportRole)
+		if (!supportRole) {
 			return message.channel.send(
 				new MessageEmbed()
 					.setColor(config.err_colour)
@@ -29,12 +28,13 @@ module.exports = {
 					.setDescription(`${config.name} has not been set up correctly. Could not find a 'support team' role with the id \`${config.staff_role}\``)
 					.setFooter(guild.name, guild.iconURL())
 			);
+		}
 
 		let context = 'self';
 		let user = message.mentions.users.first() || guild.members.cache.get(args[0]);
 
 		if (user) {
-			if(!message.member.roles.cache.has(config.staff_role))
+			if (!message.member.roles.cache.has(config.staff_role)) {
 				return message.channel.send(
 					new MessageEmbed()
 						.setColor(config.err_colour)
@@ -45,12 +45,10 @@ module.exports = {
 						.addField('Help', `Type \`${config.prefix}help ${this.name}\` for more information`)
 						.setFooter(guild.name, guild.iconURL())
 				);
-
-			context = 'staff';
-		} else {
-			user = message.author;
 			}
 
+			context = 'staff';
+		} else user = message.author;
 
 		let openTickets = await Ticket.findAndCountAll({
 			where: {
@@ -74,29 +72,30 @@ module.exports = {
 			.setTitle(`${context === 'self' ? 'Your' : user.username + '\'s'} tickets`)
 			.setFooter(guild.name + ' | This message will be deleted in 60 seconds', guild.iconURL());
 
-		if(config.transcripts.web.enabled)
+		if (config.transcripts.web.enabled) {
 			embed.setDescription(`You can access all of your ticket archives on the [web portal](${config.transcripts.web.server}/${user.id}).`);
+		}
 
 		let open = [],
 			closed = [];
 
-	
 		for (let t in openTickets.rows)  {
 			let desc = openTickets.rows[t].topic.substring(0, 30);
 			open.push(`> <#${openTickets.rows[t].channel}>: \`${desc}${desc.length > 20 ? '...' : ''}\``);
-		
 		}
 
 		for (let t in closedTickets.rows)  {
 			let desc = closedTickets.rows[t].topic.substring(0, 30);
 			let transcript = '';
 			let c = closedTickets.rows[t].channel;
-			if(fs.existsSync(`user/transcripts/text/${c}.txt`) || config.transcripts.web.enabled)
+			if (fs.existsSync(`user/transcripts/text/${c}.txt`) || config.transcripts.web.enabled) {
 				transcript = `\n> Type \`${config.prefix}transcript ${closedTickets.rows[t].id}\` to view.`;
+			}
 
 			closed.push(`> **#${closedTickets.rows[t].id}**: \`${desc}${desc.length > 20 ? '...' : ''}\`${transcript}`);
 
 		}
+
 		let pre = context === 'self' ? 'You have' : user.username + ' has';
 		embed.addField('Open tickets', openTickets.count === 0 ? `${pre} no open tickets.` : open.join('\n\n'), false);
 		embed.addField('Closed tickets', closedTickets.count === 0 ? `${pre} no old tickets` : closed.join('\n\n'), false);

src/commands/topic.js

@@ -16,7 +16,6 @@ module.exports = {
 	example: 'topic need help error',
 	args: true,
 	async execute(client, message, args, {config, Ticket}) {
-
 		const guild = client.guilds.cache.get(config.guild);
 
 		let ticket = await Ticket.findOne({
@@ -25,7 +24,7 @@ module.exports = {
 			}
 		});
 
-		if (!ticket)
+		if (!ticket) {
 			return message.channel.send(
 				new MessageEmbed()
 					.setColor(config.err_colour)
@@ -36,10 +35,10 @@ module.exports = {
 					.addField('Help', `Type \`${config.prefix}help ${this.name}\` for more information`)
 					.setFooter(guild.name, guild.iconURL())
 			);
-
+		}
 
 		let topic = args.join(' ');
-		if (topic.length > 256)
+		if (topic.length > 256) {
 			return message.channel.send(
 				new MessageEmbed()
 					.setColor(config.err_colour)
@@ -48,6 +47,7 @@ module.exports = {
 					.setDescription('Please limit your ticket topic to less than 256 characters. A short sentence will do.')
 					.setFooter(guild.name, guild.iconURL())
 			);
+		}
 
 		message.channel.setTopic(`<@${ticket.creator}> | ` + topic);
 
@@ -59,7 +59,6 @@ module.exports = {
 			}
 		});
 
-
 		message.channel.send(
 			new MessageEmbed()
 				.setColor(config.colour)

src/commands/transcript.js

@@ -19,7 +19,6 @@ module.exports = {
 	example: 'transcript 57',
 	args: true,
 	async execute(client, message, args, {config, Ticket}) {
-
 		const guild = client.guilds.cache.get(config.guild);
 		const id = args[0];
 
@@ -31,7 +30,7 @@ module.exports = {
 		});
 
 
-		if (!ticket)
+		if (!ticket) {
 			return message.channel.send(
 				new MessageEmbed()
 					.setColor(config.err_colour)
@@ -40,8 +39,9 @@ module.exports = {
 					.setDescription('Couldn\'t find a closed ticket with that ID')
 					.setFooter(guild.name, guild.iconURL())
 			);
+		}
 
-		if (message.author.id !== ticket.creator && !message.member.roles.cache.has(config.staff_role))
+		if (message.author.id !== ticket.creator && !message.member.roles.cache.has(config.staff_role)) {
 			return message.channel.send(
 				new MessageEmbed()
 					.setColor(config.err_colour)
@@ -50,6 +50,8 @@ module.exports = {
 					.setDescription(`You don't have permission to view ticket ${id} as it does not belong to you and you are not staff.`)
 					.setFooter(guild.name, guild.iconURL())
 			);
+		}
+
 		let res = {};
 		const embed = new MessageEmbed()
 			.setColor(config.colour)
@@ -69,11 +71,9 @@ module.exports = {
 
 
 		const BASE_URL = config.transcripts.web.server;
-		if (config.transcripts.web.enabled)
+		if (config.transcripts.web.enabled) embed.addField('Web archive', `${BASE_URL}/${ticket.creator}/${ticket.channel}`);
-			embed.addField('Web archive', `${BASE_URL}/${ticket.creator}/${ticket.channel}`);
 
-		if (embed.fields.length < 1)
+		if (embed.fields.length < 1) embed.setDescription(`No text transcripts or archive data exists for ticket ${id}`);
-			embed.setDescription(`No text transcripts or archive data exists for ticket ${id}`);
 
 		res.embed = embed;
 
@@ -85,8 +85,7 @@ module.exports = {
 		}
 
 		channel.send(res).then(m => {
-			if (channel.id === message.channel.id)
+			if (channel.id === message.channel.id) m.delete({timeout: 15000});
-				m.delete({timeout: 15000});
 		});
 		message.delete({timeout: 1500});
 	}

src/events/debug.js

@@ -11,7 +11,7 @@ const log = new ChildLogger();
 
 module.exports = {
 	event: 'debug',
-	execute(client, [e]) {
+	execute(_client, [e]) {
 		log.debug(e);
 	}
 };

src/events/error.js

@@ -11,7 +11,7 @@ const log = new ChildLogger();
 
 module.exports = {
 	event: 'error',
-	execute(client, [e]) {
+	execute(_client, [e]) {
 		log.error(e);
 	}
 };

src/events/message.js

@@ -30,8 +30,7 @@ Type \`${config.prefix}new\` on the server to create a new ticket.`);
 		 */
 
 		let ticket = await Ticket.findOne({ where: { channel: message.channel.id } });
-		if(ticket) 
+		if (ticket) archive.add(message); // add message to archive
-			archive.add(message); // add message to archive
 
 		if (message.author.bot || message.author.id === client.user.id) return; // goodbye bots
 
@@ -52,8 +51,7 @@ Type \`${config.prefix}new\` on the server to create a new ticket.`);
 
 		if (!command || commandName === 'none') return; // not an existing command
 
-		if (message.guild.id !== guild.id)
+		if (message.guild.id !== guild.id) return message.reply(`This bot can only be used within the "${guild}" server`); // not in this server
-			return message.reply(`This bot can only be used within the "${guild}" server`); // not in this server
 
 		if (command.permission && !message.member.hasPermission(command.permission)) {
 			log.console(`${message.author.tag} tried to use the '${command.name}' command without permission`);
@@ -66,7 +64,7 @@ Type \`${config.prefix}new\` on the server to create a new ticket.`);
 			);
 		}
 
-		if (command.args && !args.length)
+		if (command.args && !args.length) {
 			return message.channel.send(
 				new MessageEmbed()
 					.setColor(config.err_colour)
@@ -74,6 +72,7 @@ Type \`${config.prefix}new\` on the server to create a new ticket.`);
 					.addField('Help', `Type \`${config.prefix}help ${command.name}\` for more information`)
 					.setFooter(guild.name, guild.iconURL())
 			);
+		}
 
 		if (!client.cooldowns.has(command.name)) client.cooldowns.set(command.name, new Collection());
 

src/events/messageDelete.js

@@ -12,11 +12,10 @@ const fs = require('fs');
 
 module.exports = {
 	event: 'messageDelete',
-	async execute(client, [message], {config, Ticket}) {
+	async execute(_client, [message], {config, Ticket}) {
-
 		if (!config.transcripts.web.enabled) return;
 
-		if (message.partial) 
+		if (message.partial) {
 			try {
 				await message.fetch();
 			} catch (err) {
@@ -24,6 +23,7 @@ module.exports = {
 				log.error(err.message);
 				return;
 			}
+		}
 
 		let ticket = await Ticket.findOne({ where: { channel: message.channel.id } });
 		if (!ticket) return;
@@ -31,8 +31,7 @@ module.exports = {
 
 		let path = `user/transcripts/raw/${message.channel.id}.log`;
 		let embeds = [];
-		for (let embed in message.embeds)
+		for (let embed in message.embeds) embeds.push(message.embeds[embed].toJSON());
-			embeds.push(message.embeds[embed].toJSON());
 
 		fs.appendFileSync(path, JSON.stringify({
 			id: message.id,
@@ -44,6 +43,5 @@ module.exports = {
 			edited: message.edits.length > 1,
 			deleted: true // delete the message
 		}) + '\n');
-
 	}
 };

src/events/messageReactionAdd.js

@@ -14,14 +14,14 @@ const fs = require('fs');
 module.exports = {
 	event: 'messageReactionAdd',
 	async execute(client, [r, u], {config, Ticket, Setting}) {
-
+		if (r.partial) {
-		if (r.partial) 
 			try {
 				await r.fetch();
 			} catch (err) {
 				log.error(err);
 				return;
 			}
+		}
 
 		let panelID = await Setting.findOne({ where: { key: 'panel_msg_id' } });
 		if (!panelID) return;
@@ -35,7 +35,7 @@ module.exports = {
 		let channel = r.message.channel;
 
 		const supportRole = channel.guild.roles.cache.get(config.staff_role);
-		if (!supportRole)
+		if (!supportRole) {
 			return channel.send(
 				new MessageEmbed()
 					.setColor(config.err_colour)
@@ -43,7 +43,7 @@ module.exports = {
 					.setDescription(`${config.name} has not been set up correctly. Could not find a 'support team' role with the id \`${config.staff_role}\``)
 					.setFooter(channel.guild.name, channel.guild.iconURL())
 			);
-
+		}
 
 		// everything is cool
 
@@ -67,7 +67,6 @@ module.exports = {
 			let dm = u.dmChannel || await u.createDM();
 
 			try {
-
 				return dm.send(
 					new MessageEmbed()
 						.setColor(config.err_colour)
@@ -76,10 +75,7 @@ module.exports = {
 						.setDescription(`Use \`${config.prefix}close\` in a server channel to close unneeded tickets.\n\n${ticketList.join(',\n')}`)
 						.setFooter(channel.guild.name, channel.guild.iconURL())
 				);
-		
-
 			} catch (e) {
-
 				let m = await channel.send(
 					new MessageEmbed()
 						.setColor(config.err_colour)
@@ -88,11 +84,8 @@ module.exports = {
 						.setDescription(`Use \`${config.prefix}close\` to close unneeded tickets.\n\n${ticketList.join(',\n')}`)
 						.setFooter(channel.guild.name + ' | This message will be deleted in 15 seconds', channel.guild.iconURL())
 				);
-		
 				return m.delete({ timeout: 15000 });
 			}
-				
-			
 		}
 
 		let topic = 'No topic given (created via panel)';
@@ -130,7 +123,6 @@ module.exports = {
 			],
 			reason: 'User requested a new support ticket channel'
 		}).then(async c => {
-
 			Ticket.update({
 				channel: c.id
 			}, {
@@ -179,8 +171,7 @@ module.exports = {
 					.setFooter(channel.guild.name, channel.guild.iconURL())
 			);
 
-			if (config.tickets.pin)
+			if (config.tickets.pin) await w.pin();
-				await w.pin();
 			// await w.pin().then(m => m.delete()); // oopsie, this deletes the pinned message
 
 			if (config.logs.discord.enabled)
@@ -197,8 +188,6 @@ module.exports = {
 				);
 
 			log.info(`${u.tag} created a new ticket (#${name}) via panel`);
-
-
 		}).catch(log.error);
 	}
 };

src/events/messageUpdate.js

@@ -12,33 +12,33 @@ const fs = require('fs');
 
 module.exports = {
 	event: 'messageUpdate',
-	async execute(client, [o, n], {config, Ticket}) {
+	async execute(_client, [o, n], {config, Ticket}) {
-
 		if (!config.transcripts.web.enabled) return;
 
-		if (o.partial) 
+		if (o.partial) {
 			try {
 				await o.fetch();
 			} catch (err) {
 				log.error(err);
 				return;
 			}
+		}
 
-		if (n.partial) 
+		if (n.partial) {
 			try {
 				await n.fetch();
 			} catch (err) {
 				log.error(err);
 				return;
 			}
+		}
 
 		let ticket = await Ticket.findOne({ where: { channel: n.channel.id } });
 		if (!ticket) return;
 
 		let path = `user/transcripts/raw/${n.channel.id}.log`;
 		let embeds = [];
-		for (let embed in n.embeds)
+		for (let embed in n.embeds) embeds.push({ ...n.embeds[embed] });
-			embeds.push({ ...n.embeds[embed] });
 
 		fs.appendFileSync(path, JSON.stringify({
 			id: n.id,
@@ -50,6 +50,5 @@ module.exports = {
 			edited: true
 		}) + '\n');
 
-
 	}
 };

src/events/rateLimit.js

@@ -11,7 +11,7 @@ const log = new ChildLogger();
 
 module.exports = {
 	event: 'rateLimit',
-	execute(client, [limit]) {
+	execute(_client, [limit]) {
 		log.warn('Rate-limited! (Enable debug mode in config for details)');
 		log.debug(limit);
 	}

src/events/ready.js

@@ -13,7 +13,6 @@ const config = require('../../user/' + require('../').config);
 module.exports = {
 	event: 'ready',
 	execute(client) {
-
 		log.success(`Authenticated as ${client.user.tag}`);
 
 		const updatePresence = () => {
@@ -33,10 +32,8 @@ module.exports = {
 		}, 60000);
 
 
-		if (client.guilds.cache.get(config.guild).member(client.user).hasPermission('ADMINISTRATOR', false)) 
+		if (client.guilds.cache.get(config.guild).member(client.user).hasPermission('ADMINISTRATOR', false)) {
 			log.success('\'ADMINISTRATOR\' permission has been granted');
-		else
+		} else log.warn('Bot does not have \'ADMINISTRATOR\' permission');
-			log.warn('Bot does not have \'ADMINISTRATOR\' permission');
-		
 	}
 };

src/events/warn.js

@@ -11,7 +11,7 @@ const log = new ChildLogger();
 
 module.exports = {
 	event: 'warn',
-	execute(client, [e]) {
+	execute(_client, [e]) {
 		log.warn(e);
 	}
 };

src/index.js

@@ -40,7 +40,6 @@ log.multi(log); // required to allow other files to access the logger
 
 require('./modules/updater')(); // check for updates
 
-
 /**
  * storage
  */
@@ -48,14 +47,40 @@ const { Sequelize, Model, DataTypes } = require('sequelize');
 
 let sequelize;
 
-if(config.storage.type === 'mysql') {
+switch (config.storage.type) {
+case 'mysql':
 	log.info('Connecting to MySQL database...');
 	sequelize = new Sequelize(process.env.DB_NAME, process.env.DB_USER, process.env.DB_PASS, {
 		dialect: 'mysql',
 		host: process.env.DB_HOST,
 		logging: log.debug
 	});
-} else {
+	break;
+case 'mariadb':
+	log.info('Connecting to MariaDB database...');
+	sequelize = new Sequelize(process.env.DB_NAME, process.env.DB_USER, process.env.DB_PASS, {
+		dialect: 'mariadb',
+		host: process.env.DB_HOST,
+		logging: log.debug
+	});
+	break;
+case 'postgres':
+	log.info('Connecting to PostgresSQL database...');
+	sequelize = new Sequelize(process.env.DB_NAME, process.env.DB_USER, process.env.DB_PASS, {
+		dialect: 'postgres',
+		host: process.env.DB_HOST,
+		logging: log.debug
+	});
+	break;
+case 'microsoft':
+	log.info('Connecting to Microsoft SQL Server database...');
+	sequelize = new Sequelize(process.env.DB_NAME, process.env.DB_USER, process.env.DB_PASS, {
+		dialect: 'mssql',
+		host: process.env.DB_HOST,
+		logging: log.debug
+	});
+	break;
+default:
 	log.info('Using SQLite storage');
 	sequelize = new Sequelize({
 		dialect: 'sqlite',
@@ -123,8 +148,7 @@ const clean = () => {
 			total++;
 		}
 	}
-	if (total > 0)
+	if (total > 0) log.info(`Deleted ${total} old text ${utils.plural('transcript', total)}`);
-		log.info(`Deleted ${total} old text ${utils.plural('transcript', total)}`);
 };
 
 if (config.transcripts.text.enabled) {

src/modules/archive.js

@@ -33,8 +33,7 @@ module.exports.add = (message) => {
 			json = `user/transcripts/raw/entities/${message.channel.id}.json`;
 
 		let embeds = [];
-		for (let embed in message.embeds)
+		for (let embed in message.embeds) embeds.push({ ...message.embeds[embed] });
-			embeds.push({ ...message.embeds[embed] });
 
 		// message
 		fs.appendFileSync(raw, JSON.stringify({
@@ -104,8 +103,7 @@ module.exports.export = (Ticket, channel) => new Promise((resolve, reject) => {
 		let raw = `user/transcripts/raw/${channel.id}.log`,
 			json = `user/transcripts/raw/entities/${channel.id}.json`;
 
-		if (!config.transcripts.web.enabled || !fs.existsSync(raw) || !fs.existsSync(json))
+		if (!config.transcripts.web.enabled || !fs.existsSync(raw) || !fs.existsSync(json)) return reject(false);
-			return reject(false);
 
 		let data = JSON.parse(fs.readFileSync(json));
 
@@ -122,15 +120,12 @@ module.exports.export = (Ticket, channel) => new Promise((resolve, reject) => {
 		lineReader.eachLine(raw, line => {
 			let message = JSON.parse(line);
 			let index = data.messages.findIndex(m => m.id === message.id);
-			if (index === -1)
+			if (index === -1) data.messages.push(message);
-				data.messages.push(message);
+			else data.messages[index] = message;
-			else
-				data.messages[index] = message;	
 		}, () => {
 			let endpoint = config.transcripts.web.server;
 
-			if (endpoint[endpoint.length - 1] === '/')
+			if (endpoint[endpoint.length - 1] === '/') endpoint = endpoint.slice(0, -1);
-				endpoint = endpoint.slice(0, -1);
 
 			endpoint += `/${data.ticket.creator}/${data.ticket.channel}/?key=${process.env.ARCHIVES_KEY}`;
 
@@ -157,7 +152,5 @@ module.exports.export = (Ticket, channel) => new Promise((resolve, reject) => {
 					return resolve(e);
 				});
 		});
-	
 	})();
-
 });

src/modules/updater.js

@@ -15,13 +15,9 @@ version = 'v' + version;
 const boxen = require('boxen');
 const link = require('terminal-link');
 
-module.exports = () => {
+module.exports = async () => {
-	if(!config.updater)
+	if (!config.updater) return;
-		return;
+	const json = await (await fetch('https://api.github.com/repos/eartharoid/DiscordTickets/releases')).json();
-		
-	fetch('https://api.github.com/repos/eartharoid/DiscordTickets/releases')
-		.then(res => res.json())
-		.then(json => {
 	const update = json[0];
 	let notice = [];
 
@@ -42,5 +38,4 @@ module.exports = () => {
 			})
 		);
 	}
-		});
 };