From a9874faf9a706090d8d06c5162b6929fc29afb3f Mon Sep 17 00:00:00 2001 From: AnxietyisReal <96593068+AnxietyisReal@users.noreply.github.com> Date: Tue, 19 Sep 2023 17:15:26 +1000 Subject: [PATCH] Add MF farm pw to CmdTrigger --- src/events/messageCreate.ts | 3 +++ src/funcs/CmdModule.ts | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/events/messageCreate.ts b/src/events/messageCreate.ts index 082de62..bd3c324 100644 --- a/src/events/messageCreate.ts +++ b/src/events/messageCreate.ts @@ -51,7 +51,10 @@ export default { Response.create(client, message, GeneralChatID, 'afternoon'); Response.create(client, message, GeneralChatID, 'evening'); Response.create(client, message, GeneralChatID, 'night'); + CmdTrigger.registerCmds(client, message, '!!_wepanikfrfr'); + CmdTrigger.MFPwTrigger(message, '!!_farmpw'); + CmdTrigger.TriggerTest(message, '!!_test-trigger'); if (message.mentions.members.has('309373272594579456') && !client.isStaff(message.member)) message.reply('Please don\'t tag Daggerwin, read rule 14 in <#468846117405196289>'); if (message.mentions.members.has('215497515934416896') && !client.isStaff(message.member) && message.type != 19) message.reply('Please don\'t tag Monster unless it\'s important!'); diff --git a/src/funcs/CmdModule.ts b/src/funcs/CmdModule.ts index 6baaca1..d7a9361 100644 --- a/src/funcs/CmdModule.ts +++ b/src/funcs/CmdModule.ts @@ -2,11 +2,24 @@ import Discord from 'discord.js'; import TClient from '../client.js'; export default class CmdTrigger { + protected static SenseTrigger(message:Discord.Message, trigger:string) { + return message.content.toLowerCase().startsWith(trigger) + } static registerCmds(client:TClient, message:Discord.Message, trigger:string) { - if (message.content.startsWith(trigger) && client.config.whitelist.includes(message.author.id)) { + if (this.SenseTrigger(message, trigger) && client.config.whitelist.includes(message.author.id)) { (client.guilds.cache.get(message.guildId) as Discord.Guild).commands.set(client.registry) .then(()=>message.reply('How did you manage to lose the commands??? Anyways, it\'s re-registered now.')) .catch((e:Error)=>message.reply(`Failed to deploy slash commands:\n\`\`\`${e.message}\`\`\``)); } } + static MFPwTrigger(message:Discord.Message, trigger:string) { + if (this.SenseTrigger(message, trigger)) { + let farmPwText = 'The farm password is '; + if (message.channelId === '1149138133514981386') return message.reply(farmPwText += '`westfarm`') + else if (message.channelId === '1149138202662293555') return message.reply(farmPwText += '`eastfarm`') + } + } + static TriggerTest(message:Discord.Message, trigger:string) { + if (this.SenseTrigger(message, trigger)) return message.reply('Triggered!') + } }