From 2976555805211a92fa6b425f65780a3d6d948253 Mon Sep 17 00:00:00 2001 From: MarkusRost <2701034-MarkusRost@users.noreply.gitlab.com> Date: Mon, 19 Sep 2022 05:21:48 +0000 Subject: [PATCH] Support threads in redaction --- src/discord/redaction.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/discord/redaction.py b/src/discord/redaction.py index 46d6b07..3ad010c 100644 --- a/src/discord/redaction.py +++ b/src/discord/redaction.py @@ -41,7 +41,8 @@ def delete_messages(matching_data: dict): msg_to_remove = [] logger.debug("Deleting messages for data: {}".format(matching_data)) for message in to_delete: - webhook_url = "{main_webhook}/messages/{message_id}".format(main_webhook=settings["webhookURL"].split("?", 1)[0], message_id=message[0]) + main_webhook = settings["webhookURL"].split("?", 1) + webhook_url = "{main_webhook}/messages/{message_id}{thread_id}".format(main_webhook=main_webhook[0], message_id=message[0], thread_id=("?"+main_webhook[1] if len(main_webhook) > 1 else "")) msg_to_remove.append(message[0]) logger.debug("Removing following message: {}".format(message[0])) send_to_discord(None, DiscordMessageMetadata("DELETE", webhook_url=webhook_url)) @@ -89,7 +90,9 @@ def redact_messages(ids: Union[List[Union[str, int]], set[Union[int, str]]], ent db_cursor.execute("UPDATE messages SET content = ? WHERE message_id = ?;", (json.dumps(message), row[1],)) db_connection.commit() logger.debug(message) - send_to_discord(DiscordMessageRaw(message, settings["webhookURL"].split("?", 1)[0]+"/messages/"+str(row[1])), DiscordMessageMetadata("PATCH")) + main_webhook = settings["webhookURL"].split("?", 1) + webhook_url = "{main_webhook}/messages/{message_id}{thread_id}".format(main_webhook=main_webhook[0], message_id=str(row[1]), thread_id=("?"+main_webhook[1] if len(main_webhook) > 1 else "")) + send_to_discord(DiscordMessageRaw(message, webhook_url), DiscordMessageMetadata("PATCH")) else: logger.debug("Could not find message in the database.")