Update to match new version of discord.py
This commit is contained in:
parent
326ec78004
commit
b963fad7be
|
@ -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."""
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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"]
|
||||
|
|
|
@ -4,4 +4,4 @@ pendulum
|
|||
beautifulsoup4
|
||||
osuapi
|
||||
asyncpg
|
||||
-e git+https://github.com/Rapptz/discord.py@rewrite#egg=discord.py
|
||||
discord.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
|
||||
|
|
Loading…
Reference in New Issue