From 5d211fcc68d66e5f79ea9f88692be30e7e703e79 Mon Sep 17 00:00:00 2001 From: TheCakeChicken Date: Thu, 26 Mar 2020 14:05:48 +0000 Subject: [PATCH 1/4] make the bot stop typing here as well --- src/commands/catfact.js | 14 +++++++------- src/commands/dogfact.js | 13 ++++++------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/commands/catfact.js b/src/commands/catfact.js index 8beb770..437541f 100644 --- a/src/commands/catfact.js +++ b/src/commands/catfact.js @@ -3,15 +3,15 @@ const request = require("request"); exports.run = async (bot, message, args) => { message.channel.startTyping(); try{ - request({ uri: "https://catfact.ninja/facts", json: true }, (error, response, body) => { - message.channel.send(`**Did you know?**\n ${body.data[0].fact}`); - message.channel.startTyping(); - }); -} catch(err) { - message.channel.send(`<:error:466995152976871434> API error: ${err}`); + request({ uri: "https://catfact.ninja/facts", json: true }, (error, response, body) => { + message.channel.send(`**Did you know?**\n ${body.data[0].fact}`); + message.channel.startTyping(); + }); + } catch(err) { + message.channel.send(`<:error:466995152976871434> API error: ${err}`); + }; message.channel.stopTyping(); }; -}; exports.conf = { enabled: true, diff --git a/src/commands/dogfact.js b/src/commands/dogfact.js index 31d1639..586f323 100644 --- a/src/commands/dogfact.js +++ b/src/commands/dogfact.js @@ -3,15 +3,14 @@ const request = require("request"); exports.run = async (bot, message, args) => { message.channel.startTyping(); try{ - request({ uri: "https://dog-api.kinduff.com/api/facts", json: true }, (error, response, body) => { - message.channel.send(`**Did you know?**\n ${body.facts[0]}`); - message.channel.stopTyping(); - }); -} catch(err) { - message.channel.send(`<:error:466995152976871434> API error: ${err}`); + request({ uri: "https://dog-api.kinduff.com/api/facts", json: true }, (error, response, body) => { + message.channel.send(`**Did you know?**\n ${body.facts[0]}`); + }); + } catch(err) { + message.channel.send(`<:error:466995152976871434> API error: ${err}`); + }; message.channel.stopTyping(); }; -}; exports.conf = { enabled: true, From f7d649d6b1b9b36cfba0e32c352f71628b139df6 Mon Sep 17 00:00:00 2001 From: TheCakeChicken Date: Thu, 26 Mar 2020 14:09:53 +0000 Subject: [PATCH 2/4] fix usage for slap --- src/commands/slap.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commands/slap.js b/src/commands/slap.js index 2e5189c..c87c783 100644 --- a/src/commands/slap.js +++ b/src/commands/slap.js @@ -2,7 +2,7 @@ const API = require('nekos.life'); const {sfw} = new API(); exports.run = async (client, message, args) => { if(!args[0]) { - return message.channel.send(`<:error:466995152976871434> You didn't say who you wanted to slap! Usage: \`${client.commands.get(`kiss`).help.usage}\``) + return message.channel.send(`<:error:466995152976871434> You didn't say who you wanted to slap! Usage: \`${client.commands.get(`slap`).help.usage}\``) }; var people = ""; From e6ab5bb101b1282556e7073154ed5abb7378407e Mon Sep 17 00:00:00 2001 From: TheCakeChicken Date: Thu, 26 Mar 2020 23:01:10 +0000 Subject: [PATCH 3/4] fix undefined stuff --- src/commands/userinfo.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commands/userinfo.js b/src/commands/userinfo.js index c5dcbac..98d6738 100644 --- a/src/commands/userinfo.js +++ b/src/commands/userinfo.js @@ -2,7 +2,7 @@ const Discord = require("discord.js"); const coolPeople = require('../../resources/other/coolpeople.json') exports.run = (client, message, args) => { var user, guild, status, createdAt, avurl, tag, id; - var nick, roles, presence, badges = ""; + var nick = "", roles = "", presence = "", badges = ""; var coolPerson = false; var friendos = coolPeople.coolPeople; From 72b0f6479379cbb88e782804fe690891ac03ee4d Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Sun, 29 Mar 2020 06:14:30 +0000 Subject: [PATCH 4/4] Update version.json --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 19b07db..6d6b7a3 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "number": "1.2.2", + "number": "1.2.3", "changelog": "**1.2.0 CHANGELOG:**\n> • Added action commands! (`cuddle`, `feed`, `hug`, `kiss`, `pat`, `poke`, `slap`, `smug`, `tickle`)\n> • Added `fact`\n> • Added `catfact`\n> • Added `dogfact`\n> • Added `yoda`\n> • Added `dice`\n> • Added `spoilerise`\n> • Added `zalgo`\n> • Added `dog`\n> • Added `cat`\n> • Added `lizard`\n> • Added `neko`\n> • Added `nekogif`\n> • Added `kemonomimi`\n> • Added `foxgirl`\n> • Added `identity`\n> • Added `pronouns`\n> • Added `sexuality`\n> • Added `ship`\n> • Renamed `flip to `coinflip` (flip remains as an alias)\n> • Renamed `math` to `calculate` (math is an alias)\n> • @Woomy is now a prefix\n> • Added the `inspire` alias to `inspirobot`\n> • Help now displays the amount of commands in each category\n> • Bots now get a badge in `userinfo`\n> • `roleinfo` now displays what permissions a role has\n> • small changes to `weather`\n> • Woomy now has clear logging of issues that prevent her from starting\n> • request npm module has been swapped out for node-fetch\n**NOTES:**\n> Thank you to Terryiscool160 for creating multiple commands used in this update" }