v1.11.11

constants.py

@@ -1,5 +1,5 @@
 import os
-from logging import exception
+import logging
 from sys import exit
 
 
@@ -9,7 +9,7 @@ def get_tokens():
         with open(".env", "r") as f:
             tokens = f.readlines()
     except Exception:
-        exception("Could not acquire environment variables. Stopping.")
+        logging.exception("Could not acquire environment variables. Stopping.")
         exit(1)
     return tokens
 
@@ -21,4 +21,4 @@ def get_tokens():
 DISCORD_TOKEN = TOKENS[0].lstrip("TOKEN").strip()[1:]
 TWIT_API_KEY = TOKENS[1].lstrip("API_KEY").strip()[1:]
 TWIT_API_SECRET = TOKENS[2].lstrip("API_SECRET").strip()[1:]
-VERSION = "v1.11.7"
+VERSION = "v1.11.11"

main.py

@@ -55,7 +55,6 @@ async def on_message(message):
         message.content.find("sairasta") != -1
         or message.content.find("ei oo normaalii") != -1
     ):
-        print("sairasta")
         msg = "https://cdn.discordapp.com/attachments/693166291468681227/823282434203189258/eioonormaalii.gif"
         await message.channel.send(msg)
         return
@@ -106,19 +105,10 @@ async def on_message(message):
         await vote.vote(message)
     elif cmd == "pop":
         await pop.pop(message)
-    # elif cmd == "test":
-    #     await nitro.test(message)
     elif cmd == "mood":
         await message.channel.send("https://cdn.discordapp.com/attachments/816694548457324544/830847194142605403/hui_saakeli_tata_elamaa.mp4")
     elif cmd == "nitro":
-        try:
-            arg2 = message.content.split(" ")[2]
-            if arg2.strip() in ["start", "stop", "notice"]:
-                await nitro.Tracking(message)
-            else:
-                await message.channel.send("What was that?")
-        except IndexError:
-            await message.channel.send("Unknown argument. Use '!c nitro help' for correct syntax.")
+        await nitro.nitroJunction(message)
 
     else:
         await message.channel.send("What was that?")

modules/commands.py

@@ -11,10 +11,11 @@ async def cmds(message):
 inspire
 insult [user]
 f (alias: F)
-choose [option1 | option2 | ...]
+choose option1 | option2 | ... 
 vacc [Area code (or empty for all areas) | help]
 poll [new|end|help]
 vote help
+vote [Poll ID] [option:votes], [option:votes], ...
 pop [number between 1-14]
 
 Admin commands:
@@ -23,6 +24,7 @@ async def cmds(message):
 poll [set|del]roles
 poll roles
 poll new -r
+nitro [add|del|start|stop|notice]
 """
     emb = discord.Embed(
         title="List of available commands:",