Fix #21

ArunaBot · Aug 11, 2020 · 235d250 · 235d250
1 parent 146dd8d
commit 235d250
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/languages b/languages
diff --git a/src/Events/message.js b/src/Events/message.js
@@ -19,7 +19,7 @@
 
 const Discord = require('discord.js');
 var { database, config, links } = require('../../Configs');
-const { utils, cooldown } = require('../Utils');
+const { cooldown, utils } = require('../Utils');
 
 exports.run = async (aruna, message) => {
   if (message.author.bot) return;
@@ -87,11 +87,12 @@ exports.run = async (aruna, message) => {
   const mention = [`<@${aruna.user.id}>`, `<@!${aruna.user.id}>`];
 
   mention.find(mention => {
-    if (!message.guild.members.get(aruna.user.id).hasPermission('USE_EXTERNAL_EMOJIS')) {
-      return message.reply(emojiError);
-    } else if (!message.guild.members.get(aruna.user.id).hasPermission('EMBED_LINKS')) {
-      return message.reply(linkError);
-    } else if (message.content === mention) {
+    if (message.content === mention) {
+      if (!message.guild.members.get(aruna.user.id).hasPermission('USE_EXTERNAL_EMOJIS')) {
+        return message.reply(emojiError);
+      } else if (!message.guild.members.get(aruna.user.id).hasPermission('EMBED_LINKS')) {
+        return message.reply(linkError);
+      }
       const embed = new Discord.RichEmbed()
         .setTitle(lang.message.mention.title)
         .setDescription(

diff --git a/src/Utils/index.js b/src/Utils/index.js
@@ -17,11 +17,11 @@
 */
 
 module.exports = {
-  utils: require('./utils.js'),
-  ranksystem: require('./rankSystem.js'),
-  emojis: require('./emojis.js'),
-  emoji: require('./emojis.js'),
   activeticket: require('./activeTicket.js'),
   cooldown: require('./cooldown.js'),
-  date: require('./date.js')
+  date: require('./date.js'),
+  emoji: require('./emojis.js'),
+  emojis: require('./emojis.js'),
+  ranksystem: require('./rankSystem.js'),
+  utils: require('./utils.js')
 };