Formatting changes

.dockerignore

@@ -4,4 +4,4 @@
 datastore
 Dockerfile
 LICENSE
-README.md
+README.md

.env_example

@@ -1,2 +1,2 @@
 DISCORD_TOKEN=
-RADIOX_STATIONSLISTURL=https://gitea.cwinfo.org/cwchristerw/radio/raw/branch/master/playlist.json
+RADIOX_STATIONSLISTURL=https://gitea.cwinfo.org/cwchristerw/radio/raw/branch/master/playlist.json

.github/dependabot.yml

@@ -16,4 +16,4 @@ updates:
       interval: "daily"
     target-branch: "develop"
     labels:
-      - "dependencies"
+      - "dependencies"

.github/labeler.yml

@@ -4,4 +4,4 @@ dependencies:
 documentation:
 - README.md
 - LICENSE
-- .env_example
+- .env_example

.github/workflows/docker-build.yml

@@ -16,4 +16,4 @@ jobs:
       with:
         install: true
     - name: Build
-      run: docker build . # will run buildx
+      run: docker build . # will run buildx

.github/workflows/labeler.yml

@@ -14,4 +14,4 @@ jobs:
     - uses: actions/labeler@v3
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
-        sync-labels: true
+        sync-labels: true

Dockerfile

@@ -14,4 +14,4 @@ RUN npm install
 
 RUN npm run build
 
-CMD [ "npm", "start" ]
+CMD [ "npm", "start" ]

package.json

@@ -48,4 +48,4 @@
       "node": ">=16.8.0",
       "npm": ">=7.0.0"
   }
-}
+}

src/Client.ts

@@ -73,11 +73,11 @@ class RadioClient extends Client {
         this.on("interactionCreate", interaction => {
             require(`${events}interactionCreate`).execute(this, interaction);
         });
-        
+
         this.on("voiceStateUpdate", (oldState, newState) => {
             require(`${events}voiceStateUpdate`).execute(this, oldState, newState);
         });
-        
+
         process.on('SIGINT', () => {
             require(`${events}SIGINT`).execute(this);
         });
@@ -93,7 +93,7 @@ class RadioClient extends Client {
         process.on('exit', () => {
             this.funcs.logger("Bot", "Stopping");
         });
-        
+
         this.on("error", error => {
             console.error(error);
         });
@@ -102,4 +102,4 @@ class RadioClient extends Client {
     }
 }
 
-export default RadioClient
+export default RadioClient

src/client/commands.js

@@ -15,7 +15,7 @@ module.exports = {
             command.data = new SlashCommandBuilder()
                 .setName(command.name)
                 .setDescription(command.description);
-            
+
             command.data = command.data.toJSON();
             if(command.options) {
                 command.options.forEach(function(option) {
@@ -67,4 +67,4 @@ module.exports = {
             }
         })();
     }
-}
+}

src/client/commands/bug.js

@@ -23,4 +23,4 @@ module.exports = {
             ephemeral: true
         });
     }
-};
+};

src/client/commands/help.js

@@ -26,7 +26,7 @@ module.exports = {
             .setDescription(message.helpDescription)
             .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
             .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
-        
+
         interaction.reply({
             embeds: [embed],
             ephemeral: true

src/client/commands/invite.js

@@ -19,4 +19,4 @@ module.exports = {
             ephemeral: true
         });
     }
-};
+};

src/client/commands/list.js

@@ -13,9 +13,9 @@ module.exports = {
                 ephemeral: true
             });
         }
-        
+
         const radio = client.radio.get(interaction.guild.id);
-        
+
         if(radio){
             client.funcs.listStations(client, interaction);
         } else {
@@ -39,4 +39,4 @@ module.exports = {
             });
         }
     }
-};
+};

src/client/commands/maintenance.js

@@ -60,7 +60,7 @@ module.exports = {
                 value: "9"
             }
         );
