Hessenuk/DiscordTickets
Hessenuk/DiscordTickets
2
0
Fork 0
mirror of https://github.com/Hessenuk/DiscordTickets.git synced 2024-12-23 00:03:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

consistency

Browse Source
This commit is contained in:
David Ralph 2020-10-03 17:18:07 +01:00
parent b0ad6b7c88
commit 4c163443cd
23 changed files with 110 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/commands/add.js
View File

@ -18,7 +18,6 @@ module.exports = {
example: 'add @member to #ticket-23', example: 'add @member to #ticket-23',
args: true, args: true,
async execute(client, message, args, {config, Ticket}) { async execute(client, message, args, {config, Ticket}) {
const guild = client.guilds.cache.get(config.guild); const guild = client.guilds.cache.get(config.guild);
const notTicket = new MessageEmbed() const notTicket = new MessageEmbed()
@ -37,8 +36,7 @@ module.exports = {
if (!channel) { if (!channel) {
channel = message.channel; channel = message.channel;
ticket = await Ticket.findOne({ where: { channel: message.channel.id } }); ticket = await Ticket.findOne({ where: { channel: message.channel.id } });
if(!ticket) if (!ticket) return message.channel.send(notTicket);
return message.channel.send(notTicket);
} else { } else {
ticket = await Ticket.findOne({ where: { channel: channel.id } }); ticket = await Ticket.findOne({ where: { channel: channel.id } });
@ -50,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( return message.channel.send(
new MessageEmbed() new MessageEmbed()
.setColor(config.err_colour) .setColor(config.err_colour)
@ -61,10 +59,11 @@ module.exports = {
.addField('Help', `Type \`${config.prefix}help ${this.name}\` for more information`) .addField('Help', `Type \`${config.prefix}help ${this.name}\` for more information`)
.setFooter(guild.name, guild.iconURL()) .setFooter(guild.name, guild.iconURL())
); );
}
let member = guild.member(message.mentions.users.first() || guild.members.cache.get(args[0])); let member = guild.member(message.mentions.users.first() || guild.members.cache.get(args[0]));
if (!member) if (!member) {
return message.channel.send( return message.channel.send(
new MessageEmbed() new MessageEmbed()
.setColor(config.err_colour) .setColor(config.err_colour)
@ -75,6 +74,7 @@ module.exports = {
.addField('Help', `Type \`${config.prefix}help ${this.name}\` for more information`) .addField('Help', `Type \`${config.prefix}help ${this.name}\` for more information`)
.setFooter(guild.name, guild.iconURL()) .setFooter(guild.name, guild.iconURL())
); );
}
try { try {
channel.updateOverwrite(member.user, { channel.updateOverwrite(member.user, {
@ -84,7 +84,7 @@ module.exports = {
READ_MESSAGE_HISTORY: true READ_MESSAGE_HISTORY: true
}); });
if (channel.id !== message.channel.id) if (channel.id !== message.channel.id) {
channel.send( channel.send(
new MessageEmbed() new MessageEmbed()
.setColor(config.colour) .setColor(config.colour)
@ -93,7 +93,7 @@ module.exports = {
.setDescription(`${member} has been added by ${message.author}`) .setDescription(`${member} has been added by ${message.author}`)
.setFooter(guild.name, guild.iconURL()) .setFooter(guild.name, guild.iconURL())
); );
}
message.channel.send( message.channel.send(
new MessageEmbed() new MessageEmbed()

28
src/commands/close.js
View File

@ -21,11 +21,7 @@ module.exports = {
aliases: ['none'], aliases: ['none'],
example: 'close #ticket-17', example: 'close #ticket-17',
args: false, 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 guild = client.guilds.cache.get(config.guild);
const notTicket = new MessageEmbed() const notTicket = new MessageEmbed()
@ -49,11 +45,8 @@ module.exports = {
channel: channel.id channel: channel.id
} }
}); });
if (!ticket) if (!ticket) return channel.send(notTicket);
return channel.send(notTicket);
} else { } else {
ticket = await Ticket.findOne({ ticket = await Ticket.findOne({
where: { where: {
channel: channel.id channel: channel.id
@ -102,7 +95,7 @@ module.exports = {
}); });
collector.on('collect', async () => { collector.on('collect', async () => {
if (channel.id !== message.channel.id) if (channel.id !== message.channel.id) {
channel.send( channel.send(
new MessageEmbed() new MessageEmbed()
.setColor(config.colour) .setColor(config.colour)
@ -111,6 +104,7 @@ module.exports = {
.setDescription(`Ticket closed by ${message.author}`) .setDescription(`Ticket closed by ${message.author}`)
.setFooter(guild.name, guild.iconURL()) .setFooter(guild.name, guild.iconURL())
); );
}
confirm.reactions.removeAll(); confirm.reactions.removeAll();
confirm.edit( confirm.edit(
@ -149,15 +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)); 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}`); embed.setDescription(`No text transcripts or archive data exists for ticket ${ticket.id}`);
}
res.embed = embed; res.embed = embed;
@ -165,7 +157,6 @@ module.exports = {
} }
} }
// update database // update database
success = true; success = true;
ticket.update({ ticket.update({
@ -186,7 +177,7 @@ module.exports = {
log.info(`${message.author.tag} closed a ticket (#ticket-${ticket.id})`); 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( client.channels.cache.get(config.logs.discord.channel).send(
new MessageEmbed() new MessageEmbed()
.setColor(config.colour) .setColor(config.colour)
@ -197,6 +188,7 @@ module.exports = {
.setFooter(guild.name, guild.iconURL()) .setFooter(guild.name, guild.iconURL())
.setTimestamp() .setTimestamp()
); );
}
}); });

22
src/commands/delete.js
View File

@ -24,7 +24,6 @@ module.exports = {
config, config,
Ticket Ticket
}) { }) {
const guild = client.guilds.cache.get(config.guild); const guild = client.guilds.cache.get(config.guild);
const notTicket = new MessageEmbed() const notTicket = new MessageEmbed()
@ -48,11 +47,9 @@ module.exports = {
channel: channel.id channel: channel.id
} }
}); });
if (!ticket) if (!ticket) return channel.send(notTicket);
return channel.send(notTicket);
} else { } else {
ticket = await Ticket.findOne({ ticket = await Ticket.findOne({
where: { where: {
channel: channel.id channel: channel.id
@ -65,7 +62,7 @@ module.exports = {
return message.channel.send(notTicket); 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( return channel.send(
new MessageEmbed() new MessageEmbed()
.setColor(config.err_colour) .setColor(config.err_colour)
@ -76,6 +73,7 @@ module.exports = {
.addField('Help', `Type \`${config.prefix}help ${this.name}\` for more information`) .addField('Help', `Type \`${config.prefix}help ${this.name}\` for more information`)
.setFooter(guild.name, guild.iconURL()) .setFooter(guild.name, guild.iconURL())
); );
}
} }
let success; let success;
@ -124,14 +122,9 @@ module.exports = {
raw = `user/transcripts/raw/${ticket.get('channel')}.log`, raw = `user/transcripts/raw/${ticket.get('channel')}.log`,
json = `user/transcripts/raw/entities/${ticket.get('channel')}.json`; 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 // update database
success = true; success = true;
@ -147,7 +140,7 @@ module.exports = {
log.info(`${message.author.tag} deleted a ticket (#ticket-${ticket.id})`); 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( client.channels.cache.get(config.logs.discord.channel).send(
new MessageEmbed() new MessageEmbed()
.setColor(config.colour) .setColor(config.colour)
@ -158,6 +151,7 @@ module.exports = {
.setFooter(guild.name, guild.iconURL()) .setFooter(guild.name, guild.iconURL())
.setTimestamp() .setTimestamp()
); );
}
}); });

23
src/commands/help.js
View File

@ -18,7 +18,6 @@ module.exports = {
example: 'help new', example: 'help new',
args: false, args: false,
execute(client, message, args, {config}) { execute(client, message, args, {config}) {
const guild = client.guilds.cache.get(config.guild); const guild = client.guilds.cache.get(config.guild);
const commands = Array.from(client.commands.values()); const commands = Array.from(client.commands.values());
@ -27,15 +26,12 @@ module.exports = {
let cmds = []; let cmds = [];
for (let command of commands) { 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; 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}`); cmds.push(`**${config.prefix}${command.name}** **·** ${desc}`);
} }
@ -71,11 +67,9 @@ module.exports = {
.setTitle(command.name); .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.aliases) cmd.addField('Aliases', `\`${command.aliases.join(', ')}\``, true);
if (command.usage) cmd.addField('Usage', `\`${config.prefix}${command.name} ${command.usage}\``, false); 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)) { 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); 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); message.channel.send(cmd);
} }
// command ends here // command ends here

12
src/commands/new.js
View File

@ -19,7 +19,6 @@ module.exports = {
example: 'new my server won\'t start', example: 'new my server won\'t start',
args: false, args: false,
async execute(client, message, args, {config, Ticket}) { async execute(client, message, args, {config, Ticket}) {
const guild = client.guilds.cache.get(config.guild); const guild = client.guilds.cache.get(config.guild);
const supportRole = guild.roles.cache.get(config.staff_role); const supportRole = guild.roles.cache.get(config.staff_role);
@ -43,7 +42,7 @@ module.exports = {
if (tickets.count >= config.tickets.max) { if (tickets.count >= config.tickets.max) {
let ticketList = []; let ticketList = [];
for (let t in tickets.rows) { for (let t in tickets.rows) {
let desc = tickets.rows[t].topic.substring(0, 30); let desc = tickets.rows[t].topic.substring(0, 30);
ticketList ticketList
.push(`<#${tickets.rows[t].channel}>: \`${desc}${desc.length > 30 ? '...' : ''}\``); .push(`<#${tickets.rows[t].channel}>: \`${desc}${desc.length > 30 ? '...' : ''}\``);
@ -75,9 +74,7 @@ module.exports = {
.setDescription('Please limit your ticket topic to less than 256 characters. A short sentence will do.') .setDescription('Please limit your ticket topic to less than 256 characters. A short sentence will do.')
.setFooter(guild.name, guild.iconURL()) .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({ let ticket = await Ticket.create({
channel: '', channel: '',
@ -175,9 +172,8 @@ module.exports = {
.setFooter(guild.name, guild.iconURL()) .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
// await w.pin().then(m => m.delete()); // oopsie, this deletes the pinned message
if (config.logs.discord.enabled) if (config.logs.discord.enabled)
client.channels.cache.get(config.logs.discord.channel).send( client.channels.cache.get(config.logs.discord.channel).send(

10
src/commands/panel.js
View File

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

15
src/commands/remove.js
View File

@ -18,7 +18,6 @@ module.exports = {
example: 'remove @member from #ticket-23', example: 'remove @member from #ticket-23',
args: true, args: true,
async execute(client, message, args, {config, Ticket}) { async execute(client, message, args, {config, Ticket}) {
const guild = client.guilds.cache.get(config.guild); const guild = client.guilds.cache.get(config.guild);
const notTicket = new MessageEmbed() const notTicket = new MessageEmbed()
@ -44,7 +43,7 @@ module.exports = {
} else { } else {
ticket = await Ticket.findOne({ where: { channel: channel.id } }); ticket = await Ticket.findOne({ where: { channel: channel.id } });
if(!ticket) { if (!ticket) {
notTicket notTicket
.setTitle(':x: **Channel is not a ticket**') .setTitle(':x: **Channel is not a ticket**')
.setDescription(`${channel} is not a ticket channel.`); .setDescription(`${channel} is not a ticket channel.`);
@ -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( return message.channel.send(
new MessageEmbed() new MessageEmbed()
.setColor(config.err_colour) .setColor(config.err_colour)
@ -63,12 +62,11 @@ module.exports = {
.addField('Help', `Type \`${config.prefix}help ${this.name}\` for more information`) .addField('Help', `Type \`${config.prefix}help ${this.name}\` for more information`)
.setFooter(guild.name, guild.iconURL()) .setFooter(guild.name, guild.iconURL())
); );
}
let member = guild.member(message.mentions.users.first() || guild.members.cache.get(args[0])); let member = guild.member(message.mentions.users.first() || guild.members.cache.get(args[0]));
if(!member || member.id === message.author.id || member.id === guild.me.id) if (!member || member.id === message.author.id || member.id === guild.me.id)
return message.channel.send( return message.channel.send(
new MessageEmbed() new MessageEmbed()
.setColor(config.err_colour) .setColor(config.err_colour)
@ -88,7 +86,7 @@ module.exports = {
READ_MESSAGE_HISTORY: false READ_MESSAGE_HISTORY: false
}); });
if(channel.id !== message.channel.id) if (channel.id !== message.channel.id) {
channel.send( channel.send(
new MessageEmbed() new MessageEmbed()
.setColor(config.colour) .setColor(config.colour)
@ -97,8 +95,7 @@ module.exports = {
.setDescription(`${member} has been removed by ${message.author}`) .setDescription(`${member} has been removed by ${message.author}`)
.setFooter(guild.name, guild.iconURL()) .setFooter(guild.name, guild.iconURL())
); );
}
message.channel.send( message.channel.send(
new MessageEmbed() new MessageEmbed()

3
src/commands/stats.js
View File

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

21
src/commands/tickets.js
View File

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

9
src/commands/topic.js
View File

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

17
src/commands/transcript.js
View File

@ -19,7 +19,6 @@ module.exports = {
example: 'transcript 57', example: 'transcript 57',
args: true, args: true,
async execute(client, message, args, {config, Ticket}) { async execute(client, message, args, {config, Ticket}) {
const guild = client.guilds.cache.get(config.guild); const guild = client.guilds.cache.get(config.guild);
const id = args[0]; const id = args[0];
@ -31,7 +30,7 @@ module.exports = {
}); });
if (!ticket) if (!ticket) {
return message.channel.send( return message.channel.send(
new MessageEmbed() new MessageEmbed()
.setColor(config.err_colour) .setColor(config.err_colour)
@ -40,8 +39,9 @@ module.exports = {
.setDescription('Couldn\'t find a closed ticket with that ID') .setDescription('Couldn\'t find a closed ticket with that ID')
.setFooter(guild.name, guild.iconURL()) .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( return message.channel.send(
new MessageEmbed() new MessageEmbed()
.setColor(config.err_colour) .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.`) .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()) .setFooter(guild.name, guild.iconURL())
); );
}
let res = {}; let res = {};
const embed = new MessageEmbed() const embed = new MessageEmbed()
.setColor(config.colour) .setColor(config.colour)
@ -69,11 +71,9 @@ module.exports = {
const BASE_URL = config.transcripts.web.server; 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; res.embed = embed;
@ -85,8 +85,7 @@ module.exports = {
} }
channel.send(res).then(m => { 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}); message.delete({timeout: 1500});
} }

2
src/events/debug.js
View File

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

2
src/events/error.js
View File

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

9
src/events/message.js
View File

@ -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 } }); 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 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 (!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)) { if (command.permission && !message.member.hasPermission(command.permission)) {
log.console(`${message.author.tag} tried to use the '${command.name}' command without 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( return message.channel.send(
new MessageEmbed() new MessageEmbed()
.setColor(config.err_colour) .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`) .addField('Help', `Type \`${config.prefix}help ${command.name}\` for more information`)
.setFooter(guild.name, guild.iconURL()) .setFooter(guild.name, guild.iconURL())
); );
}
if (!client.cooldowns.has(command.name)) client.cooldowns.set(command.name, new Collection()); if (!client.cooldowns.has(command.name)) client.cooldowns.set(command.name, new Collection());

14
src/events/messageDelete.js
View File

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

27
src/events/messageReactionAdd.js
View File

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

16
src/events/messageUpdate.js
View File

@ -12,33 +12,33 @@ const fs = require('fs');
module.exports = { module.exports = {
event: 'messageUpdate', event: 'messageUpdate',
async execute(client, [o, n], {config, Ticket}) { async execute(_client, [o, n], {config, Ticket}) {
if (!config.transcripts.web.enabled) return;
if(!config.transcripts.web.enabled) return; if (o.partial) {
if (o.partial)
try { try {
await o.fetch(); await o.fetch();
} catch (err) { } catch (err) {
log.error(err); log.error(err);
return; return;
} }
}
if (n.partial) if (n.partial) {
try { try {
await n.fetch(); await n.fetch();
} catch (err) { } catch (err) {
log.error(err); log.error(err);
return; return;
} }
}
let ticket = await Ticket.findOne({ where: { channel: n.channel.id } }); let ticket = await Ticket.findOne({ where: { channel: n.channel.id } });
if(!ticket) return; if (!ticket) return;
let path = `user/transcripts/raw/${n.channel.id}.log`; let path = `user/transcripts/raw/${n.channel.id}.log`;
let embeds = []; 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({ fs.appendFileSync(path, JSON.stringify({
id: n.id, id: n.id,

2
src/events/rateLimit.js
View File

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

7
src/events/ready.js
View File

@ -13,7 +13,6 @@ const config = require('../../user/' + require('../').config);
module.exports = { module.exports = {
event: 'ready', event: 'ready',
execute(client) { execute(client) {
log.success(`Authenticated as ${client.user.tag}`); log.success(`Authenticated as ${client.user.tag}`);
const updatePresence = () => { const updatePresence = () => {
@ -33,10 +32,8 @@ module.exports = {
}, 60000); }, 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'); 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');
} }
}; };

2
src/events/warn.js
View File

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

3
src/index.js
View File

@ -148,8 +148,7 @@ const clean = () => {
total++; 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) { if (config.transcripts.text.enabled) {

17
src/modules/archive.js
View File

@ -33,8 +33,7 @@ module.exports.add = (message) => {
json = `user/transcripts/raw/entities/${message.channel.id}.json`; json = `user/transcripts/raw/entities/${message.channel.id}.json`;
let embeds = []; 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 // message
fs.appendFileSync(raw, JSON.stringify({ 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`, let raw = `user/transcripts/raw/${channel.id}.log`,
json = `user/transcripts/raw/entities/${channel.id}.json`; 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)); let data = JSON.parse(fs.readFileSync(json));
@ -122,15 +120,12 @@ module.exports.export = (Ticket, channel) => new Promise((resolve, reject) => {
lineReader.eachLine(raw, line => { lineReader.eachLine(raw, line => {
let message = JSON.parse(line); let message = JSON.parse(line);
let index = data.messages.findIndex(m => m.id === message.id); 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; 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}`; 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); return resolve(e);
}); });
}); });
})(); })();
}); });

3
src/modules/updater.js
View File

@ -16,8 +16,7 @@ const boxen = require('boxen');
const link = require('terminal-link'); const link = require('terminal-link');
module.exports = async () => { 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(); const json = await (await fetch('https://api.github.com/repos/eartharoid/DiscordTickets/releases')).json();
const update = json[0]; const update = json[0];
let notice = []; let notice = [];