fix: remove URLs from content before checking for banned words (#816)

* fix: remove URLs from content before checking for banned words * fix: updated url pattern * fix: urlregex fix
EddieHubCommunity · Jul 28, 2024 · 21f59e3 · 21f59e3
1 parent 9fc6b25
commit 21f59e3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/alexjs/checkBannedWords.ts b/src/alexjs/checkBannedWords.ts
@@ -4,6 +4,7 @@ import type { ExtendedClient } from '../interfaces/ExtendedClient.js';
 import { errorHandler } from '../utils/errorHandler.js';
 import { BannedWordsOptions } from '../config/BannedWordsOptions.js';
 import { getBannedWordConfig } from '../utils/getBannedWordConfig.js';
+import { urlPattern } from '../config/UrlRegex.js';
 
 export const checkBannedWords = async (
  bot: ExtendedClient,
@@ -12,11 +13,13 @@ export const checkBannedWords = async (
 ): Promise<EmbedBuilder[]> => {
  const embeds: EmbedBuilder[] = [];
  try {
+ const text: string = content.replace(urlPattern, '');
  const config = await getBannedWordConfig(bot, serverId);
  const checkWords = config?.bannedWordConfig
  ? config.bannedWordConfig
  : BannedWordsOptions;
- content.split(' ').forEach((word) => {
+
+ text.split(' ').forEach((word) => {
  if (checkWords.includes(word.toLowerCase())) {
  const embed = new EmbedBuilder();
  embed.setTitle(`You used the word "${word}"`);

diff --git a/src/config/UrlRegex.ts b/src/config/UrlRegex.ts
@@ -0,0 +1,2 @@
+export const urlPattern =
+ /[Hh][Tt][Tt][Pp][Ss]?:\/\/([\w-]+(\.[\w-]+)+)(\/[\w-./?%&=]*)?/g;
diff --git a/src/links/checkLinks.ts b/src/links/checkLinks.ts
@@ -2,10 +2,9 @@ import { EmbedBuilder, Message, type PartialMessage } from 'discord.js';
 
 import type { ExtendedClient } from '../interfaces/ExtendedClient.js';
 import { errorHandler } from '../utils/errorHandler.js';
+import { urlPattern } from '../config/UrlRegex.js';
 
 const allowedLinks = ['github.com', 'eddiejaoude.io', 'gitlab.com'];
-const urlPattern =
- /[Hh][Tt][Tt][Pp][Ss]?:\/\/([\w-]+(\.[\w-]+)+)(\/[\w-./?%&=]*)?/g;
 
 export const checkLinks = async (
  bot: ExtendedClient,