Fix automod url regex and logic

a.ts

@@ -1,36 +1,31 @@
 const urlRegex =
-  /https?:\/\/(www\.)?([-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b)([-a-zA-Z0-9()@:%_\+.~#?&//=]*)/;
+  /https?:\/\/(www\.)?([-a-zA-Z0-9]{1,63}\.)*([-a-zA-Z0-9]{1,63}\.[a-zA-Z]{2,6})([-a-zA-Z0-9()@:%_\+.~#?&\/\/=]*)/;
 
 const allowedDomains: string[] = [
-  'hypixel.net',
   '*.hypixel.net',
-  'discord.com',
   '*.discord.com',
-  'kath.lol',
   '*.kathund.wtf',
-  'kathund.wtf',
+  'kath.lol',
   'hypixel-api-reborn.github.io'
 ];
 
-function matchWildcard(domain: string, pattern: string): boolean {
-  const regexPattern = pattern.replace(/[-\/\\^$+?.()|[\]{}]/g, '\\$&').replace(/\*/g, '.*');
-  const regex = new RegExp(`^${regexPattern}$`);
-  return regex.test(domain);
-}
-
 function isUrlAllowed(url: string): boolean {
   const isValidUrl = urlRegex.test(url);
-  if (!isValidUrl) {
-    return false;
-  }
-
+  if (!isValidUrl) return false;
   const match = url.match(urlRegex);
-  const domain = match ? match[2] : null;
-  if (!domain) {
+  if (!match) return false;
+  const domain: string = match[3];
+
+  if (allowedDomains.some((pattern) => pattern === domain) && !match[2]) {
+    return true;
+  } else if (!allowedDomains.some((pattern) => pattern === domain)) {
+    return (
+      allowedDomains.some((pattern) => pattern === `*.${domain}`) ||
+      allowedDomains.some((pattern) => pattern === match[2] + domain)
+    );
+  } else {
     return false;
   }
-
-  return allowedDomains.some((pattern) => matchWildcard(domain, pattern));
 }
 
 const testUrls = [

src/events/messageCreate.ts

@@ -1,32 +1,33 @@
 import { ChannelType, GuildMemberRoleManager, Message, TextChannel, Webhook, WebhookType } from 'discord.js';
-import { HypixelAPIKeyRegex, IPAddressPattern, URLRegex, DiscordInviteRegex } from '../utils/regex';
 import { autoModBypassRole } from '../../config.json';
 import Infraction from '../utils/Infraction';
+import { DiscordInviteRegex, HypixelAPIKeyRegex, IPAddressPattern, URLRegex } from '../utils/regex';
 
 const allowedDomains: string[] = [
-  'hypixel.net',
   '*.hypixel.net',
-  'discord.com',
   '*.discord.com',
-  'kath.lol',
   '*.kathund.wtf',
-  'kathund.wtf',
+  'kath.lol',
   'hypixel-api-reborn.github.io'
 ];
 
-function matchWildcard(domain: string, pattern: string): boolean {
-  const regexPattern = pattern.replace(/[-\/\\^$+?.()|[\]{}]/g, '\\$&').replace(/\*/g, '.*');
-  const regex = new RegExp(`^${regexPattern}$`);
-  return regex.test(domain);
-}
-
 function isUrlAllowed(url: string): boolean {
   const isValidUrl = URLRegex.test(url);
   if (!isValidUrl) return false;
   const match = url.match(URLRegex);
-  const domain = match ? match[2] : null;
-  if (!domain) return false;
-  return !allowedDomains.some((pattern) => matchWildcard(domain, pattern));
+  if (!match) return false;
+  const domain: string = match[3];
+
+  if (allowedDomains.some((pattern) => pattern === domain) && !match[2]) {
+    return true;
+  } else if (!allowedDomains.some((pattern) => pattern === domain)) {
+    return (
+      allowedDomains.some((pattern) => pattern === `*.${domain}`) ||
+      allowedDomains.some((pattern) => pattern === match[2] + domain)
+    );
+  } else {
+    return false;
+  }
 }
 
 async function getWebhook(

src/utils/regex.ts

@@ -1,5 +1,5 @@
 export const HypixelAPIKeyRegex = /[a-zA-Z0-9]{8}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{12}/g;
 export const IPAddressPattern = /((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(\.|$)){4}/g;
 export const URLRegex =
-  /https?:\/\/(www\.)?([-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b)([-a-zA-Z0-9()@:%_\+.~#?&//=]*)/;
+  /https?:\/\/(www\.)?([-a-zA-Z0-9]{1,63}\.)*([-a-zA-Z0-9]{1,63}\.[a-zA-Z]{2,6})([-a-zA-Z0-9()@:%_\+.~#?&\/\/=]*)/;
 export const DiscordInviteRegex = /(?:https:\/\/)?discord\.gg\/[a-zA-Z0-9]+/g;