diff --git a/discord-bot-core/.gitrepo b/discord-bot-core/.gitrepo index 4e26430..6008774 100644 --- a/discord-bot-core/.gitrepo +++ b/discord-bot-core/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = git@github.com:benji7425/discord-bot-core.git branch = master - commit = 1ed6225c00b084bc9ca144db472e34095c36b00d - parent = b76eed0aa4f27c057f5f26e735417363a05b6af9 + commit = 8efb033b8f7f421677f7ddb1aa3cc7801202bd54 + parent = ba6caa6be5cd775f794246736e1395ed7fa9f979 method = merge cmdver = 0.3.1 diff --git a/discord-bot-core/Client.js b/discord-bot-core/Client.js index d4f1803..da8b2e2 100644 --- a/discord-bot-core/Client.js +++ b/discord-bot-core/Client.js @@ -42,7 +42,7 @@ module.exports = class Client extends Discord.Client { } onReady() { - this.user.setGame(InternalConfig.website.replace("http://", "")); + this.user.setGame(InternalConfig.website.replace(/^https?:\/\//, "")); CoreUtil.dateLog(`Registered bot ${this.user.username}`); } diff --git a/discord-bot-core/HandleMessage.js b/discord-bot-core/HandleMessage.js index 70fe31a..2b36987 100644 --- a/discord-bot-core/HandleMessage.js +++ b/discord-bot-core/HandleMessage.js @@ -5,7 +5,8 @@ const InternalConfig = require("./internal-config.json"); /**@param param*/ function handleMessage(client, message, commands, guildData) { - if (!message.content.startsWith(message.guild.me.toString())) //criteria for a command is the bot being tagged + if (!message.content.startsWith(message.guild.me.toString()) //criteria for a command is the bot being tagged + && !message.content.startsWith(message.guild.me.toString().replace("!", ""))) //hacky fix for android mentions not including an exclamation mark return; const botName = "@" + (message.guild.me.nickname || message.guild.me.user.username),