hazemKrimi/discord-bot
1
0
Fork 0
mirror of https://github.com/hazemKrimi/discord-bot.git synced 2026-05-01 18:30:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

moved play logic to the main guild class

Browse Source
This commit is contained in:
Hazem Krimi
2020-05-09 10:14:02 +01:00
parent beaa15f15f
commit f69addabcf
2 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
commands/music/play.js
+13 -73
View File
@@ -1,10 +1,8 @@
// const { spawn } = require('child_process');
const ffmpeg = require('fluent-ffmpeg');
const { Command } = require('discord.js-commando'); const { Command } = require('discord.js-commando');
const { MessageEmbed } = require('discord.js'); const { MessageEmbed } = require('discord.js');
const puppeteer = require('puppeteer');
const ytdl = require('ytdl-core-discord');
const Youtube = require('simple-youtube-api'); const Youtube = require('simple-youtube-api');
const ffmpeg = require('fluent-ffmpeg');
const puppeteer = require('puppeteer');
const youtube = new Youtube(process.env.YOUTUBE_API_KEY); const youtube = new Youtube(process.env.YOUTUBE_API_KEY);
module.exports = class Play extends Command { module.exports = class Play extends Command {
@@ -26,7 +24,7 @@ module.exports = class Play extends Command {
], ],
throttling: { throttling: {
usages: 1, usages: 1,
duration: 5 duration: 3
} }
}); });
} }
@@ -69,11 +67,11 @@ module.exports = class Play extends Command {
if (message.guild.music.isPlaying === false || message.guild.music.isPlaying === undefined) { if (message.guild.music.isPlaying === false || message.guild.music.isPlaying === undefined) {
message.guild.music.isPlaying = true; message.guild.music.isPlaying = true;
return this.play(message.guild.music.queue, message); return message.guild.play(message.guild.music.queue, message);
} }
}); });
if (message.guild.music.isPlaying) { if (message.guild.music.isPlaying) {
const embed = new MessageEmbed().setColor('#000099').setTitle(`:arrow_forward: ${playlist.title} (${playlistVideos.length} tracks) added to queue`); const embed = new MessageEmbed().setColor('#000099').setTitle(`:arrow_forward: "${playlist.title}" (${playlistVideos.length} tracks) added to queue`);
return await message.say({ embed }); return await message.say({ embed });
} }
} else if (query.match(/^(http(s)?:\/\/)?((w){3}.)?youtu(be|.be)?(\.com)?\/\S+/)) { } else if (query.match(/^(http(s)?:\/\/)?((w){3}.)?youtu(be|.be)?(\.com)?\/\S+/)) {
@@ -100,9 +98,9 @@ module.exports = class Play extends Command {
if (message.guild.music.isPlaying === false || message.guild.music.isPlaying === undefined) { if (message.guild.music.isPlaying === false || message.guild.music.isPlaying === undefined) {
message.guild.music.isPlaying = true; message.guild.music.isPlaying = true;
return this.play(message.guild.music.queue, message); return message.guild.play(message.guild.music.queue, message);
} else { } else {
const embed = new MessageEmbed().setColor('#000099').setTitle(`:arrow_forward: ${data.title} added to queue`); const embed = new MessageEmbed().setColor('#000099').setTitle(`:arrow_forward: "${data.title}" added to queue`);
return await message.say({ embed }); return await message.say({ embed });
} }
} else if (query.match(/^(http(s)?:\/\/)?((w){3}.)?facebook?(\.com)?\/\S+\/videos\/\S+/)) { } else if (query.match(/^(http(s)?:\/\/)?((w){3}.)?facebook?(\.com)?\/\S+\/videos\/\S+/)) {
@@ -149,9 +147,9 @@ module.exports = class Play extends Command {
if (message.guild.music.isPlaying === false || message.guild.music.isPlaying === undefined) { if (message.guild.music.isPlaying === false || message.guild.music.isPlaying === undefined) {
message.guild.music.isPlaying = true; message.guild.music.isPlaying = true;
return this.play(message.guild.music.queue, message); return message.guild.play(message.guild.music.queue, message);
} else { } else {
const embed = new MessageEmbed().setColor('#000099').setTitle(`:arrow_forward: ${data.title} added to queue`); const embed = new MessageEmbed().setColor('#000099').setTitle(`:arrow_forward: "${data.title}" added to queue`);
return await message.say({ embed }); return await message.say({ embed });
} }
} else if (query.match(/^(http(s)?:\/\/)?((w){3}\S)?\S+(\.)\S+\/\S+\.(\S){3}/)) { } else if (query.match(/^(http(s)?:\/\/)?((w){3}\S)?\S+(\.)\S+\/\S+\.(\S){3}/)) {
@@ -184,9 +182,9 @@ module.exports = class Play extends Command {
if (message.guild.music.isPlaying === false || message.guild.music.isPlaying === undefined) { if (message.guild.music.isPlaying === false || message.guild.music.isPlaying === undefined) {
message.guild.music.isPlaying = true; message.guild.music.isPlaying = true;
return this.play(message.guild.music.queue, message); return message.guild.play(message.guild.music.queue, message);
} else { } else {
const embed = new MessageEmbed().setColor('#000099').setTitle(`:arrow_forward: ${data.title} added to queue`); const embed = new MessageEmbed().setColor('#000099').setTitle(`:arrow_forward: "${data.title}" added to queue`);
return await message.say({ embed }); return await message.say({ embed });
} }
} }
@@ -218,9 +216,9 @@ module.exports = class Play extends Command {
if (message.guild.music.isPlaying === false || message.guild.music.isPlaying === undefined) { if (message.guild.music.isPlaying === false || message.guild.music.isPlaying === undefined) {
message.guild.music.isPlaying = true; message.guild.music.isPlaying = true;
return this.play(message.guild.music.queue, message); return message.guild.play(message.guild.music.queue, message);
} else { } else {
const embed = new MessageEmbed().setColor('#000099').setTitle(`:arrow_forward: ${data.title} added to queue`); const embed = new MessageEmbed().setColor('#000099').setTitle(`:arrow_forward: "${data.title}" added to queue`);
return await message.say({ embed }); return await message.say({ embed });
} }
} }
@@ -230,62 +228,4 @@ module.exports = class Play extends Command {
return message.say({ embed }); return message.say({ embed });
} }
} }
play = async(queue, message) => {
try {
if (queue.length === 0) {
const embed = new MessageEmbed().setColor('#ff0000').setTitle(':x: Error occured, if you are my creator please fix me soon');
return await message.say({ embed });
}
const voiceChannel = queue[0].voiceChannel;
const connection = await voiceChannel.join();
let dispatcher;
switch (queue[0].type) {
case 'youtube': { dispatcher = connection.play(await ytdl(queue[0].link, { quality: 'highestaudio' }), { type: 'opus' }); break; }
case 'facebook': { dispatcher = connection.play(queue[0].link); break; }
case 'search': { dispatcher = connection.play(await ytdl(queue[0].link), { type: 'opus' }); break; }
case 'other': { dispatcher = connection.play(queue[0].link); break; }
}
dispatcher.on('start', async() => {
message.guild.music.nowPlaying = queue[0];
message.guild.startCounter(message);
message.guild.music.dispatcher = dispatcher;
dispatcher.setVolume(message.guild.music.volume);
const embed = new MessageEmbed().setColor('#000099').setTitle(`:arrow_forward: Play`).addField('Now playing', queue[0].title);
if (queue[0].type === 'youtube' || queue[0].type === 'search') embed.setThumbnail(queue[0].thumbnail);
if (queue[0].type === 'youtube' || queue[0].type === 'search' || queue[0].type === 'facebook') embed.addField('By', queue[0].by);
embed.addField('Duration', queue[0].duration.string);
await message.say({ embed });
return queue.shift();
});
dispatcher.on('finish', async() => {
if (queue.length >= 1) return this.play(queue, message);
else {
message.guild.music.isPlaying = false;
message.guild.music.nowPlaying = null;
message.guild.music.dispatcher = null;
voiceChannel.leave();
const embed = new MessageEmbed().setColor('#000099').setTitle(':musical_note: Queue ended');
return await message.say({ embed });
}
});
dispatcher.on('error', err => {
message.guild.music.queue = [];
message.guild.music.isPlaying = false;
message.guild.music.nowPlaying = false;
message.guild.music.dispatcher = null;
voiceChannel.leave();
throw err;
});
} catch (err) {
console.error(err);
const embed = new MessageEmbed().setColor('#ff0000').setTitle(':x: Error occured, if you are my creator please fix me soon');
return message.say({ embed });
}
}
} }
index.js
+60
View File
@@ -1,6 +1,8 @@
const { CommandoClient } = require('discord.js-commando'); const { CommandoClient } = require('discord.js-commando');
const { Structures } = require('discord.js'); const { Structures } = require('discord.js');
const { MessageEmbed } = require('discord.js');
const path = require('path'); const path = require('path');
const ytdl = require('ytdl-core-discord');
Structures.extend('Guild', Guild => { Structures.extend('Guild', Guild => {
class MusicGuild extends Guild { class MusicGuild extends Guild {
@@ -18,6 +20,64 @@ Structures.extend('Guild', Guild => {
}; };
} }
play = async (queue, message) => {
try {
if (queue.length === 0) {
const embed = new MessageEmbed().setColor('#ff0000').setTitle(`:x: Error occured: ${err.message}`);
return await message.say({ embed });
}
const voiceChannel = queue[0].voiceChannel;
const connection = await voiceChannel.join();
let dispatcher;
switch (queue[0].type) {
case 'youtube': { dispatcher = connection.play(await ytdl(queue[0].link, { quality: 'highestaudio' }), { type: 'opus' }); break; }
case 'facebook': { dispatcher = connection.play(queue[0].link); break; }
case 'search': { dispatcher = connection.play(await ytdl(queue[0].link), { type: 'opus' }); break; }
case 'other': { dispatcher = connection.play(queue[0].link); break; }
}
dispatcher.on('start', async () => {
message.guild.music.nowPlaying = queue[0];
message.guild.startCounter(message);
message.guild.music.dispatcher = dispatcher;
dispatcher.setVolume(message.guild.music.volume);
const embed = new MessageEmbed().setColor('#000099').setTitle(`:arrow_forward: Play`).addField('Now playing', queue[0].title);
if (queue[0].type === 'youtube' || queue[0].type === 'search') embed.setThumbnail(queue[0].thumbnail);
if (queue[0].type === 'youtube' || queue[0].type === 'search' || queue[0].type === 'facebook') embed.addField('By', queue[0].by);
embed.addField('Duration', queue[0].duration.string);
await message.say({ embed });
return queue.shift();
});
dispatcher.on('finish', async () => {
if (queue.length >= 1) return this.play(queue, message);
else {
message.guild.music.isPlaying = false;
message.guild.music.nowPlaying = null;
message.guild.music.dispatcher = null;
voiceChannel.leave();
const embed = new MessageEmbed().setColor('#000099').setTitle(':musical_note: Queue ended');
return await message.say({ embed });
}
});
dispatcher.on('error', err => {
message.guild.music.queue = [];
message.guild.music.isPlaying = false;
message.guild.music.nowPlaying = false;
message.guild.music.dispatcher = null;
voiceChannel.leave();
throw err;
});
} catch (err) {
console.error(err);
const embed = new MessageEmbed().setColor('#ff0000').setTitle(`:x: Error occured: ${err.message}`);
return message.say({ embed });
}
}
startCounter = message => { startCounter = message => {
if (!message.guild.music.nowPlaying.playingFor) message.guild.music.nowPlaying.playingFor = { hours: 0, minutes: 0, seconds: 0, string: '00:00:00' }; if (!message.guild.music.nowPlaying.playingFor) message.guild.music.nowPlaying.playingFor = { hours: 0, minutes: 0, seconds: 0, string: '00:00:00' };