From 394a62057a6eb0c7cb7850dea1dd96c757dd737d Mon Sep 17 00:00:00 2001
From: Mindiell <thomas.bouchet@sourismaline.fr>
Date: Tue, 5 Jul 2016 14:15:55 +0200
Subject: [PATCH] Fixed admin and help command which were taking only the ~ in
 account.

---
 wantzel.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/wantzel.py b/wantzel.py
index ed45e68..459fa8b 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))
-- 
GitLab