From 1b423ae31a915c2fa167756f115c3d83d150b19b Mon Sep 17 00:00:00 2001
From: Hazem Krimi <krimihazem1@gmail.com>
Date: Mon, 11 May 2020 10:57:29 +0100
Subject: [PATCH] added small changes

---
 commands/music/pause.js  |  2 +-
 commands/music/play.js   | 10 +++---
 commands/music/queue.js  | 10 +++---
 commands/music/resume.js |  2 +-
 index.js                 | 76 ++++++++++++++++++++++------------------
 5 files changed, 52 insertions(+), 48 deletions(-)

diff --git a/commands/music/pause.js b/commands/music/pause.js
index 8de8b7f..8b5daae 100644
--- a/commands/music/pause.js
+++ b/commands/music/pause.js
@@ -33,7 +33,7 @@ module.exports = class Play extends Command {
             else {
                 message.guild.music.paused = true;
                 message.guild.music.dispatcher.pause(true);
-                const embed = new MessageEmbed().setColor('#000099').setTitle(':pause_button: paused player');
+                const embed = new MessageEmbed().setColor('#000099').setTitle(':pause_button: Paused player');
                 return await message.say({ embed });
             }
         } catch (err) {
diff --git a/commands/music/play.js b/commands/music/play.js
index 5af23fd..c703ca4 100644
--- a/commands/music/play.js
+++ b/commands/music/play.js
@@ -71,7 +71,7 @@ module.exports = class Play extends Command {
                     }
                 });
                 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: Added "${playlist.title}" to queue (${playlistVideos.length} tracks)`);
                     return await message.say({ embed });
                 }
             } else if (query.match(/^(http(s)?:\/\/)?((w){3}.)?youtu(be|.be)?(\.com)?\/\S+/)) {
@@ -100,7 +100,7 @@ module.exports = class Play extends Command {
                     message.guild.music.isPlaying = true;
                     return message.guild.play(message.guild.music.queue, message);
                 } else {
-                    const embed = new MessageEmbed().setColor('#000099').setTitle(`:arrow_forward: "${data.title}" added to queue`);
+                    const embed = new MessageEmbed().setColor('#000099').setTitle(`:arrow_forward: Added "${data.title}" to queue`);
                     return await message.say({ embed });
                 }
             } else if (query.match(/^(http(s)?:\/\/)?((w){3}.)?facebook?(\.com)?\/\S+\/videos\/\S+/)) {
@@ -149,7 +149,7 @@ module.exports = class Play extends Command {
                     message.guild.music.isPlaying = true;
                     return message.guild.play(message.guild.music.queue, message);
                 } else {
-                    const embed = new MessageEmbed().setColor('#000099').setTitle(`:arrow_forward: "${data.title}" added to queue`);
+                    const embed = new MessageEmbed().setColor('#000099').setTitle(`:arrow_forward: Added "${data.title}" to queue`);
                     return await message.say({ embed });
                 }
             } else if (query.match(/^(http(s)?:\/\/)?((w){3}\S)?\S+(\.)\S+\/\S+\.(\S){3}/)) {
@@ -184,7 +184,7 @@ module.exports = class Play extends Command {
                                 message.guild.music.isPlaying = true;
                                 return message.guild.play(message.guild.music.queue, message);
                             } else {
-                                const embed = new MessageEmbed().setColor('#000099').setTitle(`:arrow_forward: "${data.title}" added to queue`);
+                                const embed = new MessageEmbed().setColor('#000099').setTitle(`:arrow_forward: Added "${data.title}" to queue`);
                                 return await message.say({ embed });
                             }
                         }
@@ -218,7 +218,7 @@ module.exports = class Play extends Command {
                     message.guild.music.isPlaying = true;
                     return message.guild.play(message.guild.music.queue, message);
                 } else {
-                    const embed = new MessageEmbed().setColor('#000099').setTitle(`:arrow_forward: "${data.title}" added to queue`);
+                    const embed = new MessageEmbed().setColor('#000099').setTitle(`:arrow_forward: Added "${data.title}" to queue`);
                     return await message.say({ embed });
                 }
             }
diff --git a/commands/music/queue.js b/commands/music/queue.js
index 79cd6fc..4a8a672 100644
--- a/commands/music/queue.js
+++ b/commands/music/queue.js
@@ -24,16 +24,14 @@ module.exports = class Play extends Command {
             } else {
                 const embed = new MessageEmbed().setColor('#000099').setTitle(':musical_note: Queue');
 
-                embed.addField('Now playing', message.guild.music.nowPlaying.title).addField('Duration', `${message.guild.music.nowPlaying.playingFor.string}/${message.guild.music.nowPlaying.duration.string}`);
+                embed
+                    .addField('Now playing', `${message.guild.music.nowPlaying.title} ${message.guild.music.nowPlaying.by && `By ${message.guild.music.nowPlaying.by}`}`)
+                    .addField('Duration', `${message.guild.music.nowPlaying.playingFor.string}/${message.guild.music.nowPlaying.duration.string}`);
 
                 if (message.guild.music.queue.length === 0) embed.addField('Queue', 'nothing in the queue');
                 else embed.addField('Queue', `${message.guild.music.queue.length} track(s)`);
 
-                message.guild.music.queue.forEach((item, index) => {
-                    let itemString = `${item.title}`;
-                    if (item.type === 'youtube' || item.type === 'search' || item.type === 'facebook') itemString += ` By ${item.by}`;
-                    embed.addField(index + 1, itemString);
-                });
+                message.guild.music.queue.forEach((item, index) => embed.addField(index + 1, `${item.title} ${item.by && `By ${item.by}`}`));
 
                 return await message.say({ embed });
             }
diff --git a/commands/music/resume.js b/commands/music/resume.js
index 154afd2..e9285bb 100644
--- a/commands/music/resume.js
+++ b/commands/music/resume.js
@@ -30,7 +30,7 @@ module.exports = class Play extends Command {
             else {
                 message.guild.music.paused = false;
                 message.guild.music.dispatcher.resume();
-                const embed = new MessageEmbed().setColor('#000099').setTitle(':arrow_forward: resumed player');
+                const embed = new MessageEmbed().setColor('#000099').setTitle(':arrow_forward: Resumed player');
                 return await message.say({ embed });
             }
         } catch (err) {
diff --git a/index.js b/index.js
index c927ec2..6e4e24f 100644
--- a/index.js
+++ b/index.js
@@ -79,47 +79,53 @@ Structures.extend('Guild', Guild => {
         }
 
         startCounter = message => {
-            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.formatDuration({ 
+            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 
-                        }) 
-                    };
-                }
-                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.formatDuration({ 
+                            seconds: 0,
+                            string: this.formatDuration({
+                                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 
-                        }) 
-                    };
-                }
-                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.formatDuration({ 
+                            seconds: 0,
+                            string: this.formatDuration({
+                                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
-                        }) 
-                    };
-                }
-            }, 1000);
+                            seconds: message.guild.music.nowPlaying.playingFor.seconds + 1,
+                            string: this.formatDuration({
+                                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) {
+                console.error(err);
+                const embed = new MessageEmbed().setColor('#ff0000').setTitle(`:x: Error occured: ${err.message}`);
+                return message.say({ embed });
+            }
         }
 
         formatDuration = durationObject => {