Merge branch 'beta'

4 files changed, 14 insertions, 8 deletions

diff --git a/bot_discord.js b/bot_discord.js
index 314553d..fab5d7c 100644
--- a/bot_discord.js
+++ b/bot_discord.js
@@ -232,7 +232,7 @@ client.on('message', (msg) => {
   if (msg.mentions != null && msg.mentions.users != null) {

     if (msg.mentions.users.has("282547024547545109")){

             if (msg.content.toLowerCase().includes("hello") || (msg.content.toLowerCase().includes("hi"))) {

-                msg.reply("Hi there.");

+                msg.reply(`Hello ${msg.author.username}!`);

         } else {

             if (msg.content.toLowerCase().includes("shut") && msg.content.toLowerCase().includes("up")) {

             switch (Math.floor(Math.random() * 1000) % 3) {

@@ -247,11 +247,17 @@ client.on('message', (msg) => {
                   break;

             }

           } else if (msg.content.toLowerCase().includes("how") && msg.content.toLowerCase().includes("are") && msg.content.toLowerCase().includes("you")) {

-            msg.reply("I'm doing OK, I suppose...")

+            msg.reply("I'm doing OK, I suppose...");

+          } else if (msg.content.toLowerCase().includes("ok") && msg.content.toLowerCase().includes("google")) {

+            msg.reply("Erm... I am not google, if you want to use Google here's the link: https://www.google.com");

+          } else if (msg.content.toLowerCase().includes("f") && msg.content.toLowerCase().includes("off")) {

+            msg.reply("Do you want a hammer? :hammer:");

+          } else if (msg.content.toLowerCase().includes("aleearmy")) {

+            msg.reply("Oh yeah.. that thing Alee made...");

           }

       }

     }

-}

+  };

 

 

   let prefixes = JSON.parse(fs.readFileSync("./storage/prefixes.json", "utf8"));

diff --git a/commands/help.js b/commands/help.js
index 318e5e2..4b19a57 100644
--- a/commands/help.js
+++ b/commands/help.js
@@ -38,13 +38,13 @@ module.exports.run = async (client, message) => {
   }

 

   let prefix = prefixes[message.guild.id].prefixes

-

+  if (!message.guild.member(client.user).hasPermission('EMBED_LINKS')) return message.reply('ERROR: AleeBot doesn\'t have the permission to send embed links please enable them to use the full help.');

   const embed = new Discord.RichEmbed()

     .setAuthor('AleeBot ' + require('../storage/settings.json').abVersion + ` Help and on ${client.guilds.size} servers`, client.user.avatarURL)

     .setDescription('Every command you input into AleeBot is `' + prefix + '`')

     .setColor('#1fd619')

     .setFooter('AleeCorp Copyright 2018, Licensed with GPL-3.0');

-

+  

   categories.forEach(function(x) {

     let cat = '';

     commands.forEach(function(command) {

diff --git a/commands/invite.js b/commands/invite.js
index 58e62dc..8d9ddf1 100644
--- a/commands/invite.js
+++ b/commands/invite.js
@@ -28,8 +28,8 @@ module.exports.run = async (client, message) => {
         value: "[Invite AleeBot to your server.](https://discordapp.com/api/oauth2/authorize?client_id=282547024547545109&permissions=2080375863&scope=bot)"
       },
       {
-        name: "Join AleeCorp Network",
-        value: "[If there's any bugs you can join ACN guild.](https://discord.gg/EFhRDqG)"
+        name: "Join AleeCorp Community",
+        value: "[If there's any bugs you can join ACC guild and explain the bug...](https://discord.gg/EFhRDqG)"
       }
     ],
   }
diff --git a/storage/settings.json b/storage/settings.json
index 7fda66f..865f4af 100644
--- a/storage/settings.json
+++ b/storage/settings.json
@@ -1,4 +1,4 @@
 {
-  "abVersion": "2.11.0",
+  "abVersion": "2.11.1",
   "prefix": "ab:"
 }