Merge pull request #75 from warengroup/develop

Version 0.3.11

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "eximiabots-radiox",
-  "version": "0.3.9",
+  "version": "0.3.11",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "eximiabots-radiox",
-      "version": "0.3.9",
+      "version": "0.3.11",
       "license": "MIT",
       "dependencies": {
         "@discordjs/builders": "^0.6.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eximiabots-radiox",
-  "version": "0.3.9",
+  "version": "0.3.11",
   "description": "Internet Radio to your Discord guild",
   "main": "index.js",
   "scripts": {

src/client/classes/Datastore.js

@@ -48,8 +48,11 @@ module.exports = class {
     }
 
     loadEntry(id){
-        const json = require(`../../../datastore/` + id + '.json');
-        this.map.set(id, json);
+        try {
+            const json = require(`../../../datastore/` + id + '.json');
+            this.map.set(id, json);
+        } catch (error) {
+        }
     }
 
     getEntry(id){

src/client/classes/Radio.js

@@ -65,18 +65,8 @@ module.exports = class Radio extends Map {
                 construct.connection = connection;
                 let date = new Date();
                 construct.startTime = date.getTime();
-
-                client.funcs.play(client, null, guild, station);
-
                 client.datastore.checkEntry(guild.id);
-                construct.datastore = client.datastore.getEntry(guild.id);
-
-                if (!construct.datastore.statistics[construct.station.name]) {
-                    construct.datastore.statistics[construct.station.name] = {};
-                    construct.datastore.statistics[construct.station.name].time = 0;
-                    construct.datastore.statistics[construct.station.name].used = 0;
-                    client.datastore.updateEntry(guild, construct.datastore);
-                }
+                client.funcs.play(client, null, guild, station);
             } catch (error) {
                 console.log(error);
             }

src/client/classes/Stations.js

@@ -15,16 +15,18 @@ module.exports = class Stations extends Array {
                 .then(response => response.json());
 
             if(list){
-                this.logger('Stations');
-                this.forEach(oldStation => {
-                    if(list.findIndex(station => station.name == oldStation.name)) return;
-                    delete this[this.findIndex(station => station.name == oldStation.name)];
-                });
+                this.length = 0;
                 list.forEach(station => {
-                    console.log("- " + station.name);
                     this.push(station);
                 });
-                console.log("\n");
+
+                if(options.show){
+                    this.logger('Stations');
+                    list.forEach(station => {
+                        console.log("- " + station.name);
+                    });
+                    console.log("\n");
+                }
             }
 
             this.logger('Stations', 'Successfully fetched list');

src/client/classes/Streamer.js

@@ -40,8 +40,9 @@ module.exports = class {
 
         let streamers = this.map.keys();
         streamers.forEach(streamer => {
-            if(client.stations.findIndex(station => station.name == streamer)) return;
-            this.stop(streamer);
+            if(client.stations.findIndex(station => station.name == streamer) == -1){
+                this.stop(streamer);
+            }
         });
     }
 
@@ -73,15 +74,12 @@ module.exports = class {
                 this.play(station);
             });
 
-
-
         audioPlayer
             .on('playing', () => {
 	            this.logger('Streamer', station.name + " / " + "Playing");
             })
             .on('idle', () => {
                 this.logger('Streamer', station.name + " / " + "Idle");
-                this.play(station);
             })
             .on('paused', () => {
                 this.logger('Streamer', station.name + " / " + "Paused");

src/client/commands/maintenance.js

@@ -155,7 +155,7 @@ module.exports = {
                 client.config.maintenanceMode = true;
 
                 client.user.setStatus('idle');
-                client.funcs.saveRadios(client);
+                client.radio.save(client);
 
                 setInterval(() => {
                     if(client.radio.size == 0 && client.config.streamerMode == "manual" && client.config.maintenanceMode){
@@ -179,7 +179,7 @@ module.exports = {
                 client.config.maintenanceMode = true;
 
                 client.user.setStatus('idle');
-                client.funcs.save(client);
+                client.radio.save(client);
 
                 setInterval(() => {
                     if(client.radio.size == 0 && client.config.streamerMode == "auto" && client.config.maintenanceMode){

src/client/events/ready.js

@@ -42,12 +42,14 @@ module.exports = {
         client.stations = new Stations();
 
         await client.stations.fetch({
-            url: client.config.stationslistUrl
+            url: client.config.stationslistUrl,
+            show: true
         });
 
         setInterval(async () => {
             await client.stations.fetch({
-                url: client.config.stationslistUrl
+                url: client.config.stationslistUrl,
+                show: false
             });
         }, 3600000);
 

src/client/funcs/loadState.js

@@ -4,6 +4,8 @@ module.exports = function loadState(client, guild){
     let state;
 
     state = data.state;
+    if(!state) return;
+
     data.state = {};
     client.datastore.updateEntry(guild, data);
     return state;