-        
+
         const menu = new Discord.MessageActionRow()
         .addComponents(
             new Discord.MessageSelectMenu()
@@ -84,7 +84,7 @@ module.exports = {
             .setColor(client.config.embedColor)
             .setDescription(options.find(option => option.value == action).label)
             .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
-        
+
         interaction.reply({
             embeds: [embed],
             ephemeral: true
@@ -116,7 +116,7 @@ module.exports = {
                     client.stations = await fetch(client.config.stationslistUrl)
                         .then(client.funcs.checkFetchStatus)
                         .then(response => response.json());
-    
+
                     client.funcs.logger('Stations', 'Successfully fetched list');
                 } catch (error) {
                     client.funcs.logger('Stations', 'Fetching list failed');
@@ -133,4 +133,4 @@ module.exports = {
         }
 
     }
-};
+};

src/client/commands/next.js

@@ -5,7 +5,7 @@ module.exports = {
     async execute(interaction, client, command) {
         if (client.funcs.check(client, interaction, command)) {
             const radio = client.radio.get(interaction.guild.id);
-            
+
             let index = client.stations.findIndex(station => station.name == radio.station.name) + 1;
             if(index == client.stations.length) index = 0;
 
@@ -20,7 +20,7 @@ module.exports = {
 
             client.funcs.statisticsUpdate(client, interaction.guild, radio);
             radio.audioPlayer.stop();
-            
+
             let date = new Date();
             radio.station = station;
             radio.textChannel = interaction.channel;
@@ -36,4 +36,4 @@ module.exports = {
 
         }
     }
-}
+}

src/client/commands/nowplaying.js

@@ -25,11 +25,11 @@ module.exports = {
                 .setDescription(message.nowplayingDescription)
                 .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
                 .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
-            
+
             interaction.reply({
                 embeds: [embed],
                 ephemeral: true
             });
         }
     }
-};
+};

src/client/commands/play.js

@@ -90,7 +90,7 @@ module.exports = {
         if (radio) {
             client.funcs.statisticsUpdate(client, interaction.guild, radio);
             radio.audioPlayer.stop();
-            
+
             let date = new Date();
             radio.station = station;
             radio.textChannel = interaction.channel;
@@ -141,4 +141,4 @@ module.exports = {
             });
         }
     }
-};
+};

src/client/commands/prev.js

@@ -20,12 +20,12 @@ module.exports = {
 
             client.funcs.statisticsUpdate(client, interaction.guild, radio);
             radio.audioPlayer.stop();
-            
+
             let date = new Date();
             radio.station = station;
             radio.textChannel = interaction.channel;
             radio.startTime = date.getTime();
-            
+
             if(interaction.isCommand()) {
                 client.funcs.play(interaction, interaction.guild, client, url);
             }
@@ -36,4 +36,4 @@ module.exports = {
 
         }
     }
-}
+}

src/client/commands/statistics.js

@@ -11,7 +11,7 @@ module.exports = {
         let currentGuild = client.datastore.getEntry(interaction.guild.id);
         let global = client.datastore.getEntry("global");
         let statistics = "";
-        
+
         if(!client.stations) {
             message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
             return interaction.reply({
@@ -35,7 +35,7 @@ module.exports = {
                 }
             });
         }
-        
+
         const embed = new Discord.MessageEmbed()
             .setTitle(client.messages.statisticsTitle)
             .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["statistics"].replace(/[^0-9]+/g, ''))
@@ -49,4 +49,4 @@ module.exports = {
             ephemeral: true
         });
     }
-};
+};

src/client/commands/status.js

@@ -28,4 +28,4 @@ module.exports = {
         });
 
     }
-};
+};

src/client/commands/stop.js

@@ -38,4 +38,4 @@ module.exports = {
             });
         }
     }
-};
+};

src/client/datastore.js

@@ -6,7 +6,7 @@ module.exports = class {
         this.map = new Map();
         this.loadData();
     }
