V.0.0.1.6 Release

V.0.0.1.6 Release

Author: RedTeaDev

Teapot.py

@@ -48,19 +48,19 @@
     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")
-    print("Error Code:" + str(req.status_code))
+    print("HTML 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 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...")
-    teapot.setup.__init__()
+    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 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,17 +101,18 @@ async def on_ready():
         for guild in bot.guilds:
             teapot.managers.database.create_guild_table(guild)
     elif teapot.config.storage_type() == "sqlite":
-        print("[!] SQLite storage has not been implemented yet. MySQL database is recommended")
+        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()))
+    await bot.change_presence(status=discord.Status.online, activity=discord.Game(teapot.config.bot_status())) # Update Bot status
 
 
 
 try:
     discord_time_start = time.perf_counter()
     bot.run(teapot.config.bot_token())
 except Exception as e:
-    print(f"[/!\\] Failed to connect to DiscordAPI. Please check your bot token!\n{e}")
+    print(f"[/!\\] Error: 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))
+    exit(9)

requirements.txt

@@ -5,7 +5,7 @@ beautifulsoup4==4.8.2
 bs4==0.0.1
 certifi==2019.11.28
 chardet==3.0.4
-discord.py==1.3.0
+discord.py==1.3.3
 idna==2.8
 lavalink==3.1.1
 multidict==4.7.4

teapot/cogs/cat.py

@@ -21,24 +21,30 @@ async def cat(self, ctx):
         """ Get a cat image """
         req = requests.get('https://api.thecatapi.com/v1/images/search')
         if req.status_code != 200:
+            await ctx.message.add_reaction(emoji='❌')
+            await ctx.send("API error, could not get a meow")
             print("Could not get a meow")
         catlink = json.loads(req.text)[0]
         rngcat = catlink["url"]
         em = dmbd.newembed()
         em.set_image(url=rngcat)
         await ctx.send(embed=em)
+        await ctx.message.add_reaction(emoji='✅')
 
     @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:
+            await ctx.message.add_reaction(emoji='❌')
+            await ctx.send("API error, could not get a woof")
             print("Could not get a woof")
         doglink = BeautifulSoup(req.text, 'html.parser')
         rngdog = 'http://random.dog/' + doglink.img['src']
         em = dmbd.newembed()
         em.set_image(url=rngdog)
         await ctx.send(embed=em)
+        await ctx.message.add_reaction(emoji='✅')
 
 
 def setup(bot):

teapot/cogs/cmds.py

@@ -72,7 +72,7 @@ async def help(ctx, *cog):
 def info(bot):
     @bot.command(aliases=['about'])
     async def info(ctx):
-        embed = discord.Embed(title="Developers: ColaIan, RedTea", description="Multi-purpose Discord Bot",
+        embed = discord.Embed(title="Developers: RedTea, 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")
@@ -102,6 +102,7 @@ def ping(bot):
     @bot.command()
     async def ping(ctx):
         await ctx.send(f'Pong! {round(bot.latency * 1000)} ms')
+        await ctx.message.add_reaction(emoji='✅')
 
 
 def prune(bot):
@@ -110,13 +111,18 @@ def prune(bot):
     async def prune(ctx, amount=0):
         if amount == 0:
             await ctx.send("Please specify the number of messages you want to delete!")
+            await ctx.message.add_reaction(emoji='❌')
+        elif amount <= 0:  # lower then 0
+            await ctx.send("The number must be bigger than 0!")
+            await ctx.message.add_reaction(emoji='❌')
         else:
+            await ctx.message.add_reaction(emoji='✅')
             await ctx.channel.purge(limit=amount + 1)
 
 
 def kick(bot):
     @bot.command()
-    @cmd.has_permissions(kick_members=True)
+    @cmd.has_permissions(kick_members=True) # check user permission
     async def kick(ctx, member: discord.Member, *, reason=None):
         try:
             await member.kick(reason=reason)

teapot/cogs/github.py

@@ -17,6 +17,7 @@ def __init__(self, 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:
@@ -50,9 +51,15 @@ async def github(self, ctx, arg):
 
             await ctx.send(embed=em)
         elif req.status_code == 404:
+            """if repository not found"""
             await ctx.send(embed=teapot.messages.notfound("repository"))
+        elif req.status_code == 503:
+            """GithubAPI down"""
+            await ctx.send("GithubAPI down")
+            await ctx.send(embed=teapot.messages.notfound("Fetch repository info"))
         else:
-            await ctx.send(embed=teapot.messages.error("repository"))
+            """some error occurred while fetching repository info"""
+            await ctx.send(embed=teapot.messages.error("Fetch repository info"))
 
 
 def setup(bot):

teapot/cogs/music.py

@@ -51,7 +51,7 @@ async def connect_to(self, guild_id: int, channel_id: str):
     @commands.command(aliases=['p'])
     async def play(self, ctx, *, query: str):
         """ Searches and plays a song from a given query. """
-        player = self.bot.lavalink.players.get(ctx.guild.id)
+        player = self.bot.lavalink.player_manager.get(ctx.guild.id)
 
         query = query.strip('<>')
 
@@ -87,7 +87,7 @@ async def play(self, ctx, *, query: str):
     @commands.command()
     async def seek(self, ctx, *, seconds: int):
         """ Seeks to a given position in a track. """
-        player = self.bot.lavalink.players.get(ctx.guild.id)
+        player = self.bot.lavalink.player_manager.get(ctx.guild.id)
 
         track_time = player.position + (seconds * 1000)
         await player.seek(track_time)
@@ -97,7 +97,7 @@ async def seek(self, ctx, *, seconds: int):
     @commands.command(aliases=['forceskip'])
     async def skip(self, ctx):
         """ Skips the current track. """
-        player = self.bot.lavalink.players.get(ctx.guild.id)
+        player = self.bot.lavalink.player_manager.get(ctx.guild.id)
 
         if not player.is_playing:
             return await ctx.send('Not playing.')
@@ -108,7 +108,7 @@ async def skip(self, ctx):
     @commands.command()
     async def stop(self, ctx):
         """ Stops the player and clears its queue. """
-        player = self.bot.lavalink.players.get(ctx.guild.id)
+        player = self.bot.lavalink.player_manager.get(ctx.guild.id)
 
         if not player.is_playing:
             return await ctx.send('Not playing.')
@@ -120,7 +120,7 @@ async def stop(self, ctx):
     @commands.command(aliases=['np', 'n', 'playing'])
     async def now(self, ctx):
         """ Shows some stats about the currently playing song. """
-        player = self.bot.lavalink.players.get(ctx.guild.id)
+        player = self.bot.lavalink.player_manager.get(ctx.guild.id)
 
         if not player.current:
             return await ctx.send('Nothing playing.')
@@ -139,7 +139,7 @@ async def now(self, ctx):
     @commands.command(aliases=['q'])
     async def queue(self, ctx, page: int = 1):
         """ Shows the player's queue. """
-        player = self.bot.lavalink.players.get(ctx.guild.id)
+        player = self.bot.lavalink.player_manager.get(ctx.guild.id)
 
         if not player.queue:
             return await ctx.send('Nothing queued.')
@@ -162,7 +162,7 @@ async def queue(self, ctx, page: int = 1):
     @commands.command(aliases=['resume'])
     async def pause(self, ctx):
         """ Pauses/Resumes the current track. """
-        player = self.bot.lavalink.players.get(ctx.guild.id)
+        player = self.bot.lavalink.player_manager.get(ctx.guild.id)
 
         if not player.is_playing:
             return await ctx.send('Not playing.')
@@ -177,7 +177,7 @@ async def pause(self, ctx):
     @commands.command(aliases=['vol'])
     async def volume(self, ctx, volume):
         """ Changes the player's volume (0-1000). """
-        player = self.bot.lavalink.players.get(ctx.guild.id)
+        player = self.bot.lavalink.player_manager.get(ctx.guild.id)
 
         try:
             volume = int(volume)
@@ -193,7 +193,7 @@ async def volume(self, ctx, volume):
     @commands.command()
     async def shuffle(self, ctx):
         """ Shuffles the player's queue. """
-        player = self.bot.lavalink.players.get(ctx.guild.id)
+        player = self.bot.lavalink.player_manager.get(ctx.guild.id)
         if not player.is_playing:
             return await ctx.send('Nothing playing.')
 
@@ -203,7 +203,7 @@ async def shuffle(self, ctx):
     @commands.command(aliases=['loop', 'l'])
     async def repeat(self, ctx):
         """ Repeats the current song until the command is invoked again. """
-        player = self.bot.lavalink.players.get(ctx.guild.id)
+        player = self.bot.lavalink.player_manager.get(ctx.guild.id)
 
         if not player.is_playing:
             return await ctx.send('Nothing playing.')
@@ -214,7 +214,7 @@ async def repeat(self, ctx):
     @commands.command()
     async def remove(self, ctx, index: int):
         """ Removes an item from the player's queue with the given index. """
-        player = self.bot.lavalink.players.get(ctx.guild.id)
+        player = self.bot.lavalink.player_manager.get(ctx.guild.id)
 
         if not player.queue:
             return await ctx.send('Nothing queued.')
@@ -229,7 +229,7 @@ async def remove(self, ctx, index: int):
     @commands.command()
     async def find(self, ctx, *, query):
         """ Lists the first 10 search results from a given query. """
-        player = self.bot.lavalink.players.get(ctx.guild.id)
+        player = self.bot.lavalink.player_manager.get(ctx.guild.id)
 
         if not query.startswith('ytsearch:') and not query.startswith('scsearch:'):
             query = 'ytsearch:' + query
@@ -253,7 +253,7 @@ async def find(self, ctx, *, query):
     @commands.command(aliases=['dc'])
     async def disconnect(self, ctx):
         """ Disconnects the player from the voice channel and clears its queue. """
-        player = self.bot.lavalink.players.get(ctx.guild.id)
+        player = self.bot.lavalink.player_manager.get(ctx.guild.id)
 
         if not player.is_connected:
             return await ctx.send('Not connected.')
@@ -268,9 +268,7 @@ async def disconnect(self, ctx):
 
     async def ensure_voice(self, ctx):
         """ This check ensures that the bot and command author are in the same voice channel. """
-        player = self.bot.lavalink.players.create(ctx.guild.id, endpoint=str(ctx.guild.region))
-        # Create returns a player if one exists, otherwise creates.
-
+        player = self.bot.lavalink.player_manager.create(ctx.guild.id, endpoint=str(ctx.guild.region))
         should_connect = ctx.command.name in ('play')  # Add commands that require joining voice to work.
 
         if not ctx.author.voice or not ctx.author.voice.channel:

teapot/cogs/osu.py

@@ -64,6 +64,7 @@ async def osu(self, ctx, *, args: str):
             type = "0"
         else:
             await ctx.send('Invalid Syntax!')
+            await ctx.message.add_reaction(emoji='❌')
             return
         cookiezi = '05b43eb66b2977d4f2c9148b00e3853688d515cf'
         r = requests.get('http://osu.ppy.sh/api/get_user?k=' + cookiezi + '&u=' + peppy + '&m=' + type)
@@ -72,6 +73,7 @@ async def osu(self, ctx, *, args: str):
             print('Unable to fetch osu statistics!')
             return
 
+        await ctx.message.add_reaction(emoji='✅')
         await ctx.send(embed=OsuPlayer(json.loads(r.text)[0]).display(ctx.message.author))
 
 

teapot/messages.py

@@ -2,12 +2,14 @@
 
 
 def WIP():
+    """Work In Progress"""
     return discord.Embed(title="⏲ This feature is work in progress!",
                          description="Please stay tuned to our latest updates [here]("
                                      "https://github.com/RedCokeDevelopment/Teapot.py)!", color=0x89CFF0)
 
 
 def PermissionDenied():
+    """user don't have permission"""
     return discord.Embed(title="🛑 Permission Denied!", description="You do not have permission to do this!",
                          color=0xFF0000)