From e2f90e77a99ea5768f241061882faee64bb70ee1 Mon Sep 17 00:00:00 2001 From: TheKing-OfTime <68960526+TheKing-OfTime@users.noreply.github.com> Date: Wed, 1 Dec 2021 10:16:49 +0300 Subject: [PATCH 1/2] Improved search for "69" in message content --- packages/aquarius/src/bot/plugins/nice.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/aquarius/src/bot/plugins/nice.js b/packages/aquarius/src/bot/plugins/nice.js index 4e5bb487..26d02095 100644 --- a/packages/aquarius/src/bot/plugins/nice.js +++ b/packages/aquarius/src/bot/plugins/nice.js @@ -16,7 +16,7 @@ export const info = { export default async ({ aquarius, analytics }) => { aquarius.onMessage(info, (message) => { if ( - message.cleanContent.includes('69') || + message.cleanContent.match(/\b69\b/) || message.cleanContent.match(/(?:(?::six:)|6️⃣) ?(?:(?::nine:)|9️⃣)/) ) { log.info(`69 in ${chalk.green(message.guild.name)}`); From 3a00481e48212390552d26ed46ade069f32c3c5f Mon Sep 17 00:00:00 2001 From: TheKing-OfTime <68960526+TheKing-OfTime@users.noreply.github.com> Date: Wed, 1 Dec 2021 10:33:39 +0300 Subject: [PATCH 2/2] Improved Zalgo search in message content It should no longer react to emojis --- packages/aquarius/src/bot/plugins/zalgo.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/aquarius/src/bot/plugins/zalgo.js b/packages/aquarius/src/bot/plugins/zalgo.js index 7f007df4..d324c623 100644 --- a/packages/aquarius/src/bot/plugins/zalgo.js +++ b/packages/aquarius/src/bot/plugins/zalgo.js @@ -18,7 +18,7 @@ export const info = { /** @type {import('../../typedefs').Command} */ export default async ({ aquarius, analytics }) => { aquarius.onMessage(info, (message) => { - if (isZalgo(message.cleanContent) && message.deletable) { + if (isZalgo(message.cleanContent.replace(':','')) && message.deletable) { log.info( `Removing message from ${chalk.green( message.author.username