Skip to content
This repository was archived by the owner on Oct 10, 2024. It is now read-only.

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

Merged
eddiejaoude merged 3 commits into from
Jul 28, 2024
Merged

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

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce0192d
fix: remove URLs from content before checking for banned words
Bashamega Jul 24, 2024
5f6ae68
fix: updated url pattern
Bashamega Jul 28, 2024
e7d3d11
fix: urlregex fix
Bashamega Jul 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/alexjs/checkBannedWords.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ export const checkBannedWords = async (
): Promise<EmbedBuilder[]> => {
const embeds: EmbedBuilder[] = [];
try {
const urlPattern = /https?:\/\/[^\s]+/g;
Copy link
Member

@eddiejaoude eddiejaoude Jul 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we use the existing link regex check from the other file? Maybe move to the config?

EddieBot/src/links/checkLinks.ts

Lines 7 to 8 in 9fc6b25

const urlPattern =
/[Hh][Tt][Tt][Pp][Ss]?:\/\/([\w-]+(\.[\w-]+)+)(\/[\w-./?%&=]*)?/g;

Copy link
Member Author

@Bashamega Bashamega Jul 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure

Copy link
Member

@eddiejaoude eddiejaoude Jul 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about moving it to a reusable config, so we don't have duplication? urlRegex.js

https://github.com/EddieHubCommunity/EddieBot/tree/9fc6b257c48b594fb3a48b421cccfabbef6a7a08/src/config

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}"`);
Expand Down