Merge branch 'master' of https://github.com/Elariondakta/automate

Author: Totodore

.gitignore

@@ -2,4 +2,6 @@
 node_modules/
 .env
 data/
-**.scssc
+.sass-cache
+**.map
+**.log

bot/bot.js

@@ -17,7 +17,10 @@ class Bot {
         bot.on("guildDelete", this.guildDelete);
         bot.setInterval(this.sendStats, 1000*60*60); //Stats toutes les 3h
     }
-
+    /**
+     * Handler triggered when the bot is ready and connected
+     * @param {Bot} self 
+     */
     ready(self) {
         console.info(`Logged in as ${bot.user.tag} !\n`);
         //On attend le passage à la prochaine minute pour être le plus syncro possible
@@ -27,36 +30,49 @@ class Bot {
         const intervalId = setInterval((self) => {
             if (Math.floor((new Date().getTime()/1000)/60)*60 > oldMinute) {
                 console.log(`\n\nNew minute detected, Starting cron Watcher at minute ${new Date().getMinutes()}`);
+                this.cronWatcher(this);
                 bot.setInterval(() => self.cronWatcher(self), 1000*60);  //Si on est passé à une nouvelle minute on lance le cronWatcher
                 clearInterval(intervalId);
             }
         }, 10, self);
     }
+    /**
+     * Handler for event when the bot is removed from a guild
+     * @param {Discord.Guild} guild 
+     */
     guildDelete(guild) {
         fs.rmdirSync(__dirname + "/.." + process.env.DB_GUILDS + "/" + guild.id + "/", {recursive: true});
     }
+    /**
+     * Handler for event when the bot is added to a guild
+     * @param {Discord.Guild} guild
+     */
     guildCreate(guild) {
         try {
             guild.systemChannel.send(`Hey ! I'm Automate, to give orders you need to go on this website : https://automatebot.app.\nI can send your messages at anytime of the day event when you're not here to supervise me ;)`);
         } catch(e) {
             console.log("Added bot but no systemChannel has been specified...");
         }
     }
+    /**
+     * Send all messages supposed to be sended, every minutes
+     * @param {Bot} self actual instance of the bot
+     */
     cronWatcher(self) {
-        const timestamp = Math.floor((Date.now()/1000)/60);
+        const date = new Date();
         fs.readdir(__dirname + "/.." + process.env.DB_GUILDS + "/", {}, (err, files) => {
             let i = 0;
             files.forEach(guildId => fs.readFile(__dirname + "/.." + process.env.DB_GUILDS + "/" + guildId + "/data.json", (err, file) => {
                 //Pour chaque guild on regarde si on doit envoyer un message
                 const guildData = JSON.parse(file);
                 let indexToDeletePonctual = [];
+                const timestamp = Math.floor(Date.now()/1000/60);
 
                 guildData.ponctual.forEach((ponctualEvent, index) => {
                     if (ponctualEvent.timestamp == timestamp) {
-                        const date = new Date();
                         try {
                             bot.channels.cache.get(ponctualEvent.channel_id).send(ponctualEvent.sys_content || ponctualEvent.message).then(message => {
-                                console.log(`New punctual message sent at ${date.getDate()}/${date.getUTCMonth()}/${date.getFullYear()} ${date.getHours()}:${date.getMinutes()}`);
+                                console.log(`New punctual message sent at ${date.getUTCDate()}/${date.getUTCMonth()}/${date.getUTCFullYear()} ${date.getUTCHours()}:${date.getUTCMinutes()}`);
                                 i++;
                             }).catch(e => {
                                 console.log(`Error sending message (probably admin rights) to channel : ${ponctualEvent.channel_id}`);
@@ -69,13 +85,11 @@ class Bot {
                 });
 
                 guildData.freq.forEach((freqEvent) => {
-                    const cronInstance = new Cron();
+                    const cronInstance = new Cron({timezone: guildData.timezone_code});
                     cronInstance.fromString(freqEvent.cron);
                     const scheduler = cronInstance.schedule();
                     const timestampToExec = Math.floor(scheduler.next().unix()/60);
-                    // console.log(`freq next  : ${timestampToExec}`);
-                    // console.log(`Actual : ${timestamp}`);
-        
+
                     if (timestampToExec == timestamp) {
                         try {
                             bot.channels.cache.get(freqEvent.channel_id).send(freqEvent.sys_content || freqEvent.message).then(message => {
@@ -108,7 +122,10 @@ class Bot {
 
         });
     }
-
+    /**
+     * Send stats to logs channel function
+     * @return {Promise}
+     */
     async sendStats() {
         const channel = bot.channels.cache.get(STAT_CHANNEL);
         const lengthServer = fs.readdirSync(__dirname+"/.."+process.env.DB_GUILDS).length;
@@ -119,6 +136,10 @@ class Bot {
         messageSent = 0;
     }
 
+    /**
+     * @param {string} guildId 
+     * @param {string} channelId 
+     */
     removeDeletedChannels(guildId, channelId) {
         console.log(`Removing channel : ${channelId} in guild : ${guildId}`);
         const data = JSON.parse(fs.readFileSync(__dirname + "/.." + process.env.DB_GUILDS + "/" + guildId + "/data.json",));
@@ -131,7 +152,11 @@ class Bot {
         fs.writeFileSync(__dirname + "/.." + process.env.DB_GUILDS + "/" + guildId + "/data.json", JSON.stringify(data));
     }
 
-    //Return channels collection or false
+    /**
+     * Get channels from a guild id
+     * @param {string} id
+     * @returns {Discord.Collection<string, Discord.GuildChannel>|boolean} Channels collection 
+     */
     getChannels(id) {
         if (!id) return;
         try {
@@ -142,6 +167,11 @@ class Bot {
             return false;
         }
     }
+    /**
+     * Get the information of a guild
+     * @param {string} id
+     * @returns {Discord.Guild|boolean} guildCollection 
+     */
     getGuild(id) {
         if (!id) return;
         try {
@@ -152,6 +182,11 @@ class Bot {
             return false;
         }
     }
+    /**
+     * Get people from a guild id 
+     * @param {string} id
+     * @returns {Discord.Collection<string, Discord.GuildMember>|boolean} GuildMember collection
+     */
     getPeople(id) {
         if (!id) return;
         try {
@@ -162,6 +197,21 @@ class Bot {
             return false;
         }
     }
+    /**
+     * Get roles from a guild id
+     * @param {string} id
+     * @returns {Discord.Collection<string, Discord.Role>}
+     */
+    getRoles(id) {
+        if (!id) return;
+        try {
+            const dataToSend = bot.guilds.cache.get(id).roles.cache;
+            return dataToSend;
+        } catch(e) {
+            console.log(e);
+            return false;
+        }
+    }
 }
 
 module.exports = Bot;