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

Merge remote-tracking branch 'origin/horse-thread-support' into testing

Browse source
This commit is contained in:
Frisk 2022-09-19 13:13:25 +02:00
parent 8c2e917058 2976555805
commit 680f6fa115
No known key found for this signature in database
GPG key ID: 213F7C15068AF8AC
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/discord/queue.py
View file

@ -135,7 +135,7 @@ def send_to_discord_webhook(data: Optional[DiscordMessage], metadata: DiscordMes
header['Content-Type'] = 'application/json'
standard_args = dict(headers=header)
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":
req = requests.Request("DELETE", metadata.webhook_url, **standard_args)
elif metadata.method == "PATCH":
@ -187,4 +187,4 @@ def send_to_discord(data: Optional[DiscordMessage], meta: DiscordMessageMetadata
time.sleep(5.0)
messagequeue.add_message((data, meta))
elif code is None or code < 2:
pass
pass

7
src/discord/redaction.py
View file

@ -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"], 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, entry_type: int, to_censor: dict): # : Union[List[Unio
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"]+"/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.")