noham/TransmissionBot
1
0
Fork 0
mirror of https://github.com/NohamR/TransmissionBot.git synced 2025-07-08 21:17:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bugfix

Browse Source 
count-based check for reactions in `list` and `summary` now check that the original message author has clicked the reaction.
This commit is contained in:
Tim Wilson 2020-08-25 17:03:53 -06:00 committed by GitHub
parent 0c6fd04444
commit 92e8e72e04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bot.py
View File

@ -652,23 +652,38 @@ async def summary(context, *, content="", repeat=False):
REPEAT_MSG_LIST = [] REPEAT_MSG_LIST = []
await context.message.channel.send("❎ Auto-update cancelled...") await context.message.channel.send("❎ Auto-update cancelled...")
await list_transfers(context, content=torStateFilters[str(reaction.emoji)]) await list_transfers(context, content=torStateFilters[str(reaction.emoji)])
return
elif str(reaction.emoji) == stateEmoji[0]: elif str(reaction.emoji) == stateEmoji[0]:
await legend(context) await legend(context)
return
elif str(reaction.emoji) == stateEmoji[1]: elif str(reaction.emoji) == stateEmoji[1]:
if repeat: if repeat:
REPEAT_COMMAND = False REPEAT_COMMAND = False
REPEAT_MSG_LIST = [] REPEAT_MSG_LIST = []
await context.message.channel.send("❎ Auto-update cancelled...") await context.message.channel.send("❎ Auto-update cancelled...")
return
else: else:
await msg.clear_reaction('🔄') await msg.clear_reaction('🔄')
await repeat_command(summary, context=context, content=content, msg_list=[msg]) await repeat_command(summary, context=context, content=content, msg_list=[msg])
return
if repeat: # a final check to see if the user has cancelled the repeat by checking the count of the cancel reaction if repeat: # a final check to see if the user has cancelled the repeat by checking the count of the cancel reaction
cache_msg = await context.message.channel.fetch_message(msg.id) cache_msg = await context.message.channel.fetch_message(msg.id)
for r in cache_msg.reactions: for r in cache_msg.reactions:
if str(r.emoji) == '❎' and r.count > 1: if str(r.emoji) == '❎' and r.count > 1:
async for user in r.users():
if user.id == context.message.author.id:
REPEAT_COMMAND = False REPEAT_COMMAND = False
REPEAT_MSG_LIST = [] REPEAT_MSG_LIST = []
await context.message.channel.send("❎ Auto-update cancelled...") await context.message.channel.send("❎ Auto-update cancelled...")
return
elif str(r.emoji) in stateEmoji[2:] and r.count > 1:
async for user in r.users():
if user.id == context.message.author.id:
REPEAT_COMMAND = False
REPEAT_MSG_LIST = []
await context.message.channel.send("❎ Auto-update cancelled...")
await list_transfers(context, content=torStateFilters[str(r.emoji)])
return
def strListToList(strList): def strListToList(strList):
if not re.match('^[0-9\,\-]+$', strList): if not re.match('^[0-9\,\-]+$', strList):
@ -875,13 +890,17 @@ async def list_transfers(context, *, content="", repeat=False):
else: else:
await msg.clear_reaction('🔄') await msg.clear_reaction('🔄')
await repeat_command(list_transfers, context=context, content=content, msg_list=msgs) await repeat_command(list_transfers, context=context, content=content, msg_list=msgs)
return
if repeat: # a final check to see if the user has cancelled the repeat by checking the count of the cancel reaction if repeat: # a final check to see if the user has cancelled the repeat by checking the count of the cancel reaction
cache_msg = await context.message.channel.fetch_message(msg.id) cache_msg = await context.message.channel.fetch_message(msg.id)
for r in cache_msg.reactions: for r in cache_msg.reactions:
if str(r.emoji) == '❎' and r.count > 1: if str(r.emoji) == '❎' and r.count > 1:
async for user in r.users():
if user.id == context.message.author.id:
REPEAT_COMMAND = False REPEAT_COMMAND = False
REPEAT_MSG_LIST = [] REPEAT_MSG_LIST = []
await context.message.channel.send("❎ Auto-update cancelled...") await context.message.channel.send("❎ Auto-update cancelled...")
return
@client.command(name='modify', aliases=['m'], pass_context=True) @client.command(name='modify', aliases=['m'], pass_context=True)
async def modify(context, *, content=""): async def modify(context, *, content=""):
@ -992,8 +1011,10 @@ async def modify(context, *, content=""):
ops = {i:j for i,j in zip(ops,opNames)} ops = {i:j for i,j in zip(ops,opNames)}
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]))
return
else: else:
await context.message.channel.send("❌ Cancelled!") await context.message.channel.send("❌ Cancelled!")
return
@client.command(name='legend', pass_context=True) @client.command(name='legend', pass_context=True)
async def legend(context): async def legend(context):