Update main.js

main.js

@@ -1,7 +1,6 @@
 const Discord = require('discord.js');
 const client = new Discord.Client();
-var replyChannelId;
+
-var mentionedChannelId;
 var hugGifs =
         ["https://c.tenor.com/9e1aE_xBLCsAAAAC/anime-hug.gif",
          "https://c.tenor.com/Ct4bdr2ZGeAAAAAC/teria-wang-kishuku-gakkou-no-juliet.gif",
@@ -15,14 +14,12 @@ client.once('ready', () => {
     console.log('Running');
 });
 
-client.on('message', message => {
+client.on('message', gotMessage);
 
+
+function gotMessage(message){
     let msg = message.content.toLowerCase();
 
-    if(message.content.includes(":USureBoutThat:")){
-        message.channel.send("<:ugh:802988623271428117>");
-    }
-
     if(message.content.includes('https://media.discordapp.net')) {
         if(message.content.includes('webm') || message.content.includes('mov') ||
         message.content.includes('mp4')) {
@@ -31,13 +28,78 @@ client.on('message', message => {
         }
     }
 
-    var msgContent = message.content
+    let content = message.content.trim()
 
-    var msgContentSplit = msgContent.split(/[ ]+/);
+    var msgContentSplit = content.split(/[ ]+/);
 
     if(message.reference != null){
+        move(message, msgContentSplit)
+    }
 
-        if(msgContentSplit.length == 1 && message.mentions.channels.first() != undefined){
+    if (msgContentSplit[0] == "henlo") {
+        henlo(message)
+    }
+    else if (msgContentSplit[0] == "how ye") {
+        mood(message)
+    }
+    else if (msgContentSplit[0] == "tylko jedno") {
+        message.channel.send("Koksu pięć gram odlecieć sam");
+    }
+    if (msgContentSplit[0] == "hug") {
+        hug(message)
+    }
+}
+
+// Responses
+function henlo(message){
+    var emojis = ["🥰", "🐄", "🐮", "❤️", "👋", "🤠", "😊"];
+    let randomNum = RNG(emojis.length);
+    message.channel.send("Henlooo " + message.author.username + "   " + emojis[randomNum]);
+}
+
+function hug(message){
+    var mentionedUsers = message.mentions.users.values()
+    var mentionedUsersSize = message.mentions.users.size
+    var mentionedRoles = message.mentions.roles.values()
+    var mentionedRolesSize = message.mentions.roles.size
+    
+    let randomNum = RNG(hugGifs.length)
+    title = message.author.username + " hugs"
+    if (mentionedUsersSize > 0 || mentionedRolesSize > 0){
+        let allMentions = ""
+        for (let i = 0; i < mentionedUsersSize; i++) {
+            let user = mentionedUsers.next()
+            allMentions = allMentions + ", <@" + user.value.id + ">"
+        }
+        for (let i = 0; i < mentionedRolesSize; i++) {
+            let role = mentionedRoles.next()
+            allMentions = allMentions + ", <@&" + role.value.id + ">"
+        }
+        allMentions = allMentions.slice(2)
+        embed = createEmbed(title, hugGifs[randomNum], allMentions)
+        message.channel.send(embed)
+    }
+    else if (msg.includes("@here")){
+        embed = createEmbed(title, hugGifs[randomNum], "@here")
+        message.channel.send(embed)
+    }
+    else if (msg.includes("@everyone")){
+        embed = createEmbed(title, hugGifs[randomNum], "@everyone")
+        message.channel.send(embed)
+    }
+}
+
+function mood(message){
+    var responses = ["Not bad, how yee?", "MOOdy", "A bit sad 😢", "Good, how yee?", "I'm fine, how yee?"];
+    let randomNum = RNG(responses.length);
+    message.channel.send(responses[randomNum]);
+}
+
+function move(message, splits){
+    var replyChannelId;
+    var mentionedChannelId;
+
+    if(splits.length == 1 && message.mentions.channels.first() != undefined){
 
         var replyMessageId = message.reference.messageID;
 
@@ -71,59 +133,6 @@ client.on('message', message => {
     }
 }
 
-    if (msg.startsWith("henlo") && message.author.bot == false) {
-        var emojis = ["🥰", "🐄", "🐮", "❤️", "👋", "🤠", "😊"];
-        let randomNum = RNG(emojis.length);
-        message.channel.send("Henlooo " + message.author.username + "   " + emojis[randomNum]);
-    }
-    else if (msg.startsWith("how ye") && message.author.bot === false) {
-        var responses = ["Not bad, how yee?", "MOOdy", "A bit sad 😢", "Good, how yee?", "I'm fine, how yee?"];
-        let randomNum = RNG(responses.length);
-        message.channel.send(responses[randomNum]);
-    }
-    else if (msg.startsWith("tylko jedno")) {
-        message.channel.send("Koksu pięć gram odlecieć sam");
-    }
-    if (msg.startsWith("hug") && msgContentSplit.length < 3) {
-        var mentionedUsers = message.mentions.users.values()
-        var mentionedUsersSize = message.mentions.users.size
-        var mentionedRoles = message.mentions.roles.values()
-        var mentionedRolesSize = message.mentions.roles.size
-        
-        let randomNum = RNG(hugGifs.length)
-        title = message.author.username + " hugs"
-        if (mentionedUsersSize > 0 || mentionedRolesSize > 0){
-            let allMentions = ""
-            for (let i = 0; i < mentionedUsersSize; i++) {
-                let user = mentionedUsers.next()
-                allMentions = allMentions + ", <@" + user.value.id + ">"
-            }
-            for (let i = 0; i < mentionedRolesSize; i++) {
-                let role = mentionedRoles.next()
-                allMentions = allMentions + ", <@&" + role.value.id + ">"
-            }
-            allMentions = allMentions.slice(2)
-            embed = createEmbed(title, hugGifs[randomNum], allMentions)
-            message.channel.send(embed)
-        }
-        else if (msg.includes("@here")){
-            embed = createEmbed(title, hugGifs[randomNum], "@here")
-            message.channel.send(embed)
-        }
-        else if (msg.includes("@everyone")){
-            embed = createEmbed(title, hugGifs[randomNum], "@everyone")
-            message.channel.send(embed)
-        }
-        else if (msg.includes("all")){
-            embed = createEmbed(title, hugGifs[randomNum], "@here")
-            message.channel.send(embed)
-        }
-        else {
-            embed = new Discord.MessageEmbed().setImage(hugGifs[randomNum]).setColor(randomColor())
-            message.channel.send(embed)
-        }
-    }
-});
 
 function createEmbed(title, img, desc){
     embed = new Discord.MessageEmbed()
@@ -148,6 +157,7 @@ function RNG(max){
     return Math.floor(Math.random() * max)
 }
 
+client.login(process.env.TOKEN);
 
 // narodeniny?
 // vianoce, novy rok a tak
@@ -156,4 +166,3 @@ function RNG(max){
 // hug cez tenor
 // headpat cez tenor
 // .gif
-client.login(process.env.TOKEN)