update requirement and fix typo (#33)

* Update Teapot.py requirements

Signed-off-by: RedTeaDev <[email protected]>

* Updated typo and grammar issues in README.md

* fix some bug and added /tp debug

* Fixed typo, update requirements

Signed-off-by: RedTeaDev <[email protected]>

* update requirement

* make requirements use '>=', and use mysql-connector-python, since mysql-connector is Deprecated

Co-authored-by: ColaIan <[email protected]>

Author: RedTeaDev

README.md

@@ -14,13 +14,13 @@
     This project is currently in development!<br>
 </h2>
 <h4 align="center">
-    If you would  like to be notified when we commit, please watch this repository and join our Discord server.
+    If you would like to be notified when we commit, please watch this repository and join our Discord server.
 </h4>
 
 
 ## 👋 About
 
-Teapot.py is an open source Discord bot that aims to be as customisable as possible as well as providing essential tools for server administrators to run their Discord server!
+Teapot.py is an open-source Discord bot that aims to be as customizable as possible as well as providing essential tools for server administrators to run their Discord server!
 
 If you want to try it out by yourself, feel free to invite it to your Discord server by clicking [Here](https://discordapp.com/oauth2/authorize?client_id=669880564270104586&permissions=8&scope=bot)!
 
@@ -33,10 +33,10 @@ If you want to try it out by yourself, feel free to invite it to your Discord se
 
 ## 📖 Wiki
 
-Our wiki is currently work in progreses, please check back later!
+Our wiki is currently work in progress, please check back later!
 
 ## 🤝 Contributing
-Contributions, feedback and bug reports are welcome! Feel free to check out our [issues page](https://github.com/RedCokeDevelopment/Teapot.py/issues) to find out what you could do!
+Contributions, feedback, and bug reports are welcome! Feel free to check out our [issues page](https://github.com/RedCokeDevelopment/Teapot.py/issues) to find out what you could do!
 
 Before contributing, we recommend you say hi over in our [Discord server](https://discord.gg/7BRGs6F)! We can provide support with any issues you may have 🙂
 

Teapot.py

@@ -8,7 +8,7 @@
 from discord.ext import commands as dcmd
 from dotenv import load_dotenv
 
-import teapot
+import teapot  # import teapot.py core
 
 print(f"""
   _____                      _   
@@ -35,16 +35,16 @@
         if not versionlisted:
             print("You are currently using an unlisted version!\n")
 elif req.status_code == 404:
-  # 404 Not Found
+    # 404 Not Found
     print("Latest Teapot.py version not found!\n")
 elif req.status_code == 500:
-  # 500 Internal Server Error
+    # 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
+    # 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
+    # 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 Teapot.py version\n")
@@ -54,13 +54,13 @@
 
 if os.getenv('CONFIG_VERSION') != teapot.config_version():
     if os.path.isfile('.env'):
-        print("Missing environment variables. Please backup and delete .env, then run Teapot.py again.") 
+        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
+    print("Unable to find required environment variables. Running setup.py...")  # if .env not found
+    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)
@@ -101,10 +101,10 @@ async def on_ready():
         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 database 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
-
+    await bot.change_presence(status=discord.Status.online,
+                              activity=discord.Game(teapot.config.bot_status()))  # Update Bot status
 
 
 try:
@@ -115,4 +115,5 @@ async def on_ready():
     if teapot.config.storage_type() == "mysql":
         db.execute("INSERT INTO `bot_logs`(timestamp, type, class, message) VALUES(%s, %s, %s, %s)",
                    (teapot.time(), "ERROR", __name__, e))
-    exit(9)
+    time.sleep(5)
+    exit(1)

requirements.txt

@@ -1,18 +1,22 @@
-aiohttp==3.6.2
-async-timeout==3.0.1
-attrs==20.2.0
-beautifulsoup4==4.9.3
-bs4==0.0.1
-certifi==2020.6.20
-chardet==3.0.4
-discord.py==1.5.0
-idna==2.10
-lavalink==3.1.2
-multidict==4.7.6
-mysql-connector==2.2.9
-python-dotenv==0.14.0
-requests==2.24.0
-soupsieve==2.0.1
-urllib3==1.25.10
-websockets==8.1
-yarl==1.6.0
+
+aiohttp>=3.6.2
+async-timeout>=3.0.1
+attrs>=19.3.0
+beautifulsoup4>=4.9.1
+bs4>=0.0.1
+certifi>=2020.6.20
+chardet>=3.0.4
+discord.py>=1.4.0
+idna>=2.10
+lavalink>=3.1.2
+multidict>=4.7.6
+mysql-connector>=2.2.9
+psutil>=5.7.2
+python-dotenv>=0.14.0
+requests>=2.24.0
+soupsieve>=2.0.1
+typing-extensions>=3.7.4.2
+urllib3>=1.25.10
+websockets>=8.1
+yarl>=1.5.1
+mysql-connector-python>=8.0.21 

teapot/cogs/cmds.py

@@ -1,4 +1,6 @@
 import discord
+import time
+import psutil
 from discord.ext import commands as cmd
 
 import teapot
@@ -14,6 +16,7 @@ def __init__(bot):
     ban(bot)
     admin(bot)
     owner(bot)
+    debug(bot)
 
 
 def helpcmd(bot):
@@ -72,7 +75,7 @@ async def help(ctx, *cog):
 def info(bot):
     @bot.command(aliases=['about'])
     async def info(ctx):
-        embed = discord.Embed(title="Developers: RedTea, ColaIan", description="Multi-purpose Discord Bot",
+        embed = discord.Embed(title="Developers: RedTeaDev, ColaIan", description="Multi-purpose Discord Bot",
                               color=0x7400FF)
         embed.set_author(name=f"Teapot.py {teapot.version()}",
                          icon_url="https://cdn.discordapp.com/avatars/612634758744113182/7fe078b5ea6b43000dfb7964e3e4d21d.png?size=512")
@@ -122,7 +125,7 @@ async def prune(ctx, amount=0):
 
 def kick(bot):
     @bot.command()
-    @cmd.has_permissions(kick_members=True) # check user permission
+    @cmd.has_permissions(kick_members=True)  # check user permission
     async def kick(ctx, member: discord.Member, *, reason=None):
         try:
             await member.kick(reason=reason)
@@ -169,3 +172,34 @@ async def owner(ctx):
                     if role.name == "Teapot Owner":
                         await ctx.guild.get_member(teapot.config.bot_owner()).add_roles(role)
                         break
+
+
+def debug(bot):
+    @bot.command()
+    @cmd.has_permissions(administrator=True)
+    async def debug(ctx):
+        embed = discord.Embed(title="Developers: RedTea, ColaIan", description="Debug info:",
+                              color=0x7400FF)
+        embed.set_author(name=f"Teapot.py {teapot.version()}",
+                         icon_url="https://cdn.discordapp.com/avatars/612634758744113182/7fe078b5ea6b43000dfb7964e3e4d21d.png?size=512")
+        embed.set_thumbnail(url="https://avatars2.githubusercontent.com/u/60006969?s=200&v=4")
+        embed.add_field(name="Bot User:", value=bot.user, inline=True)
+        embed.add_field(name="System Time:", value=time.strftime("%a %b %d %H:%M:%S %Y", time.localtime()), inline=True)
+        embed.add_field(name="Memory",
+                        value=str(round(psutil.virtual_memory()[1] / 1024 / 1024 / 1024)) + "GB / " + str(round(
+                            psutil.virtual_memory()[0] / 1024 / 1024 / 1024)) + "GB", inline=True)
+        embed.add_field(name="O.S.:", value=str(teapot.platform()), inline=True)
+        embed.add_field(name="Storage Type:", value=teapot.config.storage_type(), inline=True)
+        embed.add_field(name="Prefix:", value=", ".join(teapot.config.bot_prefix()), inline=True)
+        embed.add_field(name="Github Repo:", value="[Teapot.py](https://github.com/RedCokeDevelopment/Teapot.py)",
+                        inline=True)
+        embed.add_field(name="Bug Report:", value="[Issues](https://github.com/RedCokeDevelopment/Teapot.py/issues)",
+                        inline=True)
+        embed.add_field(name="Website:", value="[Website](https://teapot.page)", inline=True)
+        embed.add_field(name="Links",
+                        value="[Support Discord](https://discord.gg/7BRGs6F) | [Add bot to server](https://discordapp.com/oauth2/authorize?client_id=669880564270104586&permissions=8&scope=bot) | [Repository](https://github.com/RedCokeDevelopment/Teapot.py)",
+                        inline=False)
+        embed.set_footer(text=f"{teapot.copyright()} | Code licensed under the MIT License")
+        # embed.set_image(url="https://user-images.githubusercontent.com/43201383/72987537-89830a80-3e25-11ea-95ef-ecfa0afcff7e.png")
+        await ctx.message.author.send(embed=embed)
+        await ctx.message.add_reaction(emoji='✅')

teapot/cogs/music.py

@@ -292,4 +292,4 @@ async def ensure_voice(self, ctx):
 
 def setup(bot):
     """ Initialize music module """
-    bot.add_cog(Music(bot))
+    bot.add_cog(Music(bot))