eightball/PluralKit
1
0
Fork 0
mirror of https://github.com/PluralKit/PluralKit.git synced 2026-02-11 08:10:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix message deletion by reaction

Browse source
This commit is contained in:
Ske 2018-07-13 21:41:28 +02:00
parent fc93ebccbb
commit ef38a49a77
3 changed files with 36 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

25
bot/pluralkit/proxy.py
View file

@ -75,7 +75,11 @@ async def send_hook_message(member, hook_id, hook_token, text=None, image_url=No
if resp.status == 200:
resp_data = await resp.json()
# Make a fake message object for passing on - this is slightly broken but works for most things
return discord.Message(reactions=[], **resp_data)
msg = discord.Message(reactions=[], **resp_data)
# Make sure it's added to the client's message cache - otherwise events r
#client.messages.append(msg)
return msg
else:
# Fake a Discord exception, also because #yolo
raise discord.HTTPException(resp, await resp.text())
@ -142,13 +146,18 @@ async def handle_proxying(conn, message):
break
async def handle_reaction(conn, reaction, user):
if reaction.emoji == "❌":
async def handle_reaction(conn, user_id, message_id, emoji):
if emoji == "❌":
async with conn.transaction():
# Find the message in the DB, and make sure it's sent by the user who reacted
message = await db.get_message_by_sender_and_id(conn, message_id=reaction.message.id, sender_id=user.id)
db_message = await db.get_message_by_sender_and_id(conn, message_id=message_id, sender_id=user_id)
if db_message:
logger.debug("Deleting message {} by reaction from {}".format(message_id, user_id))
# If so, remove it from the DB
await db.delete_message(conn, message_id)
if message:
# If so, delete the message and remove it from the DB
await db.delete_message(conn, message["mid"])
await client.delete_message(reaction.message)
# And look up the message and then delete it
channel = client.get_channel(str(db_message["channel"]))
message = await client.get_message(channel, message_id)
await client.delete_message(message)