diff --git a/struct/client.js b/struct/client.js index 8a364e5..98ab055 100644 --- a/struct/client.js +++ b/struct/client.js @@ -2,6 +2,7 @@ const { Client, Collection } = require('discord.js'); const Discord = require('discord.js'); const fs = require('fs'); const path = require('path'); +const fetch = require('node-fetch'); const events = '../events/'; module.exports = class extends Client { @@ -29,6 +30,9 @@ module.exports = class extends Client { this.commandAliases.set(command.alias, command); } + client.stations = fetch('https://gitea.cwinfo.org/cwchristerw/radio/raw/branch/master/playlist.json') + .then(res => res.json()); + this.on('ready', () => { require(`${events}ready`).execute(this, Discord); }); diff --git a/struct/funcs/play.js b/struct/funcs/play.js index e2ac3fe..3348b43 100644 --- a/struct/funcs/play.js +++ b/struct/funcs/play.js @@ -1,22 +1,21 @@ module.exports = async function (guild, client, station) { const radio = client.radio.get(guild.id); - const stations = await client.funcs.radiostations(); let url = ""; - - if(isNaN(station)){ + + if (isNaN(station)) { radio.voiceChannel.leave(); return radio.textChannel.send('<:redx:674263474704220182> An error has occured while playing radio!'); } - if(station-1 > stations.length-1){ + if (station - 1 > client.stations.length - 1) { radio.voiceChannel.leave(); return radio.textChannel.send('<:redx:674263474704220182> An error has occured while playing radio!'); } - url = stations[station-1].stream[stations[station-1].stream.default]; - - if(!url) { + url = client.stations[station - 1].stream[client.stations[station - 1].stream.default]; + + if (!url) { radio.voiceChannel.leave(); return radio.textChannel.send('<:redx:674263474704220182> An error has occured while playing radio!'); } @@ -32,16 +31,16 @@ module.exports = async function (guild, client, station) { dispatcher.on('start', () => { dispatcher.player.streamingData.pausedTime = 0; }); - + dispatcher.on('error', error => { console.error(error); radio.voiceChannel.leave(); client.radio.delete(guild.id); return radio.textChannel.send('<:redx:674263474704220182> An error has occured while playing radio!'); }); - + dispatcher.setVolume(radio.volume / 10); - + radio.textChannel.send('Start playing'); radio.playing = true; diff --git a/struct/funcs/radiostations.js b/struct/funcs/radiostations.js deleted file mode 100644 index 8cff920..0000000 --- a/struct/funcs/radiostations.js +++ /dev/null @@ -1,9 +0,0 @@ -module.exports = async function () { - - const fetch = require('node-fetch'); - - let data = fetch('https://gitea.cwinfo.org/cwchristerw/radio/raw/branch/master/playlist.json') - .then(res => res.json()); - - return data; -} \ No newline at end of file