diff --git a/src/data/DefaultLogMessages.json b/src/data/DefaultLogMessages.json index 90945c45..1b409d4e 100644 --- a/src/data/DefaultLogMessages.json +++ b/src/data/DefaultLogMessages.json @@ -41,7 +41,7 @@ "MESSAGE_SPAM_DETECTED": "🛑 {userMention(member)} spam detected in {channelMention(channel)}: {description} (more than {limit} in {interval}s)\n{archiveUrl}", "OTHER_SPAM_DETECTED": "🛑 {userMention(member)} spam detected: {description} (more than {limit} in {interval}s)", - "CENSOR": "🛑 Censored message from {userMention(user)} in {channelMention(channel)}: {reason}:\n```{messageText}```", + "CENSOR": "🛑 Censored message (`{message.id}`) from {userMention(user)} in {channelMention(channel)}: {reason}:\n```{messageText}```", "CLEAN": "🚿 {userMention(mod)} cleaned **{count}** message(s) in {channelMention(channel)}\n{archiveUrl}", "CASE_CREATE": "✏ {userMention(mod)} manually created new **{caseType}** case (#{caseNum})", diff --git a/src/plugins/Censor.ts b/src/plugins/Censor.ts index 310cff86..ef9daad8 100644 --- a/src/plugins/Censor.ts +++ b/src/plugins/Censor.ts @@ -110,6 +110,7 @@ export class CensorPlugin extends ZeppelinPlugin { user: stripObjectToScalars(user), channel: stripObjectToScalars(channel), reason, + message: savedMessage, messageText: disableCodeBlocks(deactivateMentions(savedMessage.data.content)), }); } @@ -131,7 +132,7 @@ export class CensorPlugin extends ZeppelinPlugin { delete embed.description; } } - + messageContent += " " + JSON.stringify(embeds); }