Merge branch 'v.0.0.1.6' of https://github.com/RedCokeDevelopment/Teapot.py into v0.0.1.5

Author: RedTeaDev

README.md

@@ -1,7 +1,7 @@
 ![banner](https://user-images.githubusercontent.com/43201383/72987537-89830a80-3e25-11ea-95ef-ecfa0afcff7e.png)
 
 <p align="center">
-    <a href="https://github.com/RedCokeDevelopment/Teapot.py/blob/dev/LICENSE"><img src="https://img.shields.io/github/license/redcokedevelopment/teapot.py.svg?style=flat-square" alt="GitHub License"></a>
+    <a href="https://github.com/RedCokeDevelopment/Teapot.py/blob/master/LICENSE"><img src="https://img.shields.io/github/license/redcokedevelopment/teapot.py.svg?style=flat-square" alt="GitHub License"></a>
     <a href="https://github.com/RedCokeDevelopment/Teapot.py/issues"><img src="https://img.shields.io/github/issues/redcokedevelopment/teapot.py.svg?color=purple&style=flat-square" alt="GitHub Issues"></a>
     <a href="https://github.com/RedCokeDevelopment/Teapot.py/pulls"><img src="https://img.shields.io/github/issues-pr/redcokedevelopment/teapot.py.svg?color=purple&style=flat-square" alt="GitHub Pull Requests"></a>
     <a href="https://github.com/RedCokeDevelopment/Teapot.py/stargazers"><img src="https://img.shields.io/github/stars/redcokedevelopment/teapot.py.svg?style=flat-square" alt="GitHub Stars"></a>
@@ -50,10 +50,10 @@ 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
 The projects listed in below have provided inspiration, and we thought we'd mention them:
 
-- LavaLink: https://github.com/Frederikam/Lavalink
+- LavaLink: https://github.com/Frederikam/Lavalink

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/cogs/music.py

@@ -175,10 +175,15 @@ async def pause(self, ctx):
             await ctx.send('⏯ | Paused')
 
     @commands.command(aliases=['vol'])
-    async def volume(self, ctx, volume: int = None):
+    async def volume(self, ctx, volume):
         """ Changes the player's volume (0-1000). """
         player = self.bot.lavalink.players.get(ctx.guild.id)
 
+        try:
+            volume = int(volume)
+        except:
+            volume = int(volume[:-1])
+
         if not volume:
             return await ctx.send(f'🔈 | {player.volume}%')
 

teapot/events.py

@@ -1,5 +1,6 @@
 import json
 import teapot
+import discord
 
 
 def __init__(bot):
@@ -53,7 +54,6 @@ async def on_guild_join(ctx):
 def message_send(bot):
     @bot.event
     async def on_message(message):
-        guild = message.guild
         if teapot.config.storage_type() == "mysql":
             try:
                 database = teapot.database.__init__()
@@ -78,6 +78,43 @@ async def on_message(message):
                 print(e)
         await bot.process_commands(message)
 
+    @bot.event
+    async def on_message(message):
+        # SAO Easter Egg
+        punctuations = '!()-[]{};:\'"\\,<>./?@#$%^&*_~'
+        # remove punctuation from the string
+        msg = ""
+        for char in message.content.lower():
+            if char not in punctuations:
+                msg = msg + char
+
+        if msg.startswith("system call "):
+            content = msg[12:].split(" ")
+            if content[0].lower() == "inspect":
+                if content[1].lower() == "entire":
+                    if content[2].lower() == "command":
+                        if content[3].lower() == "list":
+                            em = discord.Embed(title=f"🍢 SAO Command List", color=0x7400FF)
+                            em.set_thumbnail(
+                                url="https://cdn.discordapp.com/attachments/668816286784159763/674285661510959105/Kirito-Sao-Logo-1506655414__76221.1550241566.png")
+                            em.add_field(name='Commands',
+                                         value="generate xx element\ngenerate xx element xx shape\ninspect entire command list")
+
+                            em.set_footer(text=f"{teapot.copyright()} | Code licensed under the MIT License")
+                            await message.channel.send(embed=em)
+            elif content[0].lower() == "generate":
+                if content[-1].lower() == "element":
+                    em = discord.Embed(title=f"✏ Generated {content[1].lower()} element!",
+                                       color=0xFF0000)
+                    await message.channel.send(embed=em)
+                if content[-1].lower() == "shape":
+                    if content[2].lower() == "element":
+                        em = discord.Embed(
+                            title=f"✏ Generated {content[-2].lower()} shaped {content[1].lower()} element!",
+                            color=0xFF0000)
+                        await message.channel.send(embed=em)
+        await bot.process_commands(message)
+
 
 def message_edit(bot):
     @bot.event