From ae15265af65e04b245b18f923dca4f0c242f2aac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Bersier?= Date: Fri, 12 Jul 2019 05:43:32 +0200 Subject: [PATCH] Changed how this command work --- commands/utility/taglist.js | 41 ++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/commands/utility/taglist.js b/commands/utility/taglist.js index a5a9e963..327e1592 100644 --- a/commands/utility/taglist.js +++ b/commands/utility/taglist.js @@ -1,6 +1,7 @@ const { Command } = require('discord-akairo'); const Tag = require('../../models').Tag; const fs = require('fs'); +const { MessageEmbed } = require('discord.js'); class taglistCommand extends Command { @@ -16,9 +17,9 @@ class taglistCommand extends Command { optional: true }, { - id: 'list', + id: 'all', match: 'flag', - flag: '--list', + flag: '--all', } ], description: { @@ -30,28 +31,40 @@ class taglistCommand extends Command { } async exec(message, args) { - if (args.list) { - let tagList = await Tag.findAll({attributes: ['trigger'], where: {serverID: message.guild.id}}); - const tagString = tagList.map(t => t.trigger).join(', ') || 'No tags set.'; - return message.channel.send(`List of tags:\n${tagString}`, {code: true}); - } - if (args.raw) { let tagList = await Tag.findOne({attributes: ['trigger','response','ownerID'], where: {trigger: args.raw, serverID: message.guild.id}}); - - return message.channel.send(JSON.stringify(tagList, null, 2), {code: true}); - } else { + this.client.users.fetch(tagList.dataValues.ownerID) + .then(user => { + const TagEmbed = new MessageEmbed() + .setColor('#ff9900') + .setTitle(message.guild.name) + .addField('Trigger:', tagList['dataValues']['trigger']) + .addField('Response:', tagList['dataValues']['response']) + .addField('Owner:', `${user.username}#${user.discriminator} (${user.id})`); + + return message.channel.send(TagEmbed); + }); + } else if (args.all) { let tagList = await Tag.findAll({attributes: ['trigger','response','ownerID'], where: {serverID: message.guild.id}}); - let tagArray = []; + var tagArray = []; tagList.forEach(tag => { - tagArray.push(tag['dataValues']); + tagArray.push(tag.dataValues); }); fs.writeFile('/tmp/tagslist.txt',JSON.stringify(tagArray, null, 2), function(err) { if (err) return console.error(err); return message.channel.send('Here are your tags', {files: ['/tmp/tagslist.txt']}); }); + } else { + let tagList = await Tag.findAll({attributes: ['trigger'], where: {serverID: message.guild.id}}); + const tagString = tagList.map(t => t.trigger).join(', ') || 'No tags set.'; + const TagEmbed = new MessageEmbed() + .setColor('#ff9900') + .setTitle('List of tags') + .setDescription(tagString) + .setFooter('Use this command with the name of the tag to see more info about it!'); + + return message.channel.send(TagEmbed); } - } } module.exports = taglistCommand; \ No newline at end of file