removed some unnecessary variables and general clean up

commands/bug.js

@@ -5,13 +5,13 @@ module.exports = {
     description: 'Report a bug',
     permission: 'none',
     category: 'info',
-    async execute(msg, args, client, Discord, prefix) {
+    async execute(msg, args, client, Discord, command) {
         let message = {};
-        
+
         message.bugTitle = client.messages.bugTitle.replace("%client.user.username%", client.user.username);
         message.bugDescription = client.messages.bugDescription.replace("%client.developers%", client.developers);
         message.bugDescription = message.bugDescription.replace("%client.config.supportGuild%", client.config.supportGuild);
-        
+
         const embed = new Discord.MessageEmbed()
             .setTitle(message.bugTitle)
             .setThumbnail("https://cdn.discordapp.com/emojis/686296221433725076.png")
@@ -19,6 +19,6 @@ module.exports = {
             .setDescription(message.bugDescription)
             .setFooter('EximiaBots by Warén Media', 'https://cdn.discordapp.com/emojis/687022937978568760.png');
         msg.channel.send(embed);
-        
+
     },
 };

commands/help.js

@@ -5,19 +5,19 @@ module.exports = {
     description: 'See the help for RadioX.',
     permission: 'none',
     category: 'info',
-    execute(msg, args, client, Discord, prefix, command) {
+    execute(msg, args, client, Discord, command) {
         let message = {};
-        
+
         if (args[1]) {
             if (!client.commands.has(args[1]) || (client.commands.has(args[1]) && client.commands.get(args[1]).omitFromHelp === true)) return msg.channel.send('That command does not exist');
             const command = client.commands.get(args[1]);
-            
+
             message.helpCommandTitle = client.messages.helpCommandTitle.replace("%client.config.prefix%", client.config.prefix);
             message.helpCommandTitle = message.helpCommandTitle.replace("%command.name%", command.name);
             message.helpCommandTitle = message.helpCommandTitle.replace("%command.usage%", command.usage);
             message.helpCommandDescription = client.messages.helpCommandDescription.replace("%command.description%", command.description);
             message.helpCommandDescription = message.helpCommandDescription.replace("%command.alias%", command.alias);
-            
+
             const embed = new Discord.MessageEmbed()
                 .setTitle(message.helpCommandTitle)
                 .setThumbnail("https://cdn.discordapp.com/emojis/686296221433725076.png")
@@ -34,11 +34,11 @@ module.exports = {
             for (let i = 0; i < categories.length; i++) {
                 commands += `**» ${categories[i].toUpperCase()}**\n${client.commands.filter(x => x.category === categories[i] && !x.omitFromHelp).map(x => `\`${x.name}\``).join(', ')}\n`;
             }
-            
+
             message.helpTitle = client.messages.helpTitle.replace("%client.user.username%", client.user.username);
             message.helpDescription = client.messages.helpDescription.replace("%commands%", commands);
             message.helpDescription = message.helpDescription.replace("%client.config.prefix%", client.config.prefix);
-            
+
             const embed = new Discord.MessageEmbed()
                 .setTitle(message.helpTitle)
                 .setThumbnail("https://cdn.discordapp.com/emojis/686296221433725076.png")

commands/invite.js

@@ -5,7 +5,7 @@ module.exports = {
     description: 'Invite RadioX.',
     permission: 'none',
     category: 'info',
-    execute(msg, args, client, Discord, prefix) {
+    execute(msg, args, client, Discord, command) {
         let message = {};
         message.inviteTitle = client.messages.inviteTitle.replace("%client.user.username%", client.user.username);
         const embed = new Discord.MessageEmbed()

commands/list.js

@@ -5,13 +5,13 @@ module.exports = {
     description: 'List radio stations.',
     permission: 'none',
     category: 'info',
-    execute(msg, args, client, Discord, prefix) {
+    execute(msg, args, client, Discord, command) {
         let stations = `${client.stations.map(s => `**#** ${s.name}`).join('\n')}`
         const hashs = stations.split('**#**').length;
         for (let i = 0; i < hashs; i++) {
             stations = stations.replace('**#**', `**${i + 1}**`);
         }
-        
+
         const embed = new Discord.MessageEmbed()
             .setTitle(client.messages.listTitle)
             .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["list"].replace(/[^0-9]+/g, ''))

commands/nowplaying.js

@@ -5,17 +5,16 @@ module.exports = {
     description: 'See the currently playing song position and length.',
     permission: 'none',
     category: 'music',
-    async execute(msg, args, client, Discord, prefix) {
+    async execute(msg, args, client, Discord, command) {
         let message = {};
         const radio = client.radio.get(msg.guild.id);
-        if (!radio || !radio.playing) return msg.channel.send('There is nothing playing.');
+        if (!radio) return msg.channel.send('There is nothing playing.');
-        radio.time = radio.connection.dispatcher.streamTime;
+        const completed = (radio.connection.dispatcher.streamTime.toFixed(0));
-        const completed = (radio.time.toFixed(0));
 
         message.nowplayingDescription = client.messages.nowplayingDescription.replace("%radio.station.name%", radio.station.name);
         message.nowplayingDescription = message.nowplayingDescription.replace("%radio.station.owner%", radio.station.owner);
         message.nowplayingDescription = message.nowplayingDescription.replace("%msToTime(completed, \"hh:mm:ss\")%", msToTime(completed, "hh:mm:ss"));
-        
+
         const embed = new Discord.MessageEmbed()
             .setTitle(client.messages.nowplayingTitle)
             .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["play"].replace(/[^0-9]+/g, ''))

commands/play.js

@@ -5,7 +5,7 @@ module.exports = {
 	description: 'Play some music.',
 	permission: 'none',
 	category: 'music',
-	async execute(msg, args, client, Discord, prefix) {
+	async execute(msg, args, client, Discord, command) {
 		let url = args[1] ? args[1].replace(/<(.+)>/g, "$1") : "";
 		const radio = client.radio.get(msg.guild.id);
 		const voiceChannel = msg.member.voice.channel;
@@ -44,7 +44,7 @@ module.exports = {
 		if (radio) {
 			radio.connection.dispatcher.destroy();
 			radio.station = station;
-            radio.textChannel = msg.channel;
+			radio.textChannel = msg.channel;
 			play(msg.guild, client, url);
 			return;
 		}
@@ -53,10 +53,8 @@ module.exports = {
 			textChannel: msg.channel,
 			voiceChannel: voiceChannel,
 			connection: null,
-			playing: false,
 			station: station,
-			volume: client.config.volume,
+			volume: 5,
-			time: null
 		};
 		client.radio.set(msg.guild.id, construct);
 
@@ -71,7 +69,7 @@ module.exports = {
 	}
 };
 function play(guild, client, url) {
-    let message = {};
+	let message = {};
 	const radio = client.radio.get(guild.id);
 
 	const dispatcher = radio.connection
@@ -82,10 +80,6 @@ function play(guild, client, url) {
 			return;
 		});
 
-	dispatcher.on('start', () => {
-		dispatcher.player.streamingData.pausedTime = 0;
-	});
-
 	dispatcher.on('error', error => {
 		console.error(error);
 		radio.voiceChannel.leave();
@@ -95,10 +89,8 @@ function play(guild, client, url) {
 
 	dispatcher.setVolume(radio.volume / 10);
 
-    message.play = client.messages.play.replace("%radio.station.name%", radio.station.name);
+	message.play = client.messages.play.replace("%radio.station.name%", radio.station.name);
 	radio.textChannel.send(client.messageEmojis["play"] + message.play);
-	radio.playing = true;
-
 };
 
 function searchStation(key, client) {

commands/stop.js

@@ -5,7 +5,7 @@ module.exports = {
 	usage: '',
 	permission: 'none',
 	category: 'music',
-	execute(msg, args, client, Discord, prefix, command) {
+	execute(msg, args, client, Discord, command) {
 		const radio = client.radio.get(msg.guild.id);
 		if (client.funcs.check(client, msg, command)) {
 			radio.connection.dispatcher.destroy();

commands/volume.js

@@ -5,14 +5,14 @@ module.exports = {
 	usage: '<volume>',
 	permission: 'MANAGE_MESSAGES',
 	category: 'music',
-	execute(msg, args, client, Discord, prefix, command) {
+	execute(msg, args, client, Discord, command) {
-        let message = {};
+		let message = {};
 		const radio = client.radio.get(msg.guild.id);
-        
+
 		if (!args[1] && radio) {
-            message.currentVolume = client.messages.currentVolume.replace("%radio.volume%", radio.volume)
+			message.currentVolume = client.messages.currentVolume.replace("%radio.volume%", radio.volume)
-            return msg.channel.send(message.currentVolume);
+			return msg.channel.send(message.currentVolume);
-        }
+		}
 		const volume = parseFloat(args[1]);
 		if (client.funcs.check(client, msg, command)) {
 			if (isNaN(volume)) return msg.channel.send(client.messages.invalidVolume);
@@ -20,7 +20,7 @@ module.exports = {
 			if (volume < 0) return msg.channel.send(client.messages.negativeVolume);
 			radio.volume = volume;
 			radio.connection.dispatcher.setVolume(volume / 5);
-            message.newVolume = client.messages.newVolume.replace("%volume%", volume);
+			message.newVolume = client.messages.newVolume.replace("%volume%", volume);
 			return msg.channel.send(message.newVolume);
 		}
 	}

config.js

@@ -4,7 +4,7 @@ module.exports = {
 
     //credentials
     token: process.env.DISCORD_TOKEN,
-    
+
     //support
     supportGuild: "https://discord.gg/rRA65Mn",
     devId: [
@@ -18,6 +18,5 @@ module.exports = {
 
     //Settings
     prefix: process.env.PREFIX || "rx>",
-    volume: 5
 
 }

events/msg.js

@@ -7,13 +7,13 @@ module.exports = {
         if (!msg.content.startsWith(prefix)) return;
         if (!args[0]) return;
         const commandName = args[0].toLowerCase();
+        if (commandName === 'none') return;
         const command = client.commands.get(commandName) || client.commands.find(cmd => cmd.aliases && cmd.aliases.includes(commandName)) || client.commandAliases.get(commandName);
         if (!command && msg.content !== `${prefix}`) return;
         const permissions = msg.channel.permissionsFor(msg.client.user);
         if (!permissions.has('EMBED_LINKS')) return msg.channel.send(client.messages.noPermsEmbed);
         try {
-            command.uses++;
+            command.execute(msg, args, client, Discord, command);
-            command.execute(msg, args, client, Discord, prefix, command);
         } catch (error) {
             msg.reply(client.messages.runningCommandFailed);
             console.error(error);

events/ready.js

@@ -31,7 +31,7 @@ module.exports = {
             client.stations = await fetch('https://gitea.cwinfo.org/cwchristerw/radio/raw/branch/master/playlist.json')
                 .then(res => res.json());
         }, 3600000);
-        
+
-        require(`../struct/emojis.js`).execute(client, Discord);
+        require(`../struct/emojis.js`).execute(client);
     }
 }

events/voiceStateUpdate.js

@@ -7,8 +7,6 @@ module.exports = {
         if (!radio) return;
         if (newState.member.id === client.user.id && oldState.member.id === client.user.id) {
             if (newState.channel === null) {
-                radio.songs = [];
-                radio.looping = false;
                 return client.radio.delete(newState.guild.id);
             }
 
@@ -18,8 +16,6 @@ module.exports = {
                     const connection = await oldState.channel.join();
                     return radio.connection = connection;
                 } catch (error) {
-                    radio.songs = [];
-                    radio.looping = false;
                     radio.connection.dispatcher.destroy();
                     radio.voiceChannel.leave();
                     client.radio.delete(msg.guild.id);
@@ -36,8 +32,6 @@ module.exports = {
             setTimeout(() => {
                 if (!radio) return;
                 if (radio.voiceChannel.members.size === 1) {
-                    radio.songs = [];
-                    radio.looping = false;
                     radio.connection.dispatcher.destroy();
                     radio.voiceChannel.leave();
                     client.radio.delete(newState.guild.id);

struct/check.js

@@ -2,11 +2,11 @@ module.exports = function (client, msg, command) {
     let message = {};
     const radio = client.radio.get(msg.guild.id);
     const permissions = msg.channel.permissionsFor(msg.author);
-    if (!radio || !radio.playing){
+    if (!radio) {
         msg.channel.send(client.messageEmojis["x"] + client.messages.notPlaying);
         return false;
     }
-    if (msg.member.voice.channel !== radio.voiceChannel){
+    if (msg.member.voice.channel !== radio.voiceChannel) {
         msg.channel.send(client.messageEmojis["x"] + client.messages.wrongVoiceChannel);
         return false;
     }

struct/client.js

@@ -14,7 +14,6 @@ module.exports = class extends Client {
         this.commandAliases = new Collection();
         this.radio = new Map();
         this.funcs = {};
-        this.dispatcher = {};
         this.config = require('../config.js');
         this.messages = require('./messages.js');
         this.funcs.check = require('./check.js');

struct/emojis.js

@@ -1,26 +1,26 @@
 module.exports = {
     name: 'emojis',
-    async execute(client, Discord) {
+    async execute(client) {
         let customEmojis = {
             list: "<:RadioXList:688541155519889482>",
             play: "<:RadioXPlay:688541155712827458>",
             stop: "<:RadioXStop:688541155377414168>",
             x: "<:RadioXX:688541155792781320>"
         };
-        
+
         let fallbackEmojis = {
             list: "📜",
             play: "▶️",
             stop: "⏹️",
             x: "❌"
         };
-        
+
         client.messageEmojis = {};
 
-        for(customEmojiName in customEmojis){
+        for (customEmojiName in customEmojis) {
             customEmojiID = customEmojis[customEmojiName].replace(/[^0-9]+/g, '');
             customEmoji = client.emojis.cache.get(customEmojiID);
-            if(customEmoji){
+            if (customEmoji) {
                 client.messageEmojis[customEmojiName] = customEmojis[customEmojiName];
             } else {
                 client.messageEmojis[customEmojiName] = fallbackEmojis[customEmojiName];