Merge branch 'next' of github.com:mudkipscience/Woomy into next

This commit is contained in:
TheCakeChicken 2020-04-12 10:28:34 +01:00
commit d484ecd9c1
5 changed files with 43 additions and 3 deletions

View file

@ -9,7 +9,7 @@ exports.conf = {
exports.help = {
name: 'emoji',
category: 'Utility',
description: 'Enlarges a custom emoji.',
description: 'Enlarges a custom emoji (cannot be used to enlarge normal emojis)',
usage: 'emoji [emoji]',
parameters: '`[emoji] - Custom emoji you want to enlarge'
}

22
commands/forceskip.js Normal file
View file

@ -0,0 +1,22 @@
exports.conf = {
enabled: true,
guildOnly: true,
aliases: [],
permLevel: 'Moderator',
requiredPerms: [],
cooldown: 2000
}
exports.help = {
name: 'forceskip',
category: 'Music',
description: 'Force skips currently playing song.',
usage: 'forceskip',
params: ''
}
exports.run = async (client, message, args, level, data) => {
client.music.skip(message.guild, 'forceskip');
message.reply('skipped currently playing music');
};

View file

@ -4,7 +4,8 @@ exports.conf = {
aliases: [],
permLevel: 'User',
requiredPerms: [],
cooldown: 2000
cooldown: 2000,
joinArguments: 1
}
exports.help = {

View file

@ -106,6 +106,15 @@ module.exports = async (client, message) => {
message.flags.push(args.shift().slice(1))
}
let argsPossiblyJoined = args;
if(cmd.conf.joinArguments) {
if(args.length > cmd.conf.joinArguments && args.length > 1)
{
argsPossiblyJoined[cmd.conf.joinArguments - 1] = args.slice(cmd.conf.joinArguments - 1).join(' ');
}
};
client.logger.log(`Command ran: ${cmd.help.name}`)
cmd.run(client, message, args, level, data)
cmd.run(client, message, argsPossiblyJoined, level, data)
}

View file

@ -162,4 +162,12 @@ module.exports = client => {
g.dispatcher.setVolume(target);
};
};
client.music.skip = function(guild, reason) {
let g = client.music.getGuild(guild.id);
if(g.dispatcher) {
g.dispatcher.end(reason);
};
};
}