From 5d211fcc68d66e5f79ea9f88692be30e7e703e79 Mon Sep 17 00:00:00 2001 From: TheCakeChicken Date: Thu, 26 Mar 2020 14:05:48 +0000 Subject: [PATCH 01/10] 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 02/10] 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 03/10] 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 04/10] 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" } From b81db48f7b26b3906fbd7ddd94ca106b095818ac Mon Sep 17 00:00:00 2001 From: TheCakeChicken Date: Mon, 30 Mar 2020 23:28:16 +0100 Subject: [PATCH 05/10] typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d0fde98..8d86032 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Woomy is a all-purpose discord bot built off the [guidebot](https://github.com/A # How to use The easiest way to use Woomy is to invite it to your server with [this link.](https://discordapp.com/oauth2/authorize?client_id=435961704145485835&permissions=2134240503&scope=bot) It is hosted 24/7 and automatically updates itself when a new release is made available, making sure you always get the newest features. -You can also self-host! Some modificatiomns to the code will need to be made before Woomy will run on your machine, but anyone who can read errors will figure out what needs to be changed pretty quickly :P +You can also self-host! Some modifications to the code will need to be made before Woomy will run on your machine, but anyone who can read errors will figure out what needs to be changed pretty quickly :P # Requirements - git From c7d3ecd6da26e16fefd4b87e5c97d1bc3a0423b2 Mon Sep 17 00:00:00 2001 From: FLGX Date: Wed, 8 Apr 2020 11:04:52 +0200 Subject: [PATCH 06/10] Fix music in v1 woomy --- src/modules/functions.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/modules/functions.js b/src/modules/functions.js index a30dd4b..f8c552c 100644 --- a/src/modules/functions.js +++ b/src/modules/functions.js @@ -229,7 +229,16 @@ module.exports = client => { }; id = item.id.videoId; } - + + // music "playing", nothing in queue + if((client.music.getGuild(message.guild.id).playing || client.music.getGuild(message.guild.id).dispatcher) && client.music.getGuild(message.guild.id).queue.length == 0) { + client.music.getGuild(message.guild.id).playing = false; + client.music.getGuild(message.guild.id).dispatcher = null; + // music not playing, something is in queue + } else if(!client.music.getGuild(message.guild.id).playing && !client.music.getGuild(message.guild.id).dispatcher && client.music.getGuild(message.guild.id).queue.length > 0) { + client.music.getGuild(message.guild.id).queue = []; + }; + if(client.music.getGuild(message.guild.id).queue.length == 0 || bypassQueue) { let meta = await client.music.getMeta(id); From 276c26d3c7d4e3bf6ffbf28152f3ea4998b9a34a Mon Sep 17 00:00:00 2001 From: FLGX Date: Wed, 8 Apr 2020 11:10:44 +0200 Subject: [PATCH 07/10] remove member username/id print on command --- src/events/message.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/events/message.js b/src/events/message.js index 7c399a8..447bd5b 100644 --- a/src/events/message.js +++ b/src/events/message.js @@ -229,7 +229,7 @@ module.exports = async (client, message) => { cooldown.delete(message.author.id); }, 2000); - client.logger.cmd(`${client.config.permLevels.find(l => l.level === level).name} ${message.author.username} (${message.author.id}) ran command ${cmd.help.name}`); + client.logger.cmd(`${client.config.permLevels.find(l => l.level === level).name} ran command ${cmd.help.name}`); cmd.run(client, message, args, level); }; From c188356030c7178e975c09bce42b72bff733e92c Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Fri, 17 Apr 2020 17:14:42 +1000 Subject: [PATCH 08/10] update ytdl-core --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 891ab34..fa5d116 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "dependencies": { "@discordjs/opus": "^0.1.0", "better-sqlite3": "^5.4.1", - "chalk": "^3.0.0", + "chalk": "^4.0.0", "dblapi.js": "^2.3.1", "discord.js": "^12.0.2", "enmap": "^5.2.4", @@ -26,7 +26,7 @@ "urban": "^0.3.2", "weather-js": "^2.0.0", "youtube-info": "^1.3.2", - "ytdl-core-discord": "^1.1.0" + "ytdl-core-discord": "^1.2.0" }, "devDependencies": {}, "scripts": { From 0662be72d110e95e4af94c530fd0cef7bbd310f8 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 18 Apr 2020 04:11:13 +0000 Subject: [PATCH 09/10] why are unhandled rejections trying to log a stack --- src/modules/functions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/functions.js b/src/modules/functions.js index f8c552c..46ad1e4 100644 --- a/src/modules/functions.js +++ b/src/modules/functions.js @@ -386,6 +386,6 @@ module.exports = client => { }); process.on("unhandledRejection", err => { - client.logger.error(`Unhandled rejection: ${err.stack}`); + client.logger.error(`Unhandled rejection: ${err}`); }); }; From 57ad4914f86f447303c5d1d9c85667fb878146e5 Mon Sep 17 00:00:00 2001 From: FLGX Date: Sat, 18 Apr 2020 21:34:41 +0200 Subject: [PATCH 10/10] set volume to 25% by default for now before v2 woomy is released --- src/modules/functions.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/modules/functions.js b/src/modules/functions.js index 46ad1e4..eb759a1 100644 --- a/src/modules/functions.js +++ b/src/modules/functions.js @@ -280,6 +280,8 @@ module.exports = client => { { let dispatcher = client.music.getGuild(message.guild.id).dispatcher = connection.play(await ytdl("https://www.youtube.com/watch?v=" + id, {highWaterMark: 1024 * 1024 * 32}), {type: 'opus'}); + dispatcher.setVolume(0.25) + dispatcher.on('finish', (a, b) => { end(a == "silent");