diff --git a/commands/forceclose.js b/commands/forceclose.js index b7c2eea..b30cc64 100644 --- a/commands/forceclose.js +++ b/commands/forceclose.js @@ -25,49 +25,40 @@ const outsideticket = new Discord.RichEmbed() .setDescription(`:x: Cannot use this command becase you are outside a ticket channel.`) .setColor(bot.settings.colour) if (!message.channel.name.startsWith(`ticket-`)) return message.channel.send({embed: outsideticket}); -message.channel.delete(); - - const Ticket_Owner = message.author // Grabs - const reason = args.join(" ") || "No Reason Provided."; // - const name = message.channel.name; // channel name - const log = message.guild.channels.find(channel => channel.name === bot.settings.Transcript_Logs); + const log = message.guild.channels.find(channel => channel.name === bot.settings.Transcript_Logs) + const uID = message.author + const reason = args.join(" ") || "No Reason Provided."; + const name = message.channel.name; const c = message.channel; - - const ClosingEmbed = new Discord.RichEmbed() - .setColor(bot.settings.colour) - .setDescription(`**${Ticket_Owner}** ${Ticket_Closing}`) - message.channel.send(ClosingEmbed) + message.channel.send(`Your ticket is currently closing`) .then(() => { - const embed = new Discord.RichEmbed() - .setColor(bot.settings.colour) - .addField("Ticket Author", Ticket_Owner, true) - .addField("Closed By", message.author.tag, true) - .addField("Reason", reason, true) - - const TranscriptMESSAGE = new Discord.RichEmbed() + + const embed1 = new Discord.RichEmbed() .setTitle(bot.settings.Transcript_Title) .setColor(bot.settings.colour) .setFooter(bot.settings.footer) - .addField("Ticket Author", Ticket_Owner, true) - .addField("Closed By", message.author.tag, true) - .addField("Reason", reason, true) + .addField("Ticket Author", uID) + .addField("Closed By", message.author.tag) + .addField("Reason", reason) message.channel.fetchMessages({ limit: 100 }) - + .then(msgs => { message.channel.fetchMessages({ limit: 100, before: msgs.last().id }) + .then(msg => { const merged = msgs.concat(msg); - const output = merged.reduce((out, msg) => {out += `[${message.createdAt}] ${message.author.tag}: ${message.cleanContent ? message.cleanContent.replace(/\n/g, '\r\n') : ''}\r\n`; - return out; - - }, ''); + const output = merged.reduce((out, msg) => { + out += `[${message.createdAt}] ${message.author.tag}: ${message.cleanContent ? message.cleanContent.replace(/\n/g, '\r\n') : ''}\r\n`; + return out; + }, ''); log.send({ files: [{ attachment: Buffer.from(output, 'utf8'), name: `${name}.txt` }] }).then(c.delete()).catch(console.error); // sends the file to logs - log.send(TranscriptMESSAGE).catch(console.error); + return log.send(embed1).catch(console.error); }) }); -}) +}) + console.log(`\x1b[36m`, `${message.author} has executed ${bot.settings.prefix}${bot.settings.Forceclose_Command}`)