diff --git a/assets/images/spam.png b/assets/images/spam.png new file mode 100644 index 00000000..cf2d7f1d Binary files /dev/null and b/assets/images/spam.png differ diff --git a/assets/images/xiaopai1.png b/assets/images/xiaopai1.png new file mode 100644 index 00000000..14f44a9d Binary files /dev/null and b/assets/images/xiaopai1.png differ diff --git a/assets/images/xiaopai10.png b/assets/images/xiaopai10.png new file mode 100644 index 00000000..8727bc38 Binary files /dev/null and b/assets/images/xiaopai10.png differ diff --git a/assets/images/xiaopai2.png b/assets/images/xiaopai2.png new file mode 100644 index 00000000..60696ef6 Binary files /dev/null and b/assets/images/xiaopai2.png differ diff --git a/assets/images/xiaopai3.png b/assets/images/xiaopai3.png new file mode 100644 index 00000000..feac6b66 Binary files /dev/null and b/assets/images/xiaopai3.png differ diff --git a/assets/images/xiaopai4.png b/assets/images/xiaopai4.png new file mode 100644 index 00000000..4e2b9797 Binary files /dev/null and b/assets/images/xiaopai4.png differ diff --git a/assets/images/xiaopai5.png b/assets/images/xiaopai5.png new file mode 100644 index 00000000..0dae3bba Binary files /dev/null and b/assets/images/xiaopai5.png differ diff --git a/assets/images/xiaopai6.png b/assets/images/xiaopai6.png new file mode 100644 index 00000000..b028c2d3 Binary files /dev/null and b/assets/images/xiaopai6.png differ diff --git a/assets/images/xiaopai7.png b/assets/images/xiaopai7.png new file mode 100644 index 00000000..1a41e557 Binary files /dev/null and b/assets/images/xiaopai7.png differ diff --git a/assets/images/xiaopai8.png b/assets/images/xiaopai8.png new file mode 100644 index 00000000..c1262455 Binary files /dev/null and b/assets/images/xiaopai8.png differ diff --git a/assets/images/xiaopai9.png b/assets/images/xiaopai9.png new file mode 100644 index 00000000..3302cad5 Binary files /dev/null and b/assets/images/xiaopai9.png differ diff --git a/assets/json/xiaopai.json b/assets/json/xiaopai.json deleted file mode 100644 index eea8c704..00000000 --- a/assets/json/xiaopai.json +++ /dev/null @@ -1,23 +0,0 @@ -[ - "https://i.imgur.com/tyVciSC.png", - "https://i.imgur.com/dTGqFFe.jpg", - "https://i.imgur.com/bB1FpdZ.jpg", - "https://i.imgur.com/BuO0RHc.jpg", - "https://i.imgur.com/oXCxBSe.jpg", - "https://i.imgur.com/Wf6Kss3.jpg", - "https://i.imgur.com/OiFboDi.jpg", - "https://i.imgur.com/3Z56sKT.png", - "https://i.imgur.com/rBLuUPT.png", - "https://i.imgur.com/XSuTmzl.png", - "https://i.imgur.com/sBIo3oF.png", - "https://i.imgur.com/dcWMZnv.png", - "https://i.imgur.com/nh6kZjH.jpg", - "https://i.imgur.com/DbBeMgY.png", - "https://i.imgur.com/qaXCHLv.png", - "https://i.imgur.com/34itKmU.jpg", - "https://i.imgur.com/3pbBjxN.png", - "https://i.imgur.com/bKx1XuE.gif", - "https://i.imgur.com/iSVUORW.png", - "https://i.imgur.com/O2JLT8q.jpg", - "https://i.imgur.com/kEAj26f.jpg" -] diff --git a/commands/avataredit/3000years.js b/commands/avataredit/3000years.js index 8718de9b..b21d3289 100644 --- a/commands/avataredit/3000years.js +++ b/commands/avataredit/3000years.js @@ -28,7 +28,7 @@ module.exports = class YearsCommand extends Command { if (!msg.channel.permissionsFor(this.client.user).has('ATTACH_FILES')) return msg.say('This Command requires the `Attach Files` Permission.'); const { user } = args; - const avatarURL = user.avatarURL('png', 2048); + const avatarURL = user.avatarURL('png', 256); if (!avatarURL) return msg.say('This user has no avatar.'); try { const Image = Canvas.Image; @@ -41,8 +41,8 @@ module.exports = class YearsCommand extends Command { ctx.drawImage(avatar, 461, 127, 200, 200); }; base.src = await fs.readFileAsync(path.join(__dirname, '..', '..', 'assets', 'images', '3000years.png')); - const avatarImg = await request.get(avatarURL); - avatar.src = avatarImg.body; + const { body } = await request.get(avatarURL); + avatar.src = body; generate(); return msg.channel.send({ files: [{ attachment: canvas.toBuffer(), name: 'az.png' }] }) .catch(err => msg.say(err)); diff --git a/commands/avataredit/beautiful.js b/commands/avataredit/beautiful.js index c155496b..da023d26 100644 --- a/commands/avataredit/beautiful.js +++ b/commands/avataredit/beautiful.js @@ -28,7 +28,7 @@ module.exports = class BeautifulCommand extends Command { if (!msg.channel.permissionsFor(this.client.user).has('ATTACH_FILES')) return msg.say('This Command requires the `Attach Files` Permission.'); const { user } = args; - const avatarURL = user.avatarURL('png', 2048); + const avatarURL = user.avatarURL('png', 256); if (!avatarURL) return msg.say('This user has no avatar.'); try { const Image = Canvas.Image; @@ -42,8 +42,8 @@ module.exports = class BeautifulCommand extends Command { ctx.drawImage(avatar, 343, 301, 117, 135); }; base.src = await fs.readFileAsync(path.join(__dirname, '..', '..', 'assets', 'images', 'beautiful.png')); - const avatarImg = await request.get(avatarURL); - avatar.src = avatarImg.body; + const { body } = await request.get(avatarURL); + avatar.src = body; generate(); return msg.channel.send({ files: [{ attachment: canvas.toBuffer(), name: 'grunkle.png' }] }) .catch(err => msg.say(err)); diff --git a/commands/avataredit/bobross.js b/commands/avataredit/bobross.js index 5ca48345..da538b6f 100644 --- a/commands/avataredit/bobross.js +++ b/commands/avataredit/bobross.js @@ -28,7 +28,7 @@ module.exports = class BobRossCommand extends Command { if (!msg.channel.permissionsFor(this.client.user).has('ATTACH_FILES')) return msg.say('This Command requires the `Attach Files` Permission.'); const { user } = args; - const avatarURL = user.avatarURL('png', 2048); + const avatarURL = user.avatarURL('png', 256); if (!avatarURL) return msg.say('This user has no avatar.'); try { const Image = Canvas.Image; @@ -40,13 +40,13 @@ module.exports = class BobRossCommand extends Command { ctx.fillStyle = 'white'; ctx.fillRect(0, 0, 600, 775); ctx.rotate(3 * Math.PI / 180); - ctx.drawImage(avatar, 50, 80, 300, 300); + ctx.drawImage(avatar, 69, 102, 256, 256); ctx.rotate(-3 * Math.PI / 180); ctx.drawImage(base, 0, 0); }; base.src = await fs.readFileAsync(path.join(__dirname, '..', '..', 'assets', 'images', 'bobross.png')); - const avatarImg = await request.get(avatarURL); - avatar.src = avatarImg.body; + const { body } = await request.get(avatarURL); + avatar.src = body; generate(); return msg.channel.send({ files: [{ attachment: canvas.toBuffer(), name: 'ross.png' }] }) .catch(err => msg.say(err)); diff --git a/commands/avataredit/card.js b/commands/avataredit/card.js index d9856f5b..729737a1 100644 --- a/commands/avataredit/card.js +++ b/commands/avataredit/card.js @@ -35,7 +35,7 @@ module.exports = class CardCommand extends Command { if (cardID < 5000) rarity = 'C'; else if (cardID < 8000) rarity = 'U'; else rarity = 'R'; - const avatarURL = member.user.avatarURL('png', 2048); + const avatarURL = member.user.avatarURL('png', 512); if (!avatarURL) return msg.say('This user has no avatar.'); try { const Image = Canvas.Image; @@ -64,8 +64,8 @@ module.exports = class CardCommand extends Command { ctx.fillText(`#${member.user.discriminator}`, 313, 355); }; base.src = await fs.readFileAsync(path.join(__dirname, '..', '..', 'assets', 'images', 'card.png')); - const avatarImg = await request.get(avatarURL); - avatar.src = avatarImg.body; + const { body } = await request.get(avatarURL); + avatar.src = body; generate(); return msg.channel.send({ files: [{ attachment: canvas.toBuffer(), name: 'card.png' }] }) .catch(err => msg.say(err)); diff --git a/commands/avataredit/greyscale.js b/commands/avataredit/greyscale.js index e9dd880f..3a6bafe5 100644 --- a/commands/avataredit/greyscale.js +++ b/commands/avataredit/greyscale.js @@ -25,16 +25,16 @@ module.exports = class GreyscaleCommand extends Command { if (!msg.channel.permissionsFor(this.client.user).has('ATTACH_FILES')) return msg.say('This Command requires the `Attach Files` Permission.'); const { user } = args; - const avatarURL = user.avatarURL('png', 2048); + const avatarURL = user.avatarURL('png', 256); if (!avatarURL) return msg.say('This user has no avatar.'); try { const Image = Canvas.Image; - const canvas = new Canvas(500, 500); + const canvas = new Canvas(256, 256); const ctx = canvas.getContext('2d'); const avatar = new Image(); const generate = () => { - ctx.drawImage(avatar, 0, 0, 500, 500); - const imgData = ctx.getImageData(0, 0, 500, 500); + ctx.drawImage(avatar, 0, 0, 256, 256); + const imgData = ctx.getImageData(0, 0, 256, 256); const data = imgData.data; for (let i = 0; i < data.length; i += 4) { const brightness = 0.34 * data[i] + 0.5 * data[i + 1] + 0.16 * data[i + 2]; diff --git a/commands/avataredit/invert.js b/commands/avataredit/invert.js index 6c2a0aac..8e128997 100644 --- a/commands/avataredit/invert.js +++ b/commands/avataredit/invert.js @@ -24,16 +24,16 @@ module.exports = class InvertCommand extends Command { if (!msg.channel.permissionsFor(this.client.user).has('ATTACH_FILES')) return msg.say('This Command requires the `Attach Files` Permission.'); const { user } = args; - const avatarURL = user.avatarURL('png', 2048); + const avatarURL = user.avatarURL('png', 256); if (!avatarURL) return msg.say('This user has no avatar.'); try { const Image = Canvas.Image; - const canvas = new Canvas(500, 500); + const canvas = new Canvas(256, 256); const ctx = canvas.getContext('2d'); const avatar = new Image(); const generate = () => { - ctx.drawImage(avatar, 0, 0, 500, 500); - const imgData = ctx.getImageData(0, 0, 500, 500); + ctx.drawImage(avatar, 0, 0, 256, 256); + const imgData = ctx.getImageData(0, 0, 256, 256); const data = imgData.data; for (let i = 0; i < data.length; i += 4) { data[i] = 255 - data[i]; diff --git a/commands/avataredit/rip.js b/commands/avataredit/rip.js index 7ea72f2a..38f0d8e8 100644 --- a/commands/avataredit/rip.js +++ b/commands/avataredit/rip.js @@ -28,7 +28,7 @@ module.exports = class RIPCommand extends Command { if (!msg.channel.permissionsFor(this.client.user).has('ATTACH_FILES')) return msg.say('This Command requires the `Attach Files` Permission.'); const { user } = args; - const avatarURL = user.avatarURL('png', 2048); + const avatarURL = user.avatarURL('png', 256); if (!avatarURL) return msg.say('This User has no Avatar.'); try { const Image = Canvas.Image; diff --git a/commands/avataredit/steamcard.js b/commands/avataredit/steamcard.js index 2409e870..87c9b17b 100644 --- a/commands/avataredit/steamcard.js +++ b/commands/avataredit/steamcard.js @@ -28,7 +28,7 @@ module.exports = class SteamCardCommand extends Command { return msg.say('This Command requires the `Attach Files` Permission.'); const { user } = args; const username = msg.guild ? (msg.guild.member(user) ? msg.guild.member(user).displayName : user.username) : user.username; - const avatarURL = user.avatarURL('png', 2048); + const avatarURL = user.avatarURL('png', 512); if (!avatarURL) return msg.say('This user has no avatar.'); try { const Image = Canvas.Image; @@ -46,8 +46,8 @@ module.exports = class SteamCardCommand extends Command { ctx.fillText(username, 35, 48); }; base.src = await fs.readFileAsync(path.join(__dirname, '..', '..', 'assets', 'images', 'steamcard.png')); - const avatarImg = await request.get(avatarURL); - avatar.src = avatarImg.body; + const { body } = await request.get(avatarURL); + avatar.src = body; generate(); return msg.channel.send({ files: [{ attachment: canvas.toBuffer(), name: 'card.png' }] }) .catch(err => msg.say(err)); diff --git a/commands/avataredit/triggered.js b/commands/avataredit/triggered.js index f4dc9c54..4c4a7bd7 100644 --- a/commands/avataredit/triggered.js +++ b/commands/avataredit/triggered.js @@ -27,7 +27,7 @@ module.exports = class TriggeredCommand extends Command { if (!msg.channel.permissionsFor(this.client.user).has('ATTACH_FILES')) return msg.say('This Command requires the `Attach Files` Permission.'); const { user } = args; - const avatarURL = user.avatarURL('png', 2048); + const avatarURL = user.avatarURL('png', 512); if (!avatarURL) return msg.say('This user has no avatar.'); try { const Image = Canvas.Image; @@ -48,8 +48,8 @@ module.exports = class TriggeredCommand extends Command { ctx.drawImage(base, 0, 0); }; base.src = await fs.readFileAsync(path.join(__dirname, '..', '..', 'assets', 'images', 'triggered.png')); - const avatarImg = await request.get(avatarURL); - avatar.src = avatarImg.body; + const { body } = await request.get(avatarURL); + avatar.src = body; generate(); return msg.channel.send({ files: [{ attachment: canvas.toBuffer(), name: 'triggered.png' }] }) .catch(err => msg.say(err)); diff --git a/commands/avataredit/wanted.js b/commands/avataredit/wanted.js index 1ba94fc5..3eee79ab 100644 --- a/commands/avataredit/wanted.js +++ b/commands/avataredit/wanted.js @@ -27,7 +27,7 @@ module.exports = class WantedCommand extends Command { if (!msg.channel.permissionsFor(this.client.user).has('ATTACH_FILES')) return msg.say('This Command requires the `Attach Files` Permission.'); const { user } = args; - const avatarURL = user.avatarURL('png', 2048); + const avatarURL = user.avatarURL('png', 512); if (!avatarURL) return msg.say('This user has no avatar.'); try { const Image = Canvas.Image; @@ -40,8 +40,8 @@ module.exports = class WantedCommand extends Command { ctx.drawImage(avatar, 150, 360, 430, 430); }; base.src = await fs.readFileAsync(path.join(__dirname, '..', '..', 'assets', 'images', 'wanted.png')); - const avatarImg = await request.get(avatarURL); - avatar.src = avatarImg.body; + const { body } = await request.get(avatarURL); + avatar.src = body; generate(); return msg.channel.send({ files: [{ attachment: canvas.toBuffer(), name: 'wanted.png' }] }) .catch(err => msg.say(err)); diff --git a/commands/guildinfo/guildinfo.js b/commands/guildinfo/guildinfo.js index c97790ca..50850319 100644 --- a/commands/guildinfo/guildinfo.js +++ b/commands/guildinfo/guildinfo.js @@ -22,22 +22,22 @@ module.exports = class GuildInfoCommand extends Command { const embed = new RichEmbed() .setColor(0x00AE86) .setThumbnail(msg.guild.iconURL()) - .addField('**Name:**', + .addField('Name', msg.guild.name, true) - .addField('**ID:**', + .addField('ID', msg.guild.id, true) - .addField('**Created On:**', + .addField('Creation Date', stripIndents` - ${msg.guild.createdAt} + ${moment(msg.guild.createdTimestamp).format('MMMM Do YYYY h:mm:ss A')} ${moment.duration(Date.now() - msg.guild.createdTimestamp).format('y[ years], M[ months], w[ weeks, and ]d[ days]')} ago. `, true) - .addField('**Default Channel:**', + .addField('Default Channel', msg.guild.defaultChannel, true) - .addField('**Region:**', + .addField('Region', msg.guild.region, true) - .addField('**Owner:**', - msg.guild.owner.user.tag, true) - .addField('**Users:**', + .addField('Owner', + msg.guild.owner, true) + .addField('Members', msg.guild.memberCount, true); return msg.embed(embed); } diff --git a/commands/random/spam.js b/commands/random/spam.js index 270f0b95..d72ed80e 100644 --- a/commands/random/spam.js +++ b/commands/random/spam.js @@ -1,4 +1,5 @@ const { Command } = require('discord.js-commando'); +const path = require('path'); module.exports = class SpamCommand extends Command { constructor(client) { @@ -14,7 +15,7 @@ module.exports = class SpamCommand extends Command { if (msg.channel.type !== 'dm') if (!msg.channel.permissionsFor(this.client.user).has('ATTACH_FILES')) return msg.say('This Command requires the `Attach Files` Permission.'); - return msg.channel.send({ files: ['https://i.imgur.com/2JFu5xE.jpg'] }) + return msg.channel.send({ files: [path.join(__dirname, '..', '..', 'assets', 'images', 'spam.png')] }) .catch(err => msg.say(err)); } }; diff --git a/commands/randomimg/xiaopai.js b/commands/randomimg/xiaopai.js index 72418fd9..bbb759e2 100644 --- a/commands/randomimg/xiaopai.js +++ b/commands/randomimg/xiaopai.js @@ -1,5 +1,5 @@ const { Command } = require('discord.js-commando'); -const xiaos = require('../../assets/json/xiaopai'); +const path = require('path'); module.exports = class XiaoCommand extends Command { constructor(client) { @@ -16,8 +16,8 @@ module.exports = class XiaoCommand extends Command { if (msg.channel.type !== 'dm') if (!msg.channel.permissionsFor(this.client.user).has('ATTACH_FILES')) return msg.say('This Command requires the `Attach Files` Permission.'); - const xiao = xiaos[Math.floor(Math.random() * xiaos.length)]; - return msg.channel.send({ files: [xiao] }) + const xiao = Math.floor(Math.random() * 10) + 1; + return msg.channel.send({ files: [path.join(__dirname, '..', '..', 'assets', 'images', `xiaopai${xiao}.png`)] }) .catch(err => msg.say(err)); } }; diff --git a/commands/search/botinfo.js b/commands/search/botinfo.js index d325b2e8..3909d8f8 100644 --- a/commands/search/botinfo.js +++ b/commands/search/botinfo.js @@ -35,11 +35,11 @@ module.exports = class BotSearchCommand extends Command { .setTitle(body.name) .setURL(`https://bots.discord.pw/bots/${bot.id}`) .setDescription(body.description) - .addField('**Library:**', + .addField('Library', body.library, true) - .addField('**Invite:**', + .addField('Invite', `[Here](${body.invite_url})`, true) - .addField('**Prefix:**', + .addField('Prefix', body.prefix, true); return msg.embed(embed); } catch (err) { diff --git a/commands/search/forecast.js b/commands/search/forecast.js index f502b85b..a6f45cb2 100644 --- a/commands/search/forecast.js +++ b/commands/search/forecast.js @@ -34,19 +34,19 @@ module.exports = class ForecastCommand extends Command { .setAuthor(body.query.results.channel.title, 'https://i.imgur.com/2MT0ViC.png') .setURL(body.query.results.channel.link) .setTimestamp() - .addField(`**${forecasts[0].day} - ${forecasts[0].date}:**`, + .addField(`${forecasts[0].day} - ${forecasts[0].date}`, `**High:** ${forecasts[0].high}°F, **Low:** ${forecasts[0].low}°F, **Condition:** ${forecasts[0].text}`) - .addField(`**${forecasts[1].day} - ${forecasts[1].date}:**`, + .addField(`${forecasts[1].day} - ${forecasts[1].date}`, `**High:** ${forecasts[1].high}°F, **Low:** ${forecasts[1].low}°F, **Condition:** ${forecasts[1].text}`) - .addField(`**${forecasts[2].day} - ${forecasts[2].date}:**`, + .addField(`${forecasts[2].day} - ${forecasts[2].date}`, `**High:** ${forecasts[2].high}°F, **Low:** ${forecasts[2].low}°F, **Condition:** ${forecasts[2].text}`) - .addField(`**${forecasts[3].day} - ${forecasts[3].date}:**`, + .addField(`${forecasts[3].day} - ${forecasts[3].date}`, `**High:** ${forecasts[3].high}°F, **Low:** ${forecasts[3].low}°F, **Condition:** ${forecasts[3].text}`) - .addField(`**${forecasts[4].day} - ${forecasts[4].date}:**`, + .addField(`${forecasts[4].day} - ${forecasts[4].date}`, `**High:** ${forecasts[4].high}°F, **Low:** ${forecasts[4].low}°F, **Condition:** ${forecasts[4].text}`) - .addField(`**${forecasts[5].day} - ${forecasts[5].date}:**`, + .addField(`${forecasts[5].day} - ${forecasts[5].date}`, `**High:** ${forecasts[5].high}°F, **Low:** ${forecasts[5].low}°F, **Condition:** ${forecasts[5].text}`) - .addField(`**${forecasts[6].day} - ${forecasts[6].date}:**`, + .addField(`${forecasts[6].day} - ${forecasts[6].date}`, `**High:** ${forecasts[6].high}°F, **Low:** ${forecasts[6].low}°F, **Condition:** ${forecasts[6].text}`); return msg.embed(embed); } catch (err) { diff --git a/commands/search/imdb.js b/commands/search/imdb.js index 4900e1c1..9abd2875 100644 --- a/commands/search/imdb.js +++ b/commands/search/imdb.js @@ -35,19 +35,19 @@ module.exports = class IMDBCommand extends Command { .setURL(`http://www.imdb.com/title/${body.imdbID}`) .setTitle(`${body.Title} (${body.imdbRating} Score)`) .setDescription(body.Plot.substr(0, 2000)) - .addField('**Genres:**', + .addField('Genres', body.Genre) - .addField('**Year:**', + .addField('Year', body.Year, true) - .addField('**Rated:**', + .addField('Rated', body.Rated, true) - .addField('**Runtime:**', + .addField('Runtime', body.Runtime, true) - .addField('**Directors:**', + .addField('Directors', body.Director) - .addField('**Writers:**', + .addField('Writers', body.Writer) - .addField('**Actors:**', + .addField('Actors', body.Actors); return msg.embed(embed); } catch (err) { diff --git a/commands/search/osu.js b/commands/search/osu.js index 9a8c1737..c53011d0 100644 --- a/commands/search/osu.js +++ b/commands/search/osu.js @@ -34,29 +34,29 @@ module.exports = class OsuCommand extends Command { .setColor(0xFF66AA) .setAuthor('osu!', 'https://i.imgur.com/EmnUp00.png') .setURL('https://osu.ppy.sh/') - .addField('**Username:**', + .addField('Username', body[0].username, true) - .addField('**ID:**', + .addField('ID', body[0].user_id, true) - .addField('**Level:**', + .addField('Level', body[0].level, true) - .addField('**Accuracy**', + .addField('Accuracy', body[0].accuracy, true) - .addField('**Rank:**', + .addField('Rank', body[0].pp_rank, true) - .addField('**Play Count:**', + .addField('Play Count', body[0].playcount, true) - .addField('**Country:**', + .addField('Country', body[0].country, true) - .addField('**Ranked Score:**', + .addField('Ranked Score', body[0].ranked_score, true) - .addField('**Total Score:**', + .addField('Total Score', body[0].total_score, true) - .addField('**SS:**', + .addField('SS', body[0].count_rank_ss, true) - .addField('**S:**', + .addField('S', body[0].count_rank_s, true) - .addField('**A:**', + .addField('A', body[0].count_rank_a, true); return msg.embed(embed); } catch (err) { diff --git a/commands/search/soundcloud.js b/commands/search/soundcloud.js index 42657012..966b79ab 100644 --- a/commands/search/soundcloud.js +++ b/commands/search/soundcloud.js @@ -36,15 +36,15 @@ module.exports = class SoundCloudCommand extends Command { .setTitle(body[0].title) .setURL(body[0].permalink_url) .setThumbnail(body[0].artwork_url) - .addField('**Artist:**', + .addField('Artist', body[0].user.username) - .addField('**Download Count:**', + .addField('Download Count', body[0].download_count, true) - .addField('**Comment Count**', + .addField('Comment Count', body[0].comment_count, true) - .addField('**Playback Count:**', + .addField('Playback Count', body[0].playback_count, true) - .addField('**Favorited Count:**', + .addField('Favorited Count', body[0].favoritings_count, true); return msg.embed(embed); } catch (err) { diff --git a/commands/search/urban.js b/commands/search/urban.js index 5f94b431..e7801386 100644 --- a/commands/search/urban.js +++ b/commands/search/urban.js @@ -35,7 +35,7 @@ module.exports = class UrbanCommand extends Command { .setURL(body.list[0].permalink) .setTitle(body.list[0].word) .setDescription(body.list[0].definition.substr(0, 2000)) - .addField('**Example:**', + .addField('Example', body.list[0].example.substr(0, 2000) || 'None'); return msg.embed(embed); } catch (err) { diff --git a/commands/search/wattpad.js b/commands/search/wattpad.js index 99c6e971..0d257912 100644 --- a/commands/search/wattpad.js +++ b/commands/search/wattpad.js @@ -37,17 +37,17 @@ module.exports = class WattpadCommand extends Command { .setURL(body.stories[0].url) .setTitle(body.stories[0].title) .setDescription(body.stories[0].description.substr(0, 2000)) - .addField('**Author:**', + .addField('Author', body.stories[0].user, true) - .addField('**Parts:**', + .addField('Parts', body.stories[0].numParts, true) - .addField('**Created On:**', + .addField('Created On', body.stories[0].createDate, true) - .addField('**Votes:**', + .addField('Votes', body.stories[0].voteCount, true) - .addField('**Reads:**', + .addField('Reads', body.stories[0].readCount, true) - .addField('**Comments:**', + .addField('Comments', body.stories[0].commentCount, true); return msg.embed(embed); } catch (err) { diff --git a/commands/search/weather.js b/commands/search/weather.js index 5cb75856..f4da160b 100644 --- a/commands/search/weather.js +++ b/commands/search/weather.js @@ -33,29 +33,29 @@ module.exports = class WeatherCommand extends Command { .setAuthor(body.query.results.channel.title, 'https://i.imgur.com/2MT0ViC.png') .setURL(body.query.results.channel.link) .setTimestamp() - .addField('**City:**', + .addField('City', body.query.results.channel.location.city, true) - .addField('**Country**', + .addField('Country', body.query.results.channel.location.country, true) - .addField('**Region:**', + .addField('Region', body.query.results.channel.location.region, true) - .addField('**Condition:**', + .addField('Condition', body.query.results.channel.item.condition.text, true) - .addField('**Temperature:**', + .addField('Temperature', `${body.query.results.channel.item.condition.temp}°F`, true) - .addField('**Humidity:**', + .addField('Humidity', body.query.results.channel.atmosphere.humidity, true) - .addField('**Pressure:**', + .addField('Pressure', body.query.results.channel.atmosphere.pressure, true) - .addField('**Rising:**', + .addField('Rising', body.query.results.channel.atmosphere.rising, true) - .addField('**Visibility:**', + .addField('Visibility', body.query.results.channel.atmosphere.visibility, true) - .addField('**Wind Chill:**', + .addField('Wind Chill', body.query.results.channel.wind.chill, true) - .addField('**Wind Direction:**', + .addField('Wind Direction', body.query.results.channel.wind.direction, true) - .addField('**Wind Speed:**', + .addField('Wind Speed', body.query.results.channel.wind.speed, true); return msg.embed(embed); } catch (err) { diff --git a/commands/search/yugioh.js b/commands/search/yugioh.js index 89a92375..a7191630 100644 --- a/commands/search/yugioh.js +++ b/commands/search/yugioh.js @@ -35,17 +35,17 @@ module.exports = class YuGiOhCommand extends Command { .setTitle(body.data.name) .setDescription(body.data.text) .setAuthor('Yu-Gi-Oh!', 'https://i.imgur.com/7gPm9Rr.png') - .addField('**Card Type:**', + .addField('Card Type', body.data.card_type, true) - .addField('**Type:**', + .addField('Type', body.data.type, true) - .addField('**Attribute:**', + .addField('Attribute', body.data.family, true) - .addField('**ATK:**', + .addField('ATK', body.data.atk, true) - .addField('**DEF:**', + .addField('DEF', body.data.def, true) - .addField('**Level:**', + .addField('Level', body.data.level, true); return msg.embed(embed); } else { @@ -54,7 +54,7 @@ module.exports = class YuGiOhCommand extends Command { .setTitle(body.data.name) .setDescription(body.data.text) .setAuthor('Yu-Gi-Oh!', 'https://i.imgur.com/7gPm9Rr.png') - .addField('**Card Type:**', + .addField('Card Type', body.data.card_type, true); return msg.embed(embed); } diff --git a/commands/userinfo/userinfo.js b/commands/userinfo/userinfo.js index 2320ecf5..ff6cf1a8 100644 --- a/commands/userinfo/userinfo.js +++ b/commands/userinfo/userinfo.js @@ -51,23 +51,23 @@ module.exports = class UserInfoCommand extends Command { const embed = new RichEmbed() .setColor(color) .setThumbnail(member.user.displayAvatarURL) - .addField('**Name:**', + .addField('Name', member.user.tag, true) - .addField('**ID:**', + .addField('ID', member.id, true) - .addField('**Joined Discord On:**', + .addField('Discord Join Date', stripIndents` ${moment(member.user.createdTimestamp).format('MMMM Do YYYY h:mm:ss A')} ${moment.duration(Date.now() - member.user.createdTimestamp).format('y[ years], M[ months], w[ weeks, and ]d[ days]')} ago. `) - .addField('**Joined Server On:**', + .addField('Server Join Date', stripIndents` ${moment(member.joinedTimestamp).format('MMMM Do YYYY h:mm:ss A')} ${moment.duration(Date.now() - member.joinedTimestamp).format('y[ years], M[ months], w[ weeks, and ]d[ days]')} ago. `) - .addField('**Status:**', + .addField('Status', stat, true) - .addField('**Playing:**', + .addField('Playing', member.user.presence.game ? member.user.presence.game.name : 'None', true); return msg.embed(embed); } diff --git a/commands/util/help.js b/commands/util/help.js index d304a7dc..c3275e47 100644 --- a/commands/util/help.js +++ b/commands/util/help.js @@ -37,7 +37,7 @@ module.exports = class HelpCommand extends Command { ${commands[0].details || ''} `); } else if (commands.length > 1) { - return msg.say(`Multiple Commands Found. Please be more specific: ${commands.map(c => `"${c.name}"`).join(', ')}`); + return msg.say(`Multiple Commands Found. Please be more specific: ${commands.map(c => c.name).join(', ')}`); } else { return msg.say(`Could not identify command. Use ${msg.usage(null)} to view a list of commands you can use.`); } diff --git a/package.json b/package.json index ab482d38..55f8cc68 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiaobot", - "version": "19.3.1", + "version": "19.3.2", "description": "A Discord Bot", "main": "shardingmanager.js", "scripts": {