diff --git a/wantzel.py b/wantzel.py index ed45e685d72b5f969b8fa43999852e26e925657b..459fa8bbfb572fc675d1e68c3984d6552bdc5549 100644 --- a/wantzel.py +++ b/wantzel.py @@ -290,12 +290,12 @@ class Wantzel(object): def help(self, user, channel, msg): """ Show global help. - If a known command is behind the ~help command, an adequate message is + If a known command is behind the ~!help command, an adequate message is returned. """ Utils.debug("help command") # Searching for a command after help keyword - command = re.search("~help (help|rp|status|stats|kill|admin)", msg) + command = re.search("[!~]help (help|rp|status|stats|kill|admin)", msg) if command: command = command.group(1) self.send_message(user, messages["help_"+command]) @@ -451,11 +451,11 @@ class Wantzel(object): def admin(self, user, channel, msg): """ Manage moderation. - A sub-command should be behind the ~admin command. + A sub-command should be behind the !~admin command. """ Utils.debug("admin command") # Searching for a command after admin keyword - command = re.search("~admin (list|add|del|timer)", msg) + command = re.search("[~!]admin (list|add|del|timer)", msg) if command: command = command.group(1) if command == "list": @@ -490,7 +490,7 @@ class Wantzel(object): try: names = [] connection = sqlite3.connect(config.sqlite_db) - result = re.search("~admin add (([^,]+, ?)+)?(.*)", msg) + result = re.search("[!~]admin add (([^,]+, ?)+)?(.*)", msg) if result.group(1): names = [name.strip() for name in result.group(1).split(",") if name.strip() != ""] names.append(result.group(3)) @@ -520,7 +520,7 @@ class Wantzel(object): if is_moderator(user): try: names = [] - result = re.search("~admin del (([^,]+, ?)+)?(.*)", msg) + result = re.search("[!~]admin del (([^,]+, ?)+)?(.*)", msg) if result.group(1): names = [name.strip() for name in result.group(1).split(",") if name.strip() != ""] names.append(result.group(3))