Merge pull request #9 from RedCokeDevelopment/dev

@ColaIan messed up

Author: ColaIan

README.md

@@ -50,7 +50,7 @@ There are two owners for this project. They all contribute massively to the runn
 ## 📜 Requirements
 These are the requirements for the bot, and they will be bundled in future releases.
 
-- [Python 3.7](https://www.python.org/downloads/release/python-376/) (Required packages listed in requirements.txt)
+- [Python 3.8](https://www.python.org/downloads/release/python-382/) (Required packages listed in requirements.txt)
 - [LavaLink Server](https://github.com/Frederikam/Lavalink) (Java 11 required)
 
 ## 💛 Credits

Teapot.py

@@ -35,16 +35,27 @@
         if not versionlisted:
             print("You are currently using an unlisted version!\n")
 elif req.status_code == 404:
-    print("Unable to fetch the latest Teapot.py version from GitHub!\n")
+  # 404 Not Found
+    print("Latest Teapot.py version not found!\n")
+elif req.status_code == 500:
+  # 500 Internal Server Error
+    print("An error occurred while fetching the latest Teapot.py version. [500 Internal Server Error]\n")
+elif req.status_code == 502:
+  # 502 Bad Gateway
+    print("An error occurred while fetching the latest Teapot.py version. [502 Bad Gateway]\n")
+elif req.status_code == 503:
+  # 503 Service Unavailable
+    print("An error occurred while fetching the latest Teapot.py version. [503 Service Unavailable]\n")
 else:
-    print("An unknown error has occurred when fetching the latest version of Teapot.py\n")
+    print("An unknown error has occurred when fetching the latest Teapot.py version\n")
+    print("Error Code:" + str(req.status_code))
 
 load_dotenv(join(dirname(__file__), '.env'))
 
 if os.getenv('CONFIG_VERSION') != teapot.config_version():
     if os.path.isfile('.env'):
-        print("Missing environment variables. Please delete .env and run Teapot.py again.")
-        quit()
+        print("Missing environment variables. Please backup and delete .env, then run Teapot.py again.")
+        quit(2)
     print("Unable to find required environment variables. Running setup.py...")
     teapot.setup.__init__()
 

teapot/__init__.py

@@ -12,7 +12,7 @@ def version():
 
 
 def config_version():
-    return "0.1"
+    return "0.1"  # do not edit this!
 
 
 def time():

teapot/cogs/cmds.py

@@ -95,6 +95,7 @@ async def info(ctx):
         embed.set_image(
             url="https://user-images.githubusercontent.com/43201383/72987537-89830a80-3e25-11ea-95ef-ecfa0afcff7e.png")
         await ctx.send(embed=embed)
+        await ctx.message.add_reaction(emoji='✅')
 
 
 def ping(bot):
@@ -120,24 +121,26 @@ async def kick(ctx, member: discord.Member, *, reason=None):
         try:
             await member.kick(reason=reason)
             await ctx.send(f'{member} has been kicked!')
-            print(f'{member} has been kicked!')
+            await ctx.message.add_reaction(emoji='✅')
         except Exception as failkick:
-            await ctx.send("Failed to ban:" + str(failkick))
+            await ctx.send("Failed to kick: " + str(failkick))
+            await ctx.message.add_reaction(emoji='❌')
 
 
 def ban(bot):
     @bot.command()
-    @cmd.has_permissions(ban_members=True)
+    @cmd.has_permissions(ban_members=True)  # check user permission
     async def ban(ctx, member: discord.Member, *, reason=None):
         try:
             await member.ban(reason=reason)
             await ctx.send(f'{member} has been banned!')
-            print(f'{member} has been banned!')
+            await ctx.message.add_reaction(emoji='✅')
         except Exception as e:
-            await ctx.send("Failed to ban:" + e)
+            await ctx.send("Failed to ban: " + str(e))
+            await ctx.message.add_reaction(emoji='❌')
 
 
-def admin(bot):
+def admin(bot):  # WIP...
     @bot.command()
     async def admin(ctx):
         await ctx.send(embed=teapot.messages.WIP())