diff --git a/src/client/components/observers/Automoderation.ts b/src/client/components/observers/Automoderation.ts index 3b1d233..cca464a 100644 --- a/src/client/components/observers/Automoderation.ts +++ b/src/client/components/observers/Automoderation.ts @@ -73,8 +73,8 @@ export default class AutoModeration extends Observer implements Initialisable this.regex = { invite: /((discord\s*\.?\s*gg\s*)|discord(app)?\.com\/invite)\/\s?(?[a-z0-9]+)/iu, - linkRegG: /(https?:\/\/(www\.)?)?(?([a-z0-9-]{1,63}\.)?([a-z0-9-]{1,63})(\.[a-z0-9-]{2,63})(\.[a-z0-9-]{2,63})?)(\/\S*)?/iug, - linkReg: /(https?:\/\/(www\.)?)?(?([a-z0-9-]{1,63}\.)?([a-z0-9-]{1,63})(\.[a-z0-9-]{2,63})(\.[a-z0-9-]{2,63})?)(\/\S*)?/iu, + linkRegG: /(https?:\/\/(www\.)?)?(?([a-z0-9-]{1,63}\.)?([a-z0-9-]{1,63})(\.[a-z0-9-]{2,63})(\.[a-z0-9-]{2,63})?)(\/[^()\s]*)?/iug, + linkReg: /(https?:\/\/(www\.)?)?(?([a-z0-9-]{1,63}\.)?([a-z0-9-]{1,63})(\.[a-z0-9-]{2,63})(\.[a-z0-9-]{2,63})?)(\/[^()\s]*)?/iu, mention: /<@!?(?[0-9]{18,22})>/u, mentionG: /<@!?(?[0-9]{18,22})>/gu, }; @@ -534,11 +534,13 @@ export default class AutoModeration extends Observer implements Initialisable return; const content = msg.content.split('').join(''); // Copy the string... let matches = content.match(this.regex.linkRegG); + console.log('matches', matches); let removedWhitespace = false; if (!matches) { matches = content.replace(/\s/u, '').match(this.regex.linkRegG); removedWhitespace = true; + console.log('secondary matches', matches); } if (!matches) @@ -550,6 +552,7 @@ export default class AutoModeration extends Observer implements Initialisable for (const match of matches) { let domain = match.match(this.regex.linkReg)!.groups?.domain; + console.log('domain', domain); if (!domain) continue; domain = domain.toLowerCase(); @@ -586,10 +589,11 @@ export default class AutoModeration extends Observer implements Initialisable const parts = domain.split('.'); const validTld = this.topLevelDomains.find(parts[parts.length - 1]); - // console.log(parts, validTld); + console.log(parts, validTld); if (!validTld) continue; const valid = await resolver.validateDomain(domain); + console.log('valid domain?', valid); if (removedWhitespace && !match.includes(`${domain}/`)) continue; diff --git a/src/localization/en_gb/general/en_gb_general.lang b/src/localization/en_gb/general/en_gb_general.lang index 647a93f..9f83a4f 100644 --- a/src/localization/en_gb/general/en_gb_general.lang +++ b/src/localization/en_gb/general/en_gb_general.lang @@ -65,6 +65,9 @@ Command takes no arguments [GENERAL_ANONYMOUS] 》 Anonymous +[GENERAL_AUTOLOG] +》 Autolog + [GENERAL_MESSAGES] 》 Messages