mirror of
https://github.com/NohamR/TransmissionBot.git
synced 2025-05-24 14:22:00 +00:00
bigfix
fix reference to confirmation message in `t/modify` when the message was never made.
This commit is contained in:
parent
a60f87e2de
commit
00a05a21c9
16
bot.py
16
bot.py
@ -1182,6 +1182,7 @@ async def modify(context, *, content=""):
|
|||||||
cmdName = cmdNames[str(reaction.emoji)]
|
cmdName = cmdNames[str(reaction.emoji)]
|
||||||
|
|
||||||
doContinue = True
|
doContinue = True
|
||||||
|
msg2 = None
|
||||||
if "remove" in cmds[str(reaction.emoji)]:
|
if "remove" in cmds[str(reaction.emoji)]:
|
||||||
embed=discord.Embed(title="Are you sure you wish to remove{} {} transfer{}?".format(' and DELETE' if 'delete' in cmds[str(reaction.emoji)] else '', len(torrents), '' if len(torrents)==1 else 's'),description="**This action is irreversible!**",color=0xb51a00)
|
embed=discord.Embed(title="Are you sure you wish to remove{} {} transfer{}?".format(' and DELETE' if 'delete' in cmds[str(reaction.emoji)] else '', len(torrents), '' if len(torrents)==1 else 's'),description="**This action is irreversible!**",color=0xb51a00)
|
||||||
embed.set_footer(text="react ✅ to continue or ❌ to cancel")
|
embed.set_footer(text="react ✅ to continue or ❌ to cancel")
|
||||||
@ -1218,12 +1219,14 @@ async def modify(context, *, content=""):
|
|||||||
opEmoji = {i:j for i,j in zip(ops,opEmoji)}
|
opEmoji = {i:j for i,j in zip(ops,opEmoji)}
|
||||||
await context.message.channel.send("{} Transfer{} {}".format(str(reaction.emoji),'s' if allOnly or len(torrents) > 1 else '', ops[cmd]))
|
await context.message.channel.send("{} Transfer{} {}".format(str(reaction.emoji),'s' if allOnly or len(torrents) > 1 else '', ops[cmd]))
|
||||||
await msg.clear_reactions()
|
await msg.clear_reactions()
|
||||||
await msg2.clear_reactions()
|
if msg2 is not None:
|
||||||
|
await msg2.clear_reactions()
|
||||||
return
|
return
|
||||||
else:
|
else:
|
||||||
await context.message.channel.send("❌ Cancelled!")
|
await context.message.channel.send("❌ Cancelled!")
|
||||||
await msg.clear_reactions()
|
await msg.clear_reactions()
|
||||||
await msg2.clear_reactions()
|
if msg2 is not None:
|
||||||
|
await msg2.clear_reactions()
|
||||||
return
|
return
|
||||||
|
|
||||||
def check(reaction, user):
|
def check(reaction, user):
|
||||||
@ -1243,7 +1246,8 @@ async def modify(context, *, content=""):
|
|||||||
cmdNames = {i:j for i,j in zip(opEmoji,opNames)}
|
cmdNames = {i:j for i,j in zip(opEmoji,opNames)}
|
||||||
cmd = cmds[str(reaction.emoji)]
|
cmd = cmds[str(reaction.emoji)]
|
||||||
cmdName = cmdNames[str(reaction.emoji)]
|
cmdName = cmdNames[str(reaction.emoji)]
|
||||||
|
|
||||||
|
msg2 = None
|
||||||
doContinue = True
|
doContinue = True
|
||||||
if "remove" in cmds[str(reaction.emoji)]:
|
if "remove" in cmds[str(reaction.emoji)]:
|
||||||
embed=discord.Embed(title="Are you sure you wish to remove{} {} transfer{}?".format(' and DELETE' if 'delete' in cmds[str(reaction.emoji)] else '', len(torrents), '' if len(torrents)==1 else 's'),description="**This action is irreversible!**",color=0xb51a00)
|
embed=discord.Embed(title="Are you sure you wish to remove{} {} transfer{}?".format(' and DELETE' if 'delete' in cmds[str(reaction.emoji)] else '', len(torrents), '' if len(torrents)==1 else 's'),description="**This action is irreversible!**",color=0xb51a00)
|
||||||
@ -1283,12 +1287,14 @@ async def modify(context, *, content=""):
|
|||||||
opEmoji = {i:j for i,j in zip(ops,opEmoji)}
|
opEmoji = {i:j for i,j in zip(ops,opEmoji)}
|
||||||
await context.message.channel.send("{} Transfer{} {}".format(str(reaction.emoji),'s' if allOnly or len(torrents) > 1 else '', ops[cmd]))
|
await context.message.channel.send("{} Transfer{} {}".format(str(reaction.emoji),'s' if allOnly or len(torrents) > 1 else '', ops[cmd]))
|
||||||
await msg.clear_reactions()
|
await msg.clear_reactions()
|
||||||
await msg2.clear_reactions()
|
if msg2 is not None:
|
||||||
|
await msg2.clear_reactions()
|
||||||
return
|
return
|
||||||
else:
|
else:
|
||||||
await context.message.channel.send("❌ Cancelled!")
|
await context.message.channel.send("❌ Cancelled!")
|
||||||
await msg.clear_reactions()
|
await msg.clear_reactions()
|
||||||
await msg2.clear_reactions()
|
if msg2 is not None:
|
||||||
|
await msg2.clear_reactions()
|
||||||
return
|
return
|
||||||
|
|
||||||
await msg.clear_reactions()
|
await msg.clear_reactions()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user