Merge branch 'master' of github.com:mudkipscience/Woomy

This commit is contained in:
TheCakeChicken 2020-04-19 00:23:02 +01:00
commit 128f12041e
7 changed files with 20 additions and 9 deletions

View file

@ -4,7 +4,7 @@ Woomy is a all-purpose discord bot built off the [guidebot](https://github.com/A
# How to use # 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. 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 # Requirements
- git - git

View file

@ -6,7 +6,7 @@
"dependencies": { "dependencies": {
"@discordjs/opus": "^0.1.0", "@discordjs/opus": "^0.1.0",
"better-sqlite3": "^5.4.1", "better-sqlite3": "^5.4.1",
"chalk": "^3.0.0", "chalk": "^4.0.0",
"dblapi.js": "^2.3.1", "dblapi.js": "^2.3.1",
"discord.js": "^12.0.2", "discord.js": "^12.0.2",
"enmap": "^5.2.4", "enmap": "^5.2.4",
@ -26,7 +26,7 @@
"urban": "^0.3.2", "urban": "^0.3.2",
"weather-js": "^2.0.0", "weather-js": "^2.0.0",
"youtube-info": "^1.3.2", "youtube-info": "^1.3.2",
"ytdl-core-discord": "^1.1.0" "ytdl-core-discord": "^1.2.0"
}, },
"devDependencies": {}, "devDependencies": {},
"scripts": { "scripts": {

View file

@ -2,7 +2,7 @@ const API = require('nekos.life');
const {sfw} = new API(); const {sfw} = new API();
exports.run = async (client, message, args) => { exports.run = async (client, message, args) => {
if(!args[0]) { 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 = ""; var people = "";

View file

@ -2,7 +2,7 @@ const Discord = require("discord.js");
const coolPeople = require('../../resources/other/coolpeople.json') const coolPeople = require('../../resources/other/coolpeople.json')
exports.run = (client, message, args) => { exports.run = (client, message, args) => {
var user, guild, status, createdAt, avurl, tag, id; var user, guild, status, createdAt, avurl, tag, id;
var nick, roles, presence, badges = ""; var nick = "", roles = "", presence = "", badges = "";
var coolPerson = false; var coolPerson = false;
var friendos = coolPeople.coolPeople; var friendos = coolPeople.coolPeople;

View file

@ -229,7 +229,7 @@ module.exports = async (client, message) => {
cooldown.delete(message.author.id); cooldown.delete(message.author.id);
}, 2000); }, 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); cmd.run(client, message, args, level);
}; };

View file

@ -230,6 +230,15 @@ module.exports = client => {
id = item.id.videoId; 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) if(client.music.getGuild(message.guild.id).queue.length == 0 || bypassQueue)
{ {
let meta = await client.music.getMeta(id); let meta = await client.music.getMeta(id);
@ -271,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'}); 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) => dispatcher.on('finish', (a, b) =>
{ {
end(a == "silent"); end(a == "silent");
@ -377,6 +388,6 @@ module.exports = client => {
}); });
process.on("unhandledRejection", err => { process.on("unhandledRejection", err => {
client.logger.error(`Unhandled rejection: ${err.stack}`); client.logger.error(`Unhandled rejection: ${err}`);
}); });
}; };

View file

@ -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" "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"
} }