CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-07 19:58:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

[Alias, CC] Check presence of messages' prefix before anything else (#462)

Browse Source 
Less expensive
This commit is contained in:
Caleb Johnson 2016-11-10 18:27:26 -06:00 committed by Twentysix
parent b5be746783
commit 495762254e
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cogs/alias.py
View File

@ -108,10 +108,7 @@ class Alias:
await self.bot.say("There are no aliases on this server.") await self.bot.say("There are no aliases on this server.")
async def check_aliases(self, message): async def check_aliases(self, message):
if not user_allowed(message): if message.author == self.bot.user or \
return
if message.author.id == self.bot.user.id or \
len(message.content) < 2 or message.channel.is_private: len(message.content) < 2 or message.channel.is_private:
return return
@ -119,7 +116,10 @@ class Alias:
server = message.server server = message.server
prefix = self.get_prefix(msg) prefix = self.get_prefix(msg)
if prefix and server.id in self.aliases: if not prefix:
return
if server.id in self.aliases and user_allowed(message):
alias = self.first_word(msg[len(prefix):]).lower() alias = self.first_word(msg[len(prefix):]).lower()
if alias in self.aliases[server.id]: if alias in self.aliases[server.id]:
new_command = self.aliases[server.id][alias] new_command = self.aliases[server.id][alias]

11
cogs/customcom.py
View File

@ -106,17 +106,18 @@ class CustomCommands:
await self.bot.say("There are no custom commands in this server. Use addcom [command] [text]") await self.bot.say("There are no custom commands in this server. Use addcom [command] [text]")
async def checkCC(self, message): async def checkCC(self, message):
if message.author.id == self.bot.user.id or len(message.content) < 2 or message.channel.is_private: if message.author == self.bot.user or\
return len(message.content) < 2 or message.channel.is_private:
if not user_allowed(message):
return return
msg = message.content msg = message.content
server = message.server server = message.server
prefix = self.get_prefix(msg) prefix = self.get_prefix(msg)
if prefix and server.id in self.c_commands.keys(): if not prefix:
return
if server.id in self.c_commands and user_allowed(message):
cmdlist = self.c_commands[server.id] cmdlist = self.c_commands[server.id]
cmd = msg[len(prefix):] cmd = msg[len(prefix):]
if cmd in cmdlist.keys(): if cmd in cmdlist.keys():