From dd11c5e07d97a43f51dd35ee77941d4324d51fc2 Mon Sep 17 00:00:00 2001 From: dericksonmark Date: Wed, 2 Jun 2021 00:43:50 -0400 Subject: [PATCH 1/2] Do not mention ticket if message contains keyword --- config/default.yml | 2 ++ src/BotConfig.ts | 2 ++ src/commands/MentionCommand.ts | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/config/default.yml b/config/default.yml index 27241077..9c389909 100644 --- a/config/default.yml +++ b/config/default.yml @@ -10,6 +10,8 @@ quotedTicketsCauseEmbed: false forbiddenTicketPrefix: '!' +forbiddenTicketText: '!nm' + requiredTicketPrefix: '' embedDeletionEmoji: '🗑️' diff --git a/src/BotConfig.ts b/src/BotConfig.ts index 2b1a37c5..6de46d03 100644 --- a/src/BotConfig.ts +++ b/src/BotConfig.ts @@ -112,6 +112,7 @@ export default class BotConfig { public static quotedTicketsCauseEmbed: boolean; public static requiredTicketPrefix: string; public static forbiddenTicketPrefix: string; + public static forbiddenTicketText: string; public static embedDeletionEmoji: string; @@ -138,6 +139,7 @@ export default class BotConfig { this.quotedTicketsCauseEmbed = getOrDefault( 'quotedTicketsCauseEmbed', false ); this.forbiddenTicketPrefix = getOrDefault( 'forbiddenTicketPrefix', '' ); + this.forbiddenTicketText = getOrDefault( 'forbiddenTicketText', '' ); this.requiredTicketPrefix = getOrDefault( 'requiredTicketPrefix', '' ); this.embedDeletionEmoji = getOrDefault( 'embedDeletionEmoji', '' ); diff --git a/src/commands/MentionCommand.ts b/src/commands/MentionCommand.ts index a3f39959..dba0c17f 100644 --- a/src/commands/MentionCommand.ts +++ b/src/commands/MentionCommand.ts @@ -51,6 +51,10 @@ export default class MentionCommand extends Command { } public async run( message: Message, args: string[] ): Promise { + if ( BotConfig.forbiddenTicketText ) { + if ( message.content.includes( BotConfig.forbiddenTicketText ) ) return false; + } + const mention = MentionRegistry.getMention( args ); let embed: MessageEmbed; From 906dd764e063b2ece78d692620c79bbceacb011a Mon Sep 17 00:00:00 2001 From: dericksonmark Date: Wed, 2 Jun 2021 00:48:24 -0400 Subject: [PATCH 2/2] Remove spaces --- src/commands/MentionCommand.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commands/MentionCommand.ts b/src/commands/MentionCommand.ts index dba0c17f..323c5094 100644 --- a/src/commands/MentionCommand.ts +++ b/src/commands/MentionCommand.ts @@ -54,7 +54,7 @@ export default class MentionCommand extends Command { if ( BotConfig.forbiddenTicketText ) { if ( message.content.includes( BotConfig.forbiddenTicketText ) ) return false; } - + const mention = MentionRegistry.getMention( args ); let embed: MessageEmbed;