From fde707e2ea8c02292b9c618369f75ac5545f5090 Mon Sep 17 00:00:00 2001 From: Frisk Date: Tue, 1 Dec 2020 12:47:15 +0100 Subject: [PATCH] Fix #179 --- src/discord/redaction.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/discord/redaction.py b/src/discord/redaction.py index 68562f3..ffe2f69 100644 --- a/src/discord/redaction.py +++ b/src/discord/redaction.py @@ -55,13 +55,16 @@ def redact_messages(ids: list, entry_type: int, to_censor: dict): except ValueError: logger.error("Couldn't loads JSON for message data. What happened? Data: {}".format(row[0])) return - if "user" in to_censor: + except TypeError: + logger.error("Couldn't find entry in the database for RevDel to censor information. This is probably because the script has been recently restarted or cache cleared.") + return + if "user" in to_censor and "url" in new_embed["author"]: new_embed["author"]["name"] = _("Removed") new_embed["author"].pop("url") - if "action" in to_censor: + if "action" in to_censor and "url" in new_embed: new_embed["title"] = _("Removed") new_embed.pop("url") - if "content" in to_censor: + if "content" in to_censor and "fields" in new_embed: new_embed.pop("fields") if "comment" in to_censor: new_embed["description"] = _("Removed")