forgot about the start

Metastruct · Dec 24, 2023 · 4693463 · 4693463
1 parent e9dd016
commit 4693463
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/services/discord/modules/discord-events.ts b/app/services/discord/modules/discord-events.ts
@@ -32,7 +32,7 @@ export default (bot: DiscordBot): void => {
 						usr.roles.add(DiscordConfig.roles.event);
 				});
 				for (const { icon, triggers } of events) {
-					const match = new RegExp(triggers.join("\\b|").slice(0, -1)).test(
+					const match = new RegExp("\\b" + triggers.join("\\b|\\b").slice(0, -3)).test(
 						event.name.toLowerCase()
 					);
 					if (match) {

diff --git a/app/services/discord/modules/shitposting.ts b/app/services/discord/modules/shitposting.ts
@@ -361,12 +361,12 @@ export default async (bot: DiscordBot) => {
 		const rng = Math.random();
 
 		// triggers
-		const isTriggerWord = new RegExp(TRIGGER_WORDS.join("\\b|").slice(0, -1)).test(
+		const isTriggerWord = new RegExp("\\b" + TRIGGER_WORDS.join("\\b|\\b").slice(0, -3)).test(
 			msg.content.toLowerCase()
 		);
 		const isMaybeTriggerWord =
 			rng <= MAYBE_TRIGGER_FREQ &&
-			new RegExp(MAYBE_TRIGGER_WORDS.join("\\b|").slice(0, -1)).test(
+			new RegExp("\\b" + MAYBE_TRIGGER_WORDS.join("\\b|\\b").slice(0, -3)).test(
 				msg.content.toLowerCase()
 			);
 		const isChatChannel = bot.config.channels.chat === msg.channelId;