CodeMirror/Bonfire
1
0
Fork 0
mirror of synced 2024-06-03 11:14:33 +12:00
Code Issues Releases Wiki Activity

Update Converters to match current version

Browse source
This commit is contained in:
Phxntxm 2017-05-11 18:23:47 -05:00
parent aef72178a8
commit e3e2a312d0
3 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cogs/admin.py
View file

@ -54,16 +54,14 @@ class Administration:
key = str(ctx.message.guild.id) key = str(ctx.message.guild.id)
converter = commands.converter.MemberConverter() converter = commands.converter.MemberConverter()
converter.prepare(ctx, member_or_channel)
member = None member = None
channel = None channel = None
try: try:
member = converter.convert() member = await converter.convert(ctx, member_or_channel)
except commands.converter.BadArgument: except commands.converter.BadArgument:
converter = commands.converter.TextChannelConverter() converter = commands.converter.TextChannelConverter()
converter.prepare(ctx, member_or_channel)
try: try:
channel = converter.convert() channel = await converter.convert(ctx, member_or_channel)
except commands.converter.BadArgument: except commands.converter.BadArgument:
await ctx.send("{} does not appear to be a member or channel!".format(member_or_channel)) await ctx.send("{} does not appear to be a member or channel!".format(member_or_channel))
return return
@ -105,16 +103,14 @@ class Administration:
key = str(ctx.message.guild.id) key = str(ctx.message.guild.id)
converter = commands.converter.MemberConverter() converter = commands.converter.MemberConverter()
converter.prepare(ctx, member_or_channel)
member = None member = None
channel = None channel = None
try: try:
member = converter.convert() member = await converter.convert(ctx, member_or_channel)
except commands.converter.BadArgument: except commands.converter.BadArgument:
converter = commands.converter.TextChannelConverter() converter = commands.converter.TextChannelConverter()
converter.prepare(ctx, member_or_channel)
try: try:
channel = converter.convert() channel = await converter.convert(ctx, member_or_channel)
except commands.converter.BadArgument: except commands.converter.BadArgument:
await ctx.send("{} does not appear to be a member or channel!".format(member_or_channel)) await ctx.send("{} does not appear to be a member or channel!".format(member_or_channel))
return return

3
cogs/mod.py
View file

@ -75,9 +75,8 @@ class Moderation:
else: else:
# If no ID was provided, lets try to convert what was given using the internal coverter # If no ID was provided, lets try to convert what was given using the internal coverter
converter = commands.converter.MemberConverter() converter = commands.converter.MemberConverter()
converter.prepare(ctx, member)
try: try:
member = converter.convert() member = await converter.convert(ctx, member)
except commands.converter.BadArgument: except commands.converter.BadArgument:
await ctx.send( await ctx.send(
'{} does not appear to be a valid member. If this member is not in this server, please provide ' '{} does not appear to be a valid member. If this member is not in this server, please provide '

3
cogs/osu.py
View file

@ -134,9 +134,8 @@ class Osu:
limit = 5 limit = 5
except: except:
converter = commands.converter.MemberConverter() converter = commands.converter.MemberConverter()
converter.prepare(ctx, piece)
try: try:
member = converter.convert() member = await converter.convert(ctx, piece)
except commands.converter.BadArgument: except commands.converter.BadArgument:
pass pass