f3d0r4/woomy
1
0
Fork 0
forked from embee/woomy
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Emily 2020-04-12 19:15:36 +10:00
commit 798c308856
2 changed files with 41 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
commands/volume.js
View file

@ -21,7 +21,7 @@ exports.run = async (client, message, args, level, data) => {
if(vol) { if(vol) {
vol = Number(vol); vol = Number(vol);
vol = vol / 100 * 0.25; vol = vol / 100 * 0.5;
if(vol <= 1) { if(vol <= 1) {
client.music.setVolume(message.guild, vol); client.music.setVolume(message.guild, vol);

58
helpers/music.js
View file

@ -88,48 +88,70 @@ module.exports = client => {
}; };
}; };
client.music.play = async function(message, query) { client.music.play = async function(message, query, ignoreQueue) {
let guild = client.music.getGuild(message.guild.id); let guild = client.music.getGuild(message.guild.id);
if(!message.member.voice.channel && !guild.voiceChannel) { if(!message.member.voice.channel && !guild.voiceChannel) {
return message.member.reply('you are not in a voice channel!'); return message.reply('you are not in a voice channel!');
} }
let vc = message.member.voice.channel; let vc = message.member.voice.channel;
let video = await client.music.getVideoByQuery(query); let video;
if(!ignoreQueue) {
video = await client.music.getVideoByQuery(query);
};
if(video) { if(video || ignoreQueue) {
// Fix the bot if somehow broken if(!ignoreQueue) {
// music "playing", nothing in queue // Fix the bot if somehow broken
if((guild.playing || guild.dispatcher) && guild.queue.length == 0) { // music "playing", nothing in queue
guild.playing = false; if((guild.playing || guild.dispatcher) && guild.queue.length == 0) {
guild.dispatcher = null; guild.playing = false;
// music not playing, something is in queue guild.dispatcher = null;
} else if(!guild.playing && !guild.dispatcher && guild.queue.length > 0) { // music not playing, something is in queue
guild.queue = []; } else if(!guild.playing && !guild.dispatcher && guild.queue.length > 0) {
guild.queue = [];
};
// Add video to queue
guild.queue.push({video: video, requestedBy: message.member.id});
}; };
// Add video to queue
guild.queue.push({video: video, requestedBy: message.member.id});
// Figure out if the bot should add it to queue or play it right now // Figure out if the bot should add it to queue or play it right now
if(guild.playing) { if(guild.playing) {
message.reply('added **' + video.snippet.title + '** to the queue'); message.reply('added **' + video.snippet.title + '** to the queue');
} else { } else {
guild.playing = true; guild.playing = true;
guild.voiceChannel = vc;
let connection = await vc.join(); let connection = await vc.join();
let v = guild.queue[0]; let v = guild.queue[0];
guild.dispatcher = connection.play(await ytdl(client.music.getLinkFromID(v.video.id.videoId)), {type: 'opus'}); guild.dispatcher = connection.play(await ytdl(client.music.getLinkFromID(v.video.id.videoId), {highWaterMark: 1024 * 1024 * 32}), {type: 'opus'});
guild.dispatcher.setVolume(0.25); guild.dispatcher.setVolume(0.25);
message.reply('playing **' + v.video.snippet.title + '**'); message.channel.send('Playing **' + v.video.snippet.title + '**');
// play next in queue on end
guild.dispatcher.once('finish', () => {
guild.queue.shift();
guild.playing = false;
if(guild.queue.length > 0) {
client.music.play(message, null, true);
} else {
guild.dispatcher = null;
connection.leave();
};
});
}; };
} else { } else {
return message.member.reply('failed to find the video!'); return message.reply('failed to find the video!');
}; };
}; };