Frisk/RcGcDw
1
0
Fork 0
mirror of https://gitlab.com/chicken-riders/RcGcDw.git synced 2025-02-23 00:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support webhooks with thread_id

Browse source 
closes #225
This commit is contained in:
MarkusRost 2021-07-30 00:01:55 +00:00
parent fd9a49b157
commit 2efcfcecdd
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/discord/queue.py
View file

@ -132,7 +132,7 @@ def send_to_discord_webhook(data: Optional[DiscordMessage], metadata: DiscordMes
header['Content-Type'] = 'application/json' header['Content-Type'] = 'application/json'
standard_args = dict(headers=header) standard_args = dict(headers=header)
if metadata.method == "POST": if metadata.method == "POST":
req = requests.Request("POST", data.webhook_url+"?wait=" + ("true" if AUTO_SUPPRESSION_ENABLED else "false"), data=repr(data), **standard_args) req = requests.Request("POST", data.webhook_url + (("&" if "?" in data.webhook_url else "&")+"wait=true" if AUTO_SUPPRESSION_ENABLED else ""), data=repr(data), **standard_args)
elif metadata.method == "DELETE": elif metadata.method == "DELETE":
req = requests.Request("DELETE", metadata.webhook_url, **standard_args) req = requests.Request("DELETE", metadata.webhook_url, **standard_args)
elif metadata.method == "PATCH": elif metadata.method == "PATCH":

4
src/discord/redaction.py
View file

@ -39,7 +39,7 @@ def delete_messages(matching_data: dict):
msg_to_remove = [] msg_to_remove = []
logger.debug("Deleting messages for data: {}".format(matching_data)) logger.debug("Deleting messages for data: {}".format(matching_data))
for message in to_delete: for message in to_delete:
webhook_url = "{main_webhook}/messages/{message_id}".format(main_webhook=settings["webhookURL"], message_id=message[0]) webhook_url = "{main_webhook}/messages/{message_id}".format(main_webhook=settings["webhookURL"].split("?", 1)[0], message_id=message[0])
msg_to_remove.append(message[0]) msg_to_remove.append(message[0])
logger.debug("Removing following message: {}".format(message[0])) logger.debug("Removing following message: {}".format(message[0]))
send_to_discord(None, DiscordMessageMetadata("DELETE", webhook_url=webhook_url)) send_to_discord(None, DiscordMessageMetadata("DELETE", webhook_url=webhook_url))
@ -87,6 +87,6 @@ def redact_messages(ids: list, entry_type: int, to_censor: dict):
db_cursor.execute("UPDATE messages SET content = ? WHERE message_id = ?;", (json.dumps(message), row[1],)) db_cursor.execute("UPDATE messages SET content = ? WHERE message_id = ?;", (json.dumps(message), row[1],))
db_connection.commit() db_connection.commit()
logger.debug(message) logger.debug(message)
send_to_discord(DiscordMessageRaw(message, settings["webhookURL"]+"/messages/"+str(row[1])), DiscordMessageMetadata("PATCH")) send_to_discord(DiscordMessageRaw(message, settings["webhookURL"].split("?", 1)[0]+"/messages/"+str(row[1])), DiscordMessageMetadata("PATCH"))
else: else:
logger.debug("Could not find message in the database.") logger.debug("Could not find message in the database.")