app.py

@@ -19,9 +19,12 @@ async def on_ready():
 @client.event
 async def on_message(message):
     # Only allow chats in DM or whitelisted channels
+    # TODO: FIX
     if not (isinstance(message.channel, discord.channel.DMChannel)) and not (message.channel.id in config['bot']['channels']):
+        print(isinstance(message.channel, discord.channel.DMChannel))
+        print(message.channel.id)
         return
-
+    # print(message.channel.name)
     # Handle own messages
     if message.author == client.user:
         return
@@ -38,6 +41,11 @@ async def on_message(message):
         await message.channel.send(f"{message.author.mention} 👋")
         return
 
+    # if message.content == f"{client.user.mention} version":
+    #    logger.info(f"Version by {message.author.name}")
+    #    await message.channel.send(f"{message.author.mention} ")
+    #    return
+
     # Handle @Bot mention
     messagearray = message.content.split()
     if messagearray[0] == client.user.mention:
@@ -45,57 +53,39 @@ async def on_message(message):
     else:
         return
 
-    command = messagearray[0].lower()
-
-    # message starts with "help"
-    if command == "help":
+    if messagearray[0] == "help":
         logger.info(f"Help by {message.author.name}")
         await message.channel.send(BuildHelpList())
         return
-
-    # message starts with "list" or "info"
-    if command in ["list", "info"]:
-        logger.info(f"{command} by {message.author.name}")
+    if messagearray[0] in ["list", "info"]:
+        logger.info(f"{messagearray[0]} by {message.author.name}")
         await message.channel.send(BuildGameList())
         return
 
-    if command in ["start", "stop", "restart"]:
-        if len(messagearray) != 2:
-            logger.error(
-                f"{command} with invalid numer of arguments by {message.author.name}. Command: \"{message.content}\"")
-            await message.add_reaction("❌")
-            await message.channel.send(f"Invalid number of arguments")
-            return
+    if messagearray[0] in ["start", "stop", "restart"] and len(messagearray) >= 2:
         game = GetGameByGameSlug(messagearray[1])
         if not game:
             logger.error(
-                f"{command} for invalid Game \"{messagearray[1]}\" by {message.author.name}")
+                f"{messagearray[0]} for invalid Game \"{messagearray[1]}\" by {message.author.name}")
             await message.add_reaction("❌")
             await message.channel.send(f"Invalid game: {messagearray[1]}")
             return
         logger.info(
-            f"{command} by {message.author.name}, Game: {messagearray[1]}")
-        success = HandleSystemdService(game, command)
+            f"{messagearray[0]} by {message.author.name}, Game: {messagearray[1]}")
+        success = HandleSystemdService(game, messagearray[0])
 
         # :white_check_mark: :x:
         if success:
             logger.info(
-                f"{command} by {message.author.name}, Game: {messagearray[1]} was SUCESSFUL")
+                f"{messagearray[0]} by {message.author.name}, Game: {messagearray[1]} was SUCESSFUL")
             await message.add_reaction("✅")
-            await message.channel.send(f"Successfully started {game['displayname']}! Happy gaming! 🎮")
         else:
             logger.error(
-                f"{command} by {message.author.name}, Game: {messagearray[1]} FAILED!")
+                f"{messagearray[0]} by {message.author.name}, Game: {messagearray[1]} FAILED!")
             await message.add_reaction("❌")
             await message.channel.send(f"Sorry {message.author.mention}, that didn't work. Ping @lauralani")
 
-    if command == "status":
-        if len(messagearray) != 2:
-            logger.error(
-                f"Status with invalid numer of arguments by {message.author.name}. Command: \"{message.content}\"")
-            await message.add_reaction("❌")
-            await message.channel.send(f"Invalid number of arguments")
-            return
+    if messagearray[0] == "status":
         status = BuildSingleGameStatus(messagearray[1])
         if not status:
             logger.error(

config.example.py

@@ -1,26 +0,0 @@
-config = {
-    "bot": {
-
-        "token": "aslkjdasjldjsaldjasl",
-        "channels": [
-            12873281371823821328193,  # laura lol, bot-test
-            21302918421093801832  # LiLa Network Clubhaus, game-control
-        ],
-        "whitelist": [
-            "username"
-        ]
-
-    },
-    "games": [
-        {
-            "displayname": "Minecraft Vanilla Server",
-            "slug": "mc-v",
-            "systemd": "minecraft-vanilla01.service"
-        },
-        {
-            "displayname": "Minecraft AllTheMods 8",
-            "slug": "mc-atm8",
-            "systemd": "minecraft-allthemods8.service"
-        }
-    ]
-}