-    
+
     loadData() {
         const dir = path.join(path.dirname(__dirname), '../datastore');
         if (!fs.existsSync(dir)) {
@@ -33,7 +33,7 @@ module.exports = class {
         var statistics = {};
 
         if(!client.stations) return;
-        
+
         let calculation = guilds.next();
 
         while (!calculation.done) {
@@ -47,7 +47,7 @@ module.exports = class {
                                 statistics[stations[station].name].time = 0;
                                 statistics[stations[station].name].used = 0;
                             }
-                        
+
                             statistics[stations[station].name].time = parseInt(statistics[stations[station].name].time)+parseInt(currentGuild.statistics[stations[station].name].time);
                             statistics[stations[station].name].used = parseInt(statistics[stations[station].name].used)+parseInt(currentGuild.statistics[stations[station].name].used);
                         }
@@ -84,26 +84,26 @@ module.exports = class {
         this.map.set(id, newData);
         this.saveEntry(id, newData);
     }
-    
+
     getEntry(id){
         return this.map.get(id);
     }
-    
+
     updateEntry(guild, newData) {
         newData.guild.name = guild.name;
 
         let date = new Date();
         newData.updated = date.toISOString().substring(0, 10)
-        
+
         this.map.set(guild.id, newData);
         this.saveEntry(guild.id, newData);
         //this.showEntry(this.getEntry(guild.id));
     }
-    
+
     showEntry(data){
         console.log(data);
     }
-    
+
     createTestFile () {
         let newData = {
             "guild": {
@@ -120,10 +120,10 @@ module.exports = class {
 
             }
         }
-        
+
         this.updateEntry(newData.guild, newData);
     }
-    
+
     saveEntry(file, data) {
         data = JSON.stringify(data, null, 4);
 

src/client/emojis.js

@@ -39,4 +39,4 @@ module.exports = {
             }
         }
     }
-}
+}

src/client/events/SIGINT.js

@@ -4,11 +4,11 @@ module.exports = {
         client.user.setStatus('dnd');
 
         client.funcs.saveRadios(client);
-        
+
         setInterval(() => {
             if(client.radio.size == 0){
                 process.exit();
             }
         }, 500);
     }
-}
+}

src/client/events/SIGTERM.js

@@ -3,4 +3,4 @@ module.exports = {
     execute(client) {
         process.emit('SIGINT');
     }
-}
+}

src/client/events/interactionCreate.js

@@ -4,7 +4,7 @@ module.exports = {
 
         const permissions = interaction.channel.permissionsFor(interaction.client.user);
         if (!permissions.has('VIEW_CHANNEL')) return;
-        
+
         if (!permissions.has('EMBED_LINKS')) return interaction.reply({
             content: client.messages.noPermsEmbed,
             ephemeral: true
@@ -14,7 +14,7 @@ module.exports = {
             const commandName = interaction.commandName;
             const command = client.commands.get(commandName);
             if (!command) return;
-    
+
             try {
                 command.execute(interaction, client);
             } catch (error) {

src/client/events/messageCreate.js

@@ -16,7 +16,7 @@ module.exports = {
         } else {
             return;
         }
-        
+
         const args = message.content.slice(prefix.length).split(' ');
         if (!message.content.startsWith(prefix)) return;
         if (!args[0]) return;
@@ -30,7 +30,7 @@ module.exports = {
             let newMessage = {};
 
             newMessage.messageCommandsDeprecatedTitle = client.messages.messageCommandsDeprecatedTitle.replace("%client.user.username%", client.user.username);
-    
+
             const embed = new Discord.MessageEmbed()
                 .setTitle(newMessage.messageCommandsDeprecatedTitle)
                 .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["logo"].replace(/[^0-9]+/g, ''))
@@ -55,4 +55,4 @@ module.exports = {
             console.error(error);
         }
     }
-}
+}

src/client/events/messageDelete.js

@@ -7,4 +7,4 @@ module.exports = {
         if(msg.id != radio.message.id) return;
         radio.message = null;
     }
-}
+}

