Merge branch 'master' into dev

# Conflicts:
#	Teapot.py
#	requirements.txt

Author: ColaIan

Teapot.py

@@ -8,7 +8,7 @@
 from discord.ext import commands as dcmd
 from dotenv import load_dotenv
 
-import teapot  # import teapot.py core
+import teapot
 
 print(f"""
   _____                      _   
@@ -57,10 +57,10 @@
         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...")  # if .env not found
-    teapot.setup.__init__()  # run setup.py
+    teapot.setup.__init__() # run setup.py
 
 print("Initializing bot...")
-if teapot.config.storage_type() == "mysql":  # if .env use mysql, create the table if table not exists
+if teapot.config.storage_type() == "mysql": # if .env use mysql, create the table if table not exists
     time_start = time.perf_counter()
     database = teapot.managers.database.__init__()
     db = teapot.managers.database.db(database)
@@ -96,12 +96,13 @@ async def on_ready():
     teapot.cogs.osu.setup(bot)
     teapot.cogs.github.setup(bot)
     teapot.cogs.cat.setup(bot)
+    teapot.cogs.eightball.setup(bot)
     teapot.cogs.neko.setup(bot)
     if teapot.config.storage_type() == "mysql":
         for guild in bot.guilds:
             teapot.managers.database.create_guild_table(guild)
     elif teapot.config.storage_type() == "sqlite":
-        print("[!] Warning: SQLite storage has not been implemented yet. MySQL database is recommended")  # WIP
+        print("[!] Warning: SQLite storage has not been implemented yet. MySQL is recommended")  # WIP
     print(f"Registered commands and events in {round(time.perf_counter() - time_start, 2)}s")
     await bot.change_presence(status=discord.Status.online,
                               activity=discord.Game(teapot.config.bot_status()))  # Update Bot status

requirements.txt

@@ -1,4 +1,3 @@
-
 aiohttp>=3.6.2
 async-timeout>=3.0.1
 attrs>=19.3.0
@@ -19,4 +18,4 @@ typing-extensions>=3.7.4.2
 urllib3>=1.25.10
 websockets>=8.1
 yarl>=1.5.1
-mysql-connector-python>=8.0.21 
+mysql-connector-python>=8.0.21

teapot/__init__.py

@@ -8,7 +8,7 @@
 
 
 def version():
-    return "v0.0.1.6"
+    return "v0.0.1.7"
 
 
 def config_version():

teapot/cogs/__init__.py

@@ -1,5 +1,6 @@
 from .cat import *
 from .cmds import *
+from .eightball import *
 from .github import *
 from .music import *
 from .neko import *

teapot/cogs/eightball.py

@@ -0,0 +1,38 @@
+""" Module for generating random neko pictures"""
+import io
+import json
+
+import aiohttp
+import discord
+import requests
+from discord.ext import commands
+
+import teapot
+import teapot.tools.embed as dmbd
+
+
+class EightBall(commands.Cog):
+    """8 Ball"""
+
+    def __init__(self, bot):
+        """ Initialize 8ball class"""
+        self.bot = bot
+
+    def eightball_api(self, ctx):
+        try:
+            req = requests.get(f'https://nekos.life/api/v2/8ball/{x}')
+            if req.status_code != 200:
+                print("Could not get a response")
+            apijson = json.loads(req.text)
+            em = dmbd.newembed().set_image(url=apijson["url"])
+            return em
+        except:
+            return teapot.messages.error(f"obtaining 8ball image ({req.status_code})")
+
+    @commands.command(pass_context=True)
+    async def eightball(self, ctx):
+        await ctx.send(embed=self.eightball_api(ctx))
+
+def setup(bot):
+    """ Setup Eight Ball Module"""
+    bot.add_cog(EightBall(bot))