From b963fad7be63b145383b58e27879b2f5c87214ec Mon Sep 17 00:00:00 2001
From: phxntxm <danielman0@yahoo.com>
Date: Sun, 28 Apr 2019 14:34:59 -0500
Subject: [PATCH] Update to match new version of discord.py

---
 cogs/config.py   | 10 +++++-----
 cogs/images.py   |  4 ++--
 cogs/stats.py    |  6 ++++--
 requirements.txt |  2 +-
 utils/images.py  |  2 +-
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/cogs/config.py b/cogs/config.py
index 87824e8..3e06229 100644
--- a/cogs/config.py
+++ b/cogs/config.py
@@ -389,7 +389,7 @@ WHERE
     async def _handle_set_custom_battles(self, ctx, setting):
         try:
             setting.format(loser="player1", winner="player2")
-        except KeyError as e:
+        except (KeyError, ValueError) as e:
             raise MessageFormatError(e, ["loser", "winner"])
         else:
             query = """
@@ -406,7 +406,7 @@ WHERE
     async def _handle_set_custom_hugs(self, ctx, setting):
         try:
             setting.format(user="user")
-        except KeyError as e:
+        except (KeyError, ValueError)as e:
             raise MessageFormatError(e, ["user"])
         else:
             query = """
@@ -547,7 +547,7 @@ SET
 WHERE
     id=$2
 """
-        return await ctx.bot.db.execute(query, setting, ctx.guild.id)
+        return await ctx.bot.db.execute(query, int(setting), ctx.guild.id)
 
     async def _handle_remove_assignable_roles(self, ctx, setting=None):
         if setting is None:
@@ -583,7 +583,7 @@ SET
 WHERE
     id=$2
 """
-        return await ctx.bot.db.execute(query, setting, ctx.guild.id)
+        return await ctx.bot.db.execute(query, int(setting), ctx.guild.id)
 
     async def _handle_remove_custom_hugs(self, ctx, setting=None):
         if setting is None or not setting.isdigit():
@@ -599,7 +599,7 @@ SET
 WHERE
     id=$2
 """
-        return await ctx.bot.db.execute(query, setting, ctx.guild.id)
+        return await ctx.bot.db.execute(query, int(setting), ctx.guild.id)
 
     async def cog_after_invoke(self, ctx):
         """Here we will facilitate cleaning up settings, will remove channels/roles that no longer exist, etc."""
diff --git a/cogs/images.py b/cogs/images.py
index 7f531af..901e5d9 100644
--- a/cogs/images.py
+++ b/cogs/images.py
@@ -101,9 +101,9 @@ class Images(commands.Cog):
         if member is None:
             member = ctx.message.author
 
-        url = member.avatar_url
+        url = str(member.avatar_url)
         if '.gif' not in url:
-            url = member.avatar_url_as(format='png')
+            url = str(member.avatar_url_as(format='png'))
             filename = 'avatar.png'
         else:
             filename = 'avatar.gif'
diff --git a/cogs/stats.py b/cogs/stats.py
index 4e8af7f..e6ae15d 100644
--- a/cogs/stats.py
+++ b/cogs/stats.py
@@ -82,7 +82,7 @@ LIMIT 5
         embed = discord.Embed(title=server.name, description="Created on: {}".format(server.created_at.date()))
 
         # Make sure we only set the icon url if it has been set
-        if server.icon_url != "":
+        if server.icon_url:
             embed.set_thumbnail(url=server.icon_url)
 
         # Add our fields, these are self-explanatory
@@ -246,7 +246,7 @@ ORDER BY
 
         results = await ctx.bot.db.fetch(query, [m.id for m in ctx.guild.members])
 
-        if len(results) == 0:
+        if results is None or len(results) == 0:
             await ctx.send("No one has battled on this server!")
         else:
 
@@ -290,6 +290,8 @@ WHERE id = $2
         """
         member_list = [m.id for m in ctx.guild.members]
         result = await ctx.bot.db.fetchrow(query, member_list, member.id)
+        if result is None:
+            return await ctx.send("You have not battled!")
         server_rank = result["rank"]
         # overall_rank = "{}/{}".format(*ctx.bot.br.get_rank(member))
         rating = result["battle_rating"]
diff --git a/requirements.txt b/requirements.txt
index 5c44b65..ddfad10 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,4 +4,4 @@ pendulum
 beautifulsoup4
 osuapi
 asyncpg
--e git+https://github.com/Rapptz/discord.py@rewrite#egg=discord.py
\ No newline at end of file
+discord.py
\ No newline at end of file
diff --git a/utils/images.py b/utils/images.py
index 43cc7b2..82cd473 100644
--- a/utils/images.py
+++ b/utils/images.py
@@ -34,7 +34,7 @@ async def create_banner(member, image_title, data):
     offset = 125
 
     # Download the avatar
-    avatar = await utilities.download_image(member.avatar_url)
+    avatar = await utilities.download_image(str(member.avatar_url))
 
     # Parse the data we need to create our image
     username = (member.display_name[:23] + '...') if len(member.display_name) > 23 else member.display_name