Merge pull request #1 from RedCokeDevelopment/0.0.1.4

0.0.1.4 Update

Author: ColaIan

README.md

@@ -21,13 +21,13 @@
 
 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!
 
-If you want to try it out by yourself, feel free to invite it to your Discord server by clicking [Here](https://discordapp.com/api/oauth2/authorize?client_id=669880564270104586&permissions=0&scope=bot)!
+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)!
 
 ## ⌨ Planned Features
 - Music Player
 - Moderation Tools
 - Localization
-- Storage Type Support
+- Fun Commands
 
 
 ## 📖 Wiki

Teapot.py

@@ -1,22 +1,44 @@
 import os
 import time
 from os.path import join, dirname
+import json
+import requests
 
 import discord
 from discord.ext import commands as dcmd
 from dotenv import load_dotenv
 
 import teapot
 
-print("""
+print(f"""
   _____                      _   
  |_   _|__  __ _ _ __   ___ | |_ 
-   | |/ _ \/ _` | '_ \ / _ \| __|
+   | |/ _ \\/ _` | '_ \\ / _ \\| __|
    | |  __/ (_| | |_) | (_) | |_ 
-   |_|\___|\__,_| .__/ \___/ \__|
+   |_|\\___|\\__,_| .__/ \\___/ \\__|
     by ColaIan |_| & RedTea
+
+Running Teapot.py {teapot.version()}
 """)
 
+req = requests.get(f'https://api.github.com/repos/RedCokeDevelopment/Teapot.py/tags')
+response = json.loads(req.text)
+if req.status_code == 200:
+    if response[0]['name'] == teapot.version():
+        print("You are currently running the latest version of Teapot.py!\n")
+    else:
+        versionlisted = False
+        for x in response:
+            if x['name'] == teapot.version():
+                versionlisted = True
+                print("You are not using our latest version! :(\n")
+        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")
+else:
+    print("An unknown error has occurred when fetching the latest version of Teapot.py\n")
+
 load_dotenv(join(dirname(__file__), '.env'))
 
 if os.getenv('CONFIG_VERSION') != teapot.config_version():
@@ -31,10 +53,24 @@
     time_start = time.perf_counter()
     database = teapot.managers.database.__init__()
     db = teapot.managers.database.db(database)
-    db.execute('CREATE TABLE IF NOT EXISTS `guilds` (`guild_id` BIGINT, `guild_name` TINYTEXT)')
-    db.execute('CREATE TABLE IF NOT EXISTS `channels` (`channel_id` BIGINT, `channel_name` TINYTEXT)')
-    db.execute("CREATE TABLE IF NOT EXISTS `users` (`user_id` BIGINT, `user_name` TINYTEXT, `user_discriminator` INT)")
-    print(f"Connected to database ({teapot.config.db_host()}) in {round(time.perf_counter() - time_start, 2)}s")
+    db.execute('ALTER DATABASE teapot CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci')
+    db.execute(
+        'CREATE TABLE IF NOT EXISTS `guilds` (`guild_id` BIGINT, `guild_name` TINYTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci')
+    db.execute(
+        'CREATE TABLE IF NOT EXISTS `channels` (`channel_id` BIGINT, `channel_name` TINYTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci')
+    db.execute(
+        "CREATE TABLE IF NOT EXISTS `users` (`user_id` BIGINT, `user_name` TINYTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci, `user_discriminator` INT) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci")
+    db.execute(
+        "CREATE TABLE IF NOT EXISTS `bot_logs` (`timestamp` TEXT, `type` TINYTEXT, `class` TINYTEXT, `message` MEDIUMTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci")
+    teapot.managers.database.create_table(
+        "CREATE TABLE IF NOT EXISTS `guild_logs` (`timestamp` TEXT, `guild_id` BIGINT, `channel_id` BIGINT, `message_id` BIGINT, `user_id` BIGINT, `action_type` TINYTEXT, `message` MEDIUMTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci")
+
+    print(
+        f"Connected to database ({teapot.config.db_host()}:{teapot.config.db_port()}) in {round(time.perf_counter() - time_start, 2)}s")
+
+    db.execute("INSERT INTO `bot_logs`(timestamp, type, class, message) VALUES(%s, %s, %s, %s)",
+               (teapot.time(), "BOT_START", __name__, "Initialized bot"))
+    database.commit()
 
 bot = dcmd.Bot(command_prefix=teapot.config.bot_prefix())
 
@@ -53,41 +89,18 @@ async def on_ready():
     if teapot.config.storage_type() == "mysql":
         for guild in bot.guilds:
             teapot.managers.database.create_guild_table(guild)
-    elif teapot.config.storage_type() == "flatfile":
-        print("[!] Flatfile storage has not been implemented yet. MySQL database is recommended")
+    elif teapot.config.storage_type() == "sqlite":
+        print("[!] SQLite storage has not been implemented yet. MySQL database is recommended")
     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()))
 
 
-@bot.event
-async def on_message(message):
-    guild = message.guild
-    if teapot.config.storage_type() == "mysql":
-        try:
-            db.execute("SELECT * FROM `users` WHERE user_id = '" + str(message.author.id) + "'")
-            if db.rowcount == 0:
-                db.execute("INSERT INTO `users`(user_id, user_name, user_discriminator) VALUES(%s, %s, %s)",
-                           (message.author.id, message.author.name, message.author.discriminator.zfill(4)))
-                database.commit()
-
-            db.execute("SELECT * FROM `channels` WHERE channel_id = '" + str(message.channel.id) + "'")
-            if db.rowcount == 0:
-                db.execute("INSERT INTO `channels`(channel_id, channel_name) VALUES(%s, %s)",
-                           (message.channel.id, message.channel.name))
-                database.commit()
-            db.execute("INSERT INTO `" + str(
-                guild.id) + "_logs" + "`(timestamp, guild_id, channel_id, message_id, user_id, action_type, message) VALUES(%s, %s, %s, %s, %s, %s, %s)",
-                       (teapot.time(), message.guild.id, message.channel.id, message.id, message.author.id,
-                        "MESSAGE_SEND", message.content))
-            database.commit()
-        except Exception as e:
-            print(e)
-    await bot.process_commands(message)
-
 
 try:
     discord_time_start = time.perf_counter()
     bot.run(teapot.config.bot_token())
 except Exception as e:
-    print(e)
-    print("[/!\] Failed to connect to DiscordAPI. Please check your bot token!")
+    print(f"[/!\\] Failed to connect to DiscordAPI. Please check your bot token!\n{e}")
+    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))

requirements.txt

@@ -1,11 +1,11 @@
-aiohttp==3.5.4
+aiohttp==3.6.2
 async-timeout==3.0.1
 attrs==19.3.0
 beautifulsoup4==4.8.2
 bs4==0.0.1
 certifi==2019.11.28
 chardet==3.0.4
-discord.py==1.2.5
+discord.py==1.3.0
 idna==2.8
 lavalink==3.0.0
 multidict==4.7.4

teapot/__init__.py

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

teapot/cogs/cat.py

@@ -9,7 +9,7 @@
 
 
 class Cat(commands.Cog):
-    """ Cat Module"""
+    """ Cat and dog command"""
 
     def __init__(self, bot):
         """ Initialize Cat Class"""
@@ -18,7 +18,7 @@ def __init__(self, bot):
 
     @commands.command(pass_context=True, aliases=['meow'])
     async def cat(self, ctx):
-        """ When User Types ~meow, return a cat link """
+        """ Get a cat image """
         req = requests.get('https://api.thecatapi.com/v1/images/search')
         if req.status_code != 200:
             print("Could not get a meow")
@@ -30,6 +30,7 @@ async def cat(self, ctx):
 
     @commands.command(pass_context=True, aliases=['woof'])
     async def dog(self, ctx):
+        """ Get a dog image """
         req = requests.get('http://random.dog/')
         if req.status_code != 200:
             print("Could not get a woof")

teapot/cogs/cmds.py

@@ -9,7 +9,7 @@ def __init__(bot):
     helpcmd(bot)
     info(bot)
     ping(bot)
-    purge(bot)
+    prune(bot)
     kick(bot)
     ban(bot)
     admin(bot)
@@ -19,35 +19,61 @@ def helpcmd(bot):
     bot.remove_command('help')
 
     @bot.command(aliases=['?'])
-    async def help(ctx):
-        embed = discord.Embed(title="Command List", description="List of commands that you can use",
-                              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="General", value="``help``, ``info``", inline=False)
-        embed.add_field(name="Music",
-                        value="``play``, ``pause``, ``resume``, ``stop``, ``repeat``, ``seek``, ``skip``, ``remove``, ``now``, ``queue``, ``volume``, ``shuffle``, ``find``, ``disconnect``",
-                        inline=False)
-        embed.add_field(name="Tools", value="``github``, ``osu``", inline=False)
-        embed.add_field(name="Fun", value="``cat``, ``dog``, ``neko``, ``hentai [NSFW]``", inline=False)
-        embed.add_field(name="Staff", value="``purge``, ``ping``, ``kick``, ``ban``", inline=False)
-        embed.add_field(name="Links",
-                        value="[Support Discord](https://discord.gg/7BRGs6F) | [Add bot to server](https://discordapp.com/api/oauth2/authorize?client_id=669880564270104586&permissions=0&scope=bot) | [Repository](https://github.com/RedCokeDevelopment/Teapot.py)",
-                        inline=False)
-
-        embed.set_image(
-            url="https://user-images.githubusercontent.com/43201383/72987537-89830a80-3e25-11ea-95ef-ecfa0afcff7e.png")
-        embed.set_footer(text=f"{teapot.copyright()} | Code licensed under the MIT License")
-        await ctx.send(embed=embed)
+    async def help(ctx, *cog):
+        if not cog:
+            embed = discord.Embed(description="📖 Help", color=0x7400FF,
+                                  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")
+            cogs_desc = ""
+            for x in bot.cogs:
+                cogs_desc += f'**{x}** - {bot.cogs[x].__doc__}\n'
+            embed.add_field(name='Modules', value=cogs_desc[0:len(cogs_desc) - 1])
+            embed.set_footer(text=f"{teapot.copyright()} | Code licensed under the MIT License")
+            await ctx.send(embed=embed)
+            await ctx.message.add_reaction(emoji='✅')
+        else:
+            if len(cog) > 1:
+                await ctx.send(embed=teapot.messages.toomanyarguments())
+                await ctx.message.add_reaction(emoji='🛑')
+            else:
+                found = False
+                for x in bot.cogs:
+                    for y in cog:
+                        if x == y:
+                            embed = discord.Embed(color=0x7400FF)
+                            cog_info = ''
+                            for c in bot.get_cog(y).get_commands():
+                                if not c.hidden:
+                                    cog_info += f"**{c.name}** - {c.help}\n"
+                            embed.add_field(name=f"{cog[0]} Module", value=cog_info)
+                            await ctx.send(embed=embed)
+                            await ctx.message.add_reaction(emoji='✅')
+                            found = True
+                if not found:
+                    for x in bot.cogs:
+                        for c in bot.get_cog(x).get_commands():
+                            if c.name.lower() == cog[0].lower():
+                                embed = discord.Embed(title=f"Command: {c.name.lower().capitalize()}",
+                                                      description=f"**Description:** {c.help}\n**Syntax:** {c.qualified_name} {c.signature}",
+                                                      color=0x7400FF)
+                                embed.set_author(name=f"Teapot.py {teapot.version()}",
+                                                 icon_url="https://cdn.discordapp.com/avatars/612634758744113182/7fe078b5ea6b43000dfb7964e3e4d21d.png?size=512")
+                                await ctx.message.add_reaction(emoji='✅')
+                                found = True
+                    if not found:
+                        embed = teapot.messages.notfound("Module")
+                        await ctx.message.add_reaction(emoji='🛑')
+                    await ctx.send(embed=embed)
+                else:
+                    await ctx.message.add_reaction(emoji='✅')
 
 
 def info(bot):
     @bot.command(aliases=['about'])
     async def info(ctx):
         embed = discord.Embed(title="Developers: ColaIan, RedTea", description="Multi-purpose Discord Bot",
                               color=0x7400FF)
-        embed.set_author(name=f"Teapot.py | {teapot.version()}",
+        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)
@@ -61,6 +87,9 @@ async def info(ctx):
         embed.add_field(name="Bug Report:", value="[Issues](https://github.com/RedCokeDevelopment/Teapot.py/issues)",
                         inline=True)
         embed.add_field(name="Discussion:", value="[Forums](https://forum.redtea.red)", 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")
@@ -73,10 +102,10 @@ async def ping(ctx):
         await ctx.send(f'Pong! {round(bot.latency * 1000)} ms')
 
 
-def purge(bot):
-    @bot.command(aliases=['clear', 'cls'])
+def prune(bot):
+    @bot.command(aliases=['purge', 'clear', 'cls'])
     @cmd.has_permissions(kick_members=True)
-    async def purge(ctx, amount=0):
+    async def prune(ctx, amount=0):
         if amount == 0:
             await ctx.send("Please specify the number of messages you want to delete!")
         else:

teapot/cogs/github.py

@@ -9,12 +9,14 @@
 
 
 class GitHub(commands.Cog):
+    """Get repository info"""
 
     def __init__(self, bot):
         self.bot = bot
 
     @commands.command(pass_context=True, aliases=['gh'])
     async def github(self, ctx, arg):
+        """Fetch repository info"""
         req = requests.get(f'https://api.github.com/repos/{arg}')
         apijson = json.loads(req.text)
         if req.status_code == 200:
@@ -48,9 +50,9 @@ async def github(self, ctx, arg):
 
             await ctx.send(embed=em)
         elif req.status_code == 404:
-            ctx.send(embed=teapot.messages.notfound("repository"))
+            await ctx.send(embed=teapot.messages.notfound("repository"))
         else:
-            ctx.send(embed=teapot.messages.error("repository"))
+            await ctx.send(embed=teapot.messages.error("repository"))
 
 
 def setup(bot):

teapot/cogs/music.py

@@ -11,6 +11,8 @@
 
 
 class Music(commands.Cog):
+    """Music Time"""
+
     def __init__(self, bot):
         self.bot = bot
 

teapot/cogs/neko.py

@@ -1,4 +1,4 @@
-""" Module for generating a random cat picture"""
+""" Module for generating random neko pictures"""
 import io
 import json
 
@@ -12,10 +12,10 @@
 
 
 class Neko(commands.Cog):
-    """ Cat Module"""
+    """Neko!!! :3"""
 
     def __init__(self, bot):
-        """ Initialize Cat Class"""
+        """ Initialize neko class"""
 
         self.bot = bot
 
@@ -51,10 +51,6 @@ async def wallpaper(self, ctx):
     async def tickle(self, ctx):
         await ctx.send(embed=self.neko_api(ctx, "tickle"))
 
-    @commands.command(pass_context=True)
-    async def ngif(self, ctx):
-        await ctx.send(embed=self.neko_api(ctx, "ngif"))
-
     @commands.command(pass_context=True)
     async def poke(self, ctx):
         await ctx.send(embed=self.neko_api(ctx, "poke"))
@@ -90,7 +86,7 @@ async def gox_girl(self, ctx):
     @commands.command(pass_context=True)
     async def hentai(self, ctx, type=""):
         if ctx.message.channel.nsfw:
-            api_types = ['femdom', 'classic', 'erofeet', 'erok', 'les',
+            api_types = ['femdom', 'classic', 'ngif', 'erofeet', 'erok', 'les',
                          'hololewd', 'lewdk', 'keta', 'feetg', 'nsfw_neko_gif', 'eroyuri',
                          'tits', 'pussy_jpg', 'cum_jpg', 'pussy', 'lewdkemo', 'lewd', 'cum', 'spank',
                          'smallboobs', 'Random_hentai_gif', 'nsfw_avatar', 'hug', 'gecg', 'boobs', 'pat',