Merge pull request #3 from MajorArkwolf/develop

Bug fixes.
MajorArkwolf · May 17, 2021 · be29d36 · be29d36
2 parents 5a94e76 + 1154bef
commit be29d36
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/agenda.py b/agenda.py
@@ -52,6 +52,17 @@ async def on_message(self, message):
                 else:
                     database.SetServer(message.guild.id, defaultRoom, prefix,
                                        message.guild.owner_id)
+
+        if message.content == (prefix + "help"):
+            var = 0
+            if command.VerifyRole(message.author.id, message.guild, 1):
+                var = 1
+            if command.VerifyRole(message.author.id, message.guild, 0):
+                var = 2
+            await helpmenu.HelpMenu(message, var)
+            await command.MessageCleanup(message)
+            return
+
 
         if message.content.startswith(prefix + "setchannel"):
             if command.VerifyRole(message.author.id, message.guild, 0):
@@ -140,12 +151,16 @@ async def on_message(self, message):
         if message.content.startswith(prefix + "addadmin"):
             if command.VerifyRole(message.author.id, message.guild, 0):
                 await command.AddAdmin(message)
-                return
+            else:
+                await command.ErrorPrivilege(message)
+            return
 
         if message.content.startswith(prefix + "removeadmin"):
             if command.VerifyRole(message.author.id, message.guild, 0):
-                await command.AddAdmin(message)
-                return
+                await command.RemoveAdmin(message)
+            else:
+                await command.ErrorPrivilege(message)
+            return
 
         if message.content == (prefix + "viewadmins"):
             if message.channel.name == defaultRoom:
@@ -165,16 +180,6 @@ async def on_message(self, message):
                 await command.ViewAgenda(message)
             return
 
-        if message.content == (prefix + "help"):
-            var = 0
-            if command.VerifyRole(message.author.id, message.guild, 1):
-                var = 1
-            if command.VerifyRole(message.author.id, message.guild, 0):
-                var = 2
-            await helpmenu.HelpMenu(message, var)
-            await command.MessageCleanup(message)
-            return
-
     async def on_guild_join(self, var):
         id_exists = database.GetServer(var.id)
         if id_exists is False:

diff --git a/agendacommands.py b/agendacommands.py
@@ -404,5 +404,7 @@ def VerifyRole(id, guild, level):
     elif id == admin2 or id == admin3:
         if level == 1:
             return True
+        else:
+            return False
     else:
         return False