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

code refactoring

Browse Source
This commit is contained in:
Hazem Krimi
2020-05-13 13:10:17 +01:00
parent 03631a3cbe
commit b20b8607c7
6 changed files with 78 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
index.js
+19 -80
View File
@@ -34,44 +34,38 @@ Structures.extend('Guild', Guild => {
play = async (queue, message) => {
try {
if (!message.guild.music.seek && queue.length === 0) {
const embed = new MessageEmbed().setColor('#ff0000').setTitle(`:x: Error occured: ${err.message}`);
return await message.say({ embed });
}
if (!message.guild.music.seek && queue.length === 0) throw new Error('Unknwon');
const voiceChannel = !message.guild.music.seek ? queue[0].voiceChannel : message.guild.music.nowPlaying.voiceChannel;
const connection = await voiceChannel.join();
let dispatcher;
if (message.guild.music.seek) {
switch (message.guild.music.nowPlaying.type) {
case 'youtube': { dispatcher = connection.play(ytdl(message.guild.music.nowPlaying.link, { quality: 'highestaudio' }), { seek: message.guild.music.seek }); break; }
case 'facebook': { dispatcher = connection.play(message.guild.music.nowPlaying.link, { seek: message.guild.music.seek }); break; }
case 'search': { dispatcher = connection.play(ytdl(message.guild.music.nowPlaying.link, { quality: 'highestaudio' }), { seek: message.guild.music.seek }); break; }
case 'other': { dispatcher = connection.play(message.guild.music.nowPlaying.link, { seek: message.guild.music.seek }); break; }
}
} else {
switch (queue[0].type) {
case 'youtube': { dispatcher = connection.play(ytdl(queue[0].link, { quality: 'highestaudio' })); break; }
case 'facebook': { dispatcher = connection.play(queue[0].link); break; }
case 'search': { dispatcher = connection.play(ytdl(queue[0].link, { quality: 'highestaudio' })); break; }
case 'other': { dispatcher = connection.play(queue[0].link); break; }
}
}
dispatcher.on('start', async () => {
message.guild.music.nowPlaying = !message.guild.music.seek ? queue[0] : message.guild.music.nowPlaying;
message.guild.startCounter(message);
message.guild.music.dispatcher = dispatcher;
dispatcher.setVolume(message.guild.music.volume);
if (!message.guild.music.seek) {
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);
if (queue[0].type === 'youtube') embed.setThumbnail(queue[0].thumbnail);
if (queue[0].type !== 'other') embed.addField('By', queue[0].by);
embed.addField('Duration', queue[0].duration);
await message.say({ embed });
}
message.guild.music.seek = null;
return queue.shift();
});
@@ -80,15 +74,13 @@ Structures.extend('Guild', Guild => {
message.guild.music.seek = null;
return this.play(queue, message);
}
else {
message.guild.music.isPlaying = false;
message.guild.music.nowPlaying = null;
message.guild.music.dispatcher = null;
message.guild.music.seek = null;
voiceChannel.leave();
const embed = new MessageEmbed().setColor('#000099').setTitle(':musical_note: Queue ended');
return await message.say({ embed });
}
message.guild.music.isPlaying = false;
message.guild.music.nowPlaying = null;
message.guild.music.dispatcher = null;
message.guild.music.seek = null;
voiceChannel.leave();
const embed = new MessageEmbed().setColor('#000099').setTitle(':musical_note: Queue ended');
return await message.say({ embed });
});
dispatcher.on('error', err => {
@@ -107,69 +99,16 @@ Structures.extend('Guild', Guild => {
}
}
startCounter = message => {
try {
if (!message.guild.music.nowPlaying.playingFor) message.guild.music.nowPlaying.playingFor = { hours: 0, minutes: 0, seconds: 0, string: '00:00:00' };
const interval = setInterval(() => {
if (!message.guild.music.nowPlaying || message.guild.music.paused) clearInterval(interval);
else if (message.guild.music.nowPlaying.playingFor.seconds === 60) {
message.guild.music.nowPlaying.playingFor = {
hours: message.guild.music.nowPlaying.playingFor.hours,
minutes: message.guild.music.nowPlaying.playingFor.minutes + 1,
seconds: 0,
string: this.formatDurationString({
hours: message.guild.music.nowPlaying.playingFor.hours,
minutes: message.guild.music.nowPlaying.playingFor.minutes + 1,
seconds: 0
})
};
}
else if (message.guild.music.nowPlaying.playingFor.minutes === 60) {
message.guild.music.nowPlaying.playingFor = {
hours: message.guild.music.nowPlaying.playingFor.hours + 1,
minutes: 0,
seconds: 0,
string: this.formatDurationString({
hours: message.guild.music.nowPlaying.playingFor.hours + 1,
minutes: 0,
seconds: 0
})
};
}
else {
message.guild.music.nowPlaying.playingFor = {
hours: message.guild.music.nowPlaying.playingFor.hours,
minutes: message.guild.music.nowPlaying.playingFor.minutes,
seconds: message.guild.music.nowPlaying.playingFor.seconds + 1,
string: this.formatDurationString({
hours: message.guild.music.nowPlaying.playingFor.hours,
minutes: message.guild.music.nowPlaying.playingFor.minutes,
seconds: message.guild.music.nowPlaying.playingFor.seconds + 1
})
};
}
}, 1000);
} catch(err) {
logger.log('error', err);
const embed = new MessageEmbed().setColor('#ff0000').setTitle(`:x: Error occured: ${err.message}`);
return message.say({ embed });
}
formatDurationString = (hours, minutes, seconds) => {
return `${hours < 10 ? '0' + hours : hours ? hours : '00'}:${minutes < 10 ? '0' + minutes : minutes ? minutes : '00'}:${seconds < 10 ? '0' + seconds : seconds ? seconds : '00'}`;
}
formatDurationString = durationObject => {
return `${durationObject.hours < 10 ? '0' + durationObject.hours : durationObject.hours ? durationObject.hours : '00'}:${durationObject.minutes < 10 ? '0' + durationObject.minutes : durationObject.minutes ? durationObject.minutes : '00'}:${durationObject.seconds < 10 ? '0' + durationObject.seconds : durationObject.seconds ? durationObject.seconds : '00'}`;
}
formatDurationSeconds = durationString => {
if (!durationString.match(/\d+:\d{2}:\d{2}/)) return;
const time = durationString.split(':').map(time => parseInt(time));
formatDurationObject = durationString => {
if (!durationString.match(/(\d+:)?\d{2}:\d{2}/)) return;
const time = durationString.split(':').map(t => parseInt(t));
switch(time.length) {
case 3: return { hours: time[0], minutes: time[1], seconds: time[2] };
case 2: return { hours: 0, minutes: time[0], seconds: time[1] };
case 1: return { hours: 0, minutes: 0, seconds: time[0] };
}
return time[0] * 3600 + time[1] * 60 + time[2];
}
}