src/client/events/ready.js

@@ -21,7 +21,7 @@ module.exports = {
 
         /*DEVELOPERS*/
         client.funcs.logger('Developers');
-        
+
         client.developers = "";
         let user = "";
         for (let i = 0; i < client.config.devId.length; i++) {
@@ -53,7 +53,7 @@ module.exports = {
             client.funcs.logger('Stations', 'Fetching list failed');
             console.error(error + "\n");
         }
-        
+
         setInterval(async () => {
             try {
                 client.funcs.logger('Stations', 'Started fetching list – ' + client.config.stationslistUrl);
@@ -71,7 +71,7 @@ module.exports = {
         if(!client.stations) {
             client.user.setStatus('dnd');
         }
-        
+
         /*GUILDS*/
         client.funcs.logger('Guilds', 'Started fetching list');
 
@@ -83,7 +83,7 @@ module.exports = {
         console.log("\n");
 
         client.funcs.logger('Guilds', 'Successfully fetched list');
-        
+
         /*STATISTICS*/
         client.datastore.calculateGlobal(client);
 
@@ -99,4 +99,4 @@ module.exports = {
         }, 5000);
 
     }
-}
+}

src/client/events/uncaughtException.js

@@ -4,4 +4,4 @@ module.exports = {
         console.log(error.stack);
         process.emit('SIGINT');
     }
-}
+}

src/client/funcs/checkFetchStatus.js

@@ -4,4 +4,4 @@ module.exports = function (response) {
     } else {
         throw new Error(response.status + " " + response.statusText);
     }
-}
+}

src/client/funcs/isDev.js

@@ -7,4 +7,4 @@ module.exports = function (devList, authorID){
         }
     });
     return response;
-}
+}

src/client/funcs/listStations.js

@@ -30,4 +30,4 @@ module.exports = function (client, interaction){
         components: [menu],
         ephemeral: true
     });
-}
+}

src/client/funcs/loadState.js

@@ -7,4 +7,4 @@ module.exports = function loadState(client, guild){
     data.state = {};
     client.datastore.updateEntry(guild, data);
     return state;
-}
+}

src/client/funcs/logger.js

@@ -2,4 +2,4 @@ module.exports = function (area, text){
     let date = new Date();
     console.log('[' + area + '] – ' + date.toISOString());
     if(text)  console.log(text + '\n');
-}
+}

src/client/funcs/msToTime.js

@@ -9,4 +9,4 @@ module.exports = function msToTime(duration) {
         : +hours > 0
             ? `${+hours < 10 ? `0${hours}` : hours}:${+minutes < 10 ? `0${minutes}` : minutes}:${+seconds < 10 ? `0${seconds}` : seconds}`
             : `${+minutes < 10 ? `0${minutes}` : minutes}:${+seconds < 10 ? `0${seconds}` : seconds}`;
-}
+}

src/client/funcs/play.js

@@ -47,7 +47,7 @@ module.exports = async function play(interaction, guild, client, url) {
         .addField(client.messages.nowplayingTitle, message.nowplayingDescription, true)
         .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
         .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
-    
+
     const buttons = new Discord.MessageActionRow()
         .addComponents(
             new Discord.MessageButton()
@@ -87,10 +87,10 @@ module.exports = async function play(interaction, guild, client, url) {
     }
 
     message.play = client.messages.play.replace("%radio.station.name%", radio.station.name);
-    
+
     interaction?.reply({
         content: client.messageEmojis["play"] + message.play,
         ephemeral: true
     });
-    
+
-}
+}

src/client/funcs/restoreRadios.js

@@ -43,7 +43,7 @@ module.exports = async function restoreRadios(client, guilds) {
             construct.connection = connection;
             let date = new Date();
             construct.startTime = date.getTime();
-            
+
             client.funcs.play(null, guild, client, url, Discord);
 
             client.datastore.checkEntry(guild.id);
@@ -59,4 +59,4 @@ module.exports = async function restoreRadios(client, guilds) {
             console.log(error);
         }
     });
-}
+}

src/client/funcs/saveRadios.js

@@ -1,11 +1,11 @@
 module.exports =  function saveRadios(client) {
     let currentRadios = client.radio.keys();
     let radio = currentRadios.next();
-    
+
     while (!radio.done) {
         let currentRadio = client.radio.get(radio.value);
         currentRadio.guild = client.datastore.getEntry(radio.value).guild;
-    
+
         if (currentRadio) {
             client.funcs.statisticsUpdate(client, currentRadio.guild, currentRadio);
             client.funcs.saveState(client, currentRadio.guild, currentRadio);
@@ -14,7 +14,7 @@ module.exports =  function saveRadios(client) {
             currentRadio.message?.delete();
             client.radio.delete(radio.value);
         }
-        
+
         radio = currentRadios.next();
     }
-}
+}

src/client/funcs/saveState.js

@@ -1,6 +1,6 @@
 module.exports = function saveState(client, guild, radio){
     client.datastore.checkEntry(guild.id);
-    
+
     let date = new Date();
 
     let data = client.datastore.getEntry(guild.id);
@@ -15,4 +15,4 @@ module.exports = function saveState(client, guild, radio){
     data.state.station.owner = radio.station.owner;
 
     client.datastore.updateEntry(guild, data);
-}
+}

src/client/funcs/searchStation.js

@@ -59,4 +59,4 @@ module.exports = function searchStation(key, client) {
         }
     }
     return highestProbabilityStation;
-}
+}

src/client/funcs/statisticsUpdate.js

@@ -1,22 +1,22 @@
 module.exports = function statisticsUpdate(client, guild, radio) {
-    
+
     client.datastore.checkEntry(guild.id);
-    
+
     radio.datastore = client.datastore.getEntry(guild.id);
-    
+
     if(!radio.datastore.statistics[radio.station.name]){
         radio.datastore.statistics[radio.station.name] = {};
         radio.datastore.statistics[radio.station.name].time = 0;
         radio.datastore.statistics[radio.station.name].used = 0;
         client.datastore.updateEntry(guild, radio.datastore);
     }
-    
+
     let date = new Date();
     radio.currentTime = date.getTime();
     radio.playTime = parseInt(radio.currentTime)-parseInt(radio.startTime);
     radio.datastore.statistics[radio.station.name].time = parseInt(radio.datastore.statistics[radio.station.name].time)+parseInt(radio.playTime);
-    
+
     radio.datastore.statistics[radio.station.name].used = parseInt(radio.datastore.statistics[radio.station.name].used)+1;
     client.datastore.updateEntry(guild, radio.datastore);
     client.datastore.calculateGlobal(client);
-}
+}

src/client/messages.js

@@ -37,4 +37,4 @@ module.exports = {
     errorStationURL: "Station can't be URL",
     messageCommandsDeprecatedTitle: "%client.user.username%",
     messageCommandsDeprecatedDescription: "We recommend you to reauthorize our bot by clicking the invite link down below, because Discord is planning to remove message content from verified bots [Read More](https://support-dev.discord.com/hc/en-us/articles/4404772028055)" + "\n\n" + "**Invite Bot**" + "\n" + "https://wgi.fi/radiox_invite" + "\n\n" + "This bot now supports slash commands, you should start using them instead. Type / into the message box and select the bot you wish to use. Remember to be careful as there are a few bugs here and there on Discord." + "\n\n" + "We will remove this deprecation message in March of 2022 when RadioX 1.0.0 is released."
-};
+};

src/client/utils/typings.ts

@@ -1,3 +1,3 @@
 export interface command { }
 
-export interface radio {}
+export interface radio {}

src/config.js

@@ -23,4 +23,4 @@ module.exports = {
     version: process.env.RADIOX_VERSION || process.env.npm_package_version,
     debug: process.env.DEBUG_MODE || false
 
-}
+}