Merge branch 'memoryLeaksFixes' into 'master'

Fixes for memory leaks

See merge request LoicBersier/DiscordBot!1

commands/admin/autoresponse.js

@@ -30,28 +30,33 @@ class autoresponseCommand extends Command {
         let text = args.text;
         let all = args.all;
 
-            let autoresponse = {}
+        let autoresponse = {};
-            let json = JSON.stringify(autoresponse)
+        let json = JSON.stringify(autoresponse);
 
         if (all == 'all') {
             const guild = this.client.guilds.get(message.guild.id);
 
             fs.readFile('./json/autoresponse.json', 'utf8', function readFileCallback(err, data) {
                 if (err) {
+                    fs.close();
                     console.log(err);
                 } else {
 
                     autoresponse = JSON.parse(data); //now it an object
-                    guild.channels.forEach(channel => autoresponse [channel] = text)
+                    guild.channels.forEach(channel => autoresponse[channel] = text);
                     json = JSON.stringify(autoresponse); //convert it back to json
-                    json = json.replace(/[<#>]/g, '')
+                    json = json.replace(/[<#>]/g, '');
                     fs.writeFile('./json/autoresponse.json', json, 'utf8', function (err) {
                         if (err) {
+                            fs.close();
                             return console.log(err);
                         }
-                })}});
+                    })
+                }
+            });
 
-            return message.channel.send('Auto response have been disable/enable on every channel')
+            fs.close();
+            return message.channel.send('Auto response have been disable/enable on every channel');
 
         } else if (text == 'disable' || 'enable') {
             fs.readFile('./json/autoresponse.json', 'utf8', function readFileCallback(err, data) {
@@ -59,14 +64,20 @@ class autoresponseCommand extends Command {
                     console.log(err);
                 } else {
                     autoresponse = JSON.parse(data); //now it an object
-                    autoresponse [message.channel.id] = text
+                    autoresponse[message.channel.id] = text;
                     json = JSON.stringify(autoresponse); //convert it back to json
                     fs.writeFile('./json/autoresponse.json', json, 'utf8', function (err) {
                         if (err) {
+                            fs.close();
                             return console.log(err);
                         }
-                })}})};
+                    })
+                }
+            })
+        };
 
+        fs.close();
         return message.channel.send(`Autoresponse have been ${text}d`);
-}}
+    }
+}
 module.exports = autoresponseCommand;

commands/admin/shameboard.js

@@ -25,6 +25,7 @@ class shameboardCommand extends Command {
                     if (err) {
                         console.log(err);
                     }
+                    fs.close();
                     return message.channel.send(`This channel have been set as the shameboard`);
                 })
             } else {
@@ -33,9 +34,13 @@ class shameboardCommand extends Command {
                 var json = JSON.stringify(shameboard); //convert it back to json
                 fs.writeFile(`./starboard/${message.guild.id}.json`, json, 'utf8', function (err) {
                     if (err) {
+                        fs.close();
                         return console.log(err);
                     }
-            })}});
+                })
+            }
+        });
+        fs.close();
         return message.channel.send(`This channel have been set as the shameboard`);
     }
 }

commands/admin/starboard.js

@@ -25,6 +25,7 @@ class StarBoardCommand extends Command {
                     if (err) {
                         console.log(err);
                     }
+                    fs.close();
                     return message.channel.send(`This channel have been set as the starboard`);
                 })
             } else {
@@ -33,9 +34,13 @@ class StarBoardCommand extends Command {
                 var json = JSON.stringify(starboard); //convert it back to json
                 fs.writeFile(`./starboard/${message.guild.id}.json`, json, 'utf8', function (err) {
                     if (err) {
+                        fs.close();
                         return console.log(err);
                     }
-            })}});
+                })
+            }
+        });
+        fs.close();
         return message.channel.send(`This channel have been set as the starboard`);
     }
 }

commands/admin/tag.js

@@ -32,19 +32,17 @@ class TagCommand extends Command {
 
         trigger = trigger.toLowerCase();
         do {
-                trigger = trigger.replace('--', ' ')
+            trigger = trigger.replace('--', ' ');
         } while (trigger.includes('--'))
 
-            let customresponse = {}
+        let customresponse = {};
-            let json = JSON.stringify(customresponse)
+        let json = JSON.stringify(customresponse);
-
-            
-
 
         fs.readFile(`./tag/${message.guild.id}.json`, 'utf8', function readFileCallback(err, data) {
             if (err) {
                 fs.writeFile(`./tag/${message.guild.id}.json`, `{"${trigger}":"${response}"}`, function (err) {
                     if (err) {
+                        fs.close();
                         console.log(err);
                     }
                 })
@@ -54,10 +52,14 @@ class TagCommand extends Command {
                 json = JSON.stringify(customresponse); //convert it back to json
                 fs.writeFile(`./tag/${message.guild.id}.json`, json, 'utf8', function (err) {
                     if (err) {
+                        fs.close();
                         return console.log(err);
                     }
-            })}});
+                })
+            }
+        });
 
+        fs.close();
         return message.channel.send(`autoresponse have been set to ${trigger} : ${response}`);
     }
 }

commands/admin/untag.js

@@ -40,10 +40,14 @@ class UnTagCommand extends Command {
                 json = JSON.stringify(customresponse); //convert it back to json
                 fs.writeFile(`./tag/${message.guild.id}.json`, json, 'utf8', function (err) {
                     if (err) {
+                        fs.close();
                         return console.log(err);
                     }
-        })}});
+                })
+            }
+        });
 
+        fs.close();
         return message.channel.send(`The following autoresponse have been deleted: ${trigger}`);
 
     }

commands/general/tts.js

@@ -38,20 +38,23 @@ class TtsCommand extends Command {
         // Performs the Text-to-Speech request
         gclient.synthesizeSpeech(request, (err, response) => {
             if (err) {
+                fs.close();
                 console.error('ERROR:', err);
                 return;
             }
 
             // Write the binary audio content to a local file
-                fs.writeFile('tts.mp3', response.audioContent, 'binary', err => {
+            await fs.writeFile('tts.mp3', response.audioContent, 'binary', err => {
                 if (err) {
                     console.error('ERROR:', err);
-                    message.channel.send('An error has occured, the message is probably too long')
+                    message.channel.send('An error has occured, the message is probably too long');
+                    fs.close();
                     return;
                 }
                 console.log('Audio content written to file: tts.mp3');
                 message.channel.send({ files: ['./tts.mp3'] })
             });
+            fs.close();
         });
     }
 }

commands/general/ttsvc.js

@@ -49,7 +49,8 @@ class TtsvcCommand extends Command {
             fs.writeFile('ttsvc.mp3', response.audioContent, 'binary', err => {
                 if (err) {
                     console.error('ERROR:', err);
-                message.channel.send('An error has occured, the message is probably too long')
+                    message.channel.send('An error has occured, the message is probably too long');
+                    fs.close();
                     return;
                 }
                 console.log('Audio content written to file: ttsvc.mp3');
@@ -58,12 +59,12 @@ class TtsvcCommand extends Command {
                 if (!voiceChannel) {
                     return message.reply('please join a voice channel first!');
 
-                          } else 
+                } else { // you should be careful in what is included in your scopes, you didn't use the {}
                     //  If user say "stop" make the bot leave voice channel
                     if (text == 'stop') {
                         voiceChannel.leave();
                         message.channel.send('I leaved the channel');
-                          } else
+                    } else { // you should be careful in what is included in your scopes, you didn't use the {}
                         voiceChannel.join().then(connection => {
                             const dispatcher = connection.playStream('./ttsvc.mp3');
                             //  End at then end of the audio stream
@@ -71,6 +72,8 @@ class TtsvcCommand extends Command {
                                 voiceChannel.leave();
                             }, 2000));
                         });
+                    }
+                }
             });
         });
     }

commands/images/idubbbz.js

@@ -30,8 +30,8 @@ class IdubbbzCommand extends Command {
             image = message.author.displayAvatarURL
         else if (Attachment[0] && Attachment[0].url.endsWith('gif'))
             return message.channel.send('Gif dosent work, sorry')
-        else if (!image)
+        else if (!image) { // you should be careful in what is included in your scopes, you didn't use the {}
-            image = Attachment[0].url
+            image = Attachment[0].url;
 
             message.channel.send('Processing <a:loadingmin:527579785212329984>')
                 .then(loadingmsg => loadingmsg.delete(2000))
@@ -51,6 +51,7 @@ class IdubbbzCommand extends Command {
                 // Return the result to use in the actual canvas
                 return ctx.font;
             };
+        }
 
         const ctx = canvas.getContext('2d')
         const background = await loadImage(image);

commands/images/idubbbzpaint.js

@@ -29,8 +29,8 @@ class IdubbbzPaintCommand extends Command {
             image = message.author.displayAvatarURL
         else if (Attachment[0] && Attachment[0].url.endsWith('gif'))
             return message.channel.send('Gif dosent work, sorry')
-        else if (!image)
+        else if (!image) { // // you should be careful in what is included in your scopes, you didn't use the {}
-            image = Attachment[0].url
+            image = Attachment[0].url;
 
             message.channel.send('Processing <a:loadingmin:527579785212329984>')
                 .then(loadingmsg => loadingmsg.delete(2000))
@@ -50,6 +50,7 @@ class IdubbbzPaintCommand extends Command {
                 // Return the result to use in the actual canvas
                 return ctx.font;
             };
+        }
 
         const ctx = canvas.getContext('2d')
         const background = await loadImage(image);

commands/images/like.js

@@ -24,11 +24,12 @@ class LikeCommand extends Command {
             image = message.author.displayAvatarURL
         else if (Attachment[0] && Attachment[0].url.endsWith('gif'))
             return message.channel.send('Gif dosent work, sorry')
-        else if (!image)
+        else if (!image) { // you should be careful in what is included in your scopes, you didn't use the {}
-            image = Attachment[0].url
+            image = Attachment[0].url;
 
             message.channel.send('Processing <a:loadingmin:527579785212329984>')
-            .then(loadingmsg => loadingmsg.delete(1000))
+                .then(loadingmsg => loadingmsg.delete(1000));
+        }
 
         const canvas = createCanvas(386, 399)
         const ctx = canvas.getContext('2d')

commands/images/ugly.js

@@ -24,11 +24,12 @@ class UglyCommand extends Command {
             image = message.author.displayAvatarURL
         else if (Attachment[0] && Attachment[0].url.endsWith('gif'))
             return message.channel.send('Gif dosent work, sorry')
-        else if (!image)
+        else if (!image) { // you should be careful in what is included in your scopes, you didn't use the {}
-            image = Attachment[0].url
+            image = Attachment[0].url;
 
             message.channel.send('Processing <a:loadingmin:527579785212329984>')
-            .then(loadingmsg => loadingmsg.delete(1000))
+                .then(loadingmsg => loadingmsg.delete(1000));
+        }
 
         const canvas = createCanvas(323, 400)
         const ctx = canvas.getContext('2d')

commands/utility/avatar.js

@@ -20,7 +20,7 @@ class AvatarCommand extends Command {
     }
 
     async exec(message, args) {
-        if (!args.user)
+        if (!args.user) // While these kind of statments work you really should use {}
             return message.channel.send(`Your avatar:\n${message.author.displayAvatarURL}`);
         else
             return message.channel.send(`${args.user.username}'s avatar:\n${args.user.displayAvatarURL}`);

commands/utility/download.js

@@ -31,21 +31,24 @@ class DownloadCommand extends Command {
             message.channel.send('Downloading <a:loadingmin:527579785212329984>').then(msg => {
                 video.on('end', function () {
                     msg.delete()
-                })
+                });
-              })
+            });
             let video = youtubedl(link, [`--username=${fbuser}`, `--password=${fbpasswd}`])
-            video.pipe(fs.createWriteStream('./video.mp4'))
+            video.pipe(fs.createWriteStream('./video.mp4'));
             video.on('error', function error(err) {
                 console.log('error 2:', err);
-                message.channel.send("An error has occured, i can't download from the link you provided.")
+                message.channel.send("An error has occured, I can't download from the link you provided.")
             });
             video.on('end', function () {
                 message.delete();
                 message.channel.send(`Downloaded by ${message.author.username}`, { files: ["./video.mp4"] })
-                .catch(() => message.channel.send('File too big'))
+                    .catch(() => message.channel.send('File too big'));
-            })
+                fs.close();
-        } else 
+            });
-            message.channel.send("You need to input a valid link")
+        } else {
+            fs.close();
+            message.channel.send("You need to input a valid link");
+        }
     }
 }
 

commands/utility/taglist.js

@@ -23,9 +23,13 @@ class taglistCommand extends Command {
             let count = Object.keys(customresponse).length
 
 
-                fs.readFile(`./tag/${message.guild.id}.json`, 'utf8', function readFileCallback(err, data){
+            await fs.readFile(`./tag/${message.guild.id}.json`, 'utf8', function readFileCallback(err, data) {
                 if (err) {
                     console.log(err);
+                    /* do you need it to end here on error? if so uncomment the following code:
+                    fs.close();
+                    return;
+                    */
                 }
                 let json = JSON.stringify(data)
                 json = json.replace(/[{}"\\]+/g, '')
@@ -38,8 +42,10 @@ class taglistCommand extends Command {
 
                 message.channel.send(tagEmbed);
             });
+            fs.close();
         } catch {
-            message.channel.send('An error has occured, do you have any tags on the server?')
+            fs.close();
+            message.channel.send('An error has occured, do you have any tags on the server?');
         }
     }
 }