src/client.ts

@@ -17,6 +17,8 @@ import {
 } from './models/IMPORTS.js';
 import DatabaseServer from './components/DatabaseServer.js';
 import CacheServer from './components/CacheServer.js';
+import fxp from 'fast-xml-parser';
+import dayjs from 'dayjs';
 import TSClient from './helpers/TSClient.js';
 
 export default class TClient extends Discord.Client {
@@ -27,6 +29,8 @@ export default class TClient extends Discord.Client {
   public embed: typeof Discord.EmbedBuilder = Discord.EmbedBuilder;
   public collection: typeof Discord.Collection = Discord.Collection;
   public attachment: typeof Discord.AttachmentBuilder = Discord.AttachmentBuilder;
+  public dayjs: typeof dayjs = dayjs;
+  public fxp: typeof fxp = fxp;
   public dailyMsgs: DailyMsgsSvc = new DailyMsgsSvc();
   public userLevels: UserLevelsSvc = new UserLevelsSvc(this);
   public punishments: PunishmentsSvc = new PunishmentsSvc(this);

src/commands/academy.ts

@@ -52,7 +52,7 @@ export default class Academy {
       ]}),
       update: async()=>{
         if (!client.config.whitelist.includes(interaction.user.id)) return MessageTool.youNeedRole(interaction, 'bottech');
-        const articles = await Undici.fetch('https://raw.githubusercontent.com/AnxietyisReal/Daggerbot-TS/master/src/articles.yaml').then(x=>x.text());
+        const articles = await Undici.fetch('https://raw.githubusercontent.com/AnxietyisReal/Daggerbot-TS/master/src/articles.yml').then(x=>x.text());
         writeFileSync('src/articles.yml', articles, 'utf8');
         await interaction.reply({embeds: [new client.embed()
           .setColor(client.config.embedColorGreen)

src/components/Automod.ts

@@ -3,6 +3,9 @@ import TClient from '../client.js';
 import Logger from '../helpers/Logger.js';
 export default class Automoderator {
   private static lockQuery:Set<Discord.Snowflake> = new Set();
+  static Whitelist(message:Discord.Message, ...arr:string[]) {// Array of channel ids for automod to be disabled in (Disables prohibitedWords and advertisement, mind you.)
+    return arr.includes(message.channelId);
+  }
   static scanMsg(message:Discord.Message) {
     return message.content.toLowerCase().replaceAll(/[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?\n?0-9]|[]|ing\b/g, '').split(' ').join('');
   }

src/events/messageCreate.ts

@@ -14,7 +14,7 @@ export default class MessageCreate {
 
     if (client.config.botSwitches.automod && !message.member.roles.cache.has(client.config.dcServer.roles.dcmod) && !message.member.roles.cache.has(client.config.dcServer.roles.admin) && message.guildId === client.config.dcServer.id){
       const automodFailReason = 'msg got possibly deleted by another bot.';
-      if (await client.prohibitedWords.findWord(Automoderator.scanMsg(message))) {
+      if (await client.prohibitedWords.findWord(Automoderator.scanMsg(message))/*  && !Whitelist.includes(message.channelId) */) {
         automodded = true;
         message.delete().catch(()=>Logger.console('log', 'AUTOMOD:PROHIBITEDWORDS', automodFailReason));
         message.channel.send('That word isn\'t allowed here.').then(x=>setTimeout(()=>x.delete(), 10000));
@@ -48,11 +48,11 @@ export default class MessageCreate {
       const outgoingArrays = {
         guildBoost: ['Thanks for boosting our server!', 'Thanks for the boost!', 'We appreciate the boost!', `Thank you for the kind boost, <@${message.author.id}>!`],
       }
-      const GeneralChatID = ConfigHelper.isDevMode() ? '929807948748832801' : '468835415093411863';
+      const GeneralChatID = ConfigHelper.isDevMode() ? '1160707096493441056' : '468835415093411863';
-      Response.create(message, GeneralChatID, 'morning');
+      Response.create(client, message, GeneralChatID, 'morning');
-      Response.create(message, GeneralChatID, 'afternoon');
+      Response.create(client, message, GeneralChatID, 'afternoon');
-      Response.create(message, GeneralChatID, 'evening');
+      Response.create(client, message, GeneralChatID, 'evening');
-      Response.create(message, GeneralChatID, 'night');
+      Response.create(client, message, GeneralChatID, 'night');
 
       CmdTrigger.registerCmds(client, message, 'register');
       CmdTrigger.MFPwTrigger(message, 'farmpw');

src/modules/MPModule.ts

@@ -6,7 +6,6 @@ import FormatPlayer from '../helpers/FormatPlayer.js';
 import Logger from '../helpers/Logger.js';
 import HookMgr from '../components/HookManager.js';
 import {IServer} from '../models/MPServer.js';
-import {XMLParser} from 'fast-xml-parser';
 import {FSPlayer, FSData, FSCareerSavegame} from 'src/interfaces';
 
 let loggingPrefix:string = 'MPModule';
@@ -155,7 +154,7 @@ export async function requestServerData(client:TClient, server:IServer):Promise<
   try {
     const [DSSR, CSGR] = await Promise.allSettled([
       retryReqs('http://'+server.ip+'/feed/dedicated-server-stats.json?code='+server.code, 3).then(x=>x.json() as Promise<FSData>),
-      retryReqs('http://'+server.ip+'/feed/dedicated-server-savegame.html?code='+server.code+'&file=careerSavegame', 3).then(async x=>(new XMLParser({ignoreAttributes: false, attributeNamePrefix: ''}).parse(await x.text())).careerSavegame as FSCareerSavegame)
+      retryReqs('http://'+server.ip+'/feed/dedicated-server-savegame.html?code='+server.code+'&file=careerSavegame', 3).then(async x=>(new client.fxp.XMLParser({ignoreAttributes: false, attributeNamePrefix: ''}).parse(await x.text())).careerSavegame as FSCareerSavegame)
     ]);
     const dss = DSSR.status === 'fulfilled' && DSSR.value && DSSR.value.server ? DSSR.value : null;
     const csg = CSGR.status === 'fulfilled' && CSGR.value && CSGR.value.slotSystem ? CSGR.value : null;

src/modules/ResponseModule.ts

@@ -1,5 +1,5 @@
 import Discord from 'discord.js';
-import dayjs from 'dayjs';
+import TClient from '../client.js';
 import Formatters from '../helpers/Formatters.js';
 
 export default class Response {
@@ -21,15 +21,15 @@ export default class Response {
       suffix: ['all', 'everyone', 'guys', 'yall', 'y\'all']
     }
   }
-  static create(message:Discord.Message, channel:Discord.Snowflake, keyword:string) {
+  static create(client:TClient, message:Discord.Message, channel:Discord.Snowflake, keyword:string) {
     if (message.channelId != channel || message.type != 0) return;
-    this.respond(message, keyword);
+    this.respond(client, message, keyword);
   }
-  protected static async respond(message:Discord.Message, responseKeyword:string) {
+  protected static async respond(client:TClient, message:Discord.Message, responseKeyword:string) {
     if (message.type === Discord.MessageType.Reply) return;
-    if (new RegExp(`^(${this.incomingArrays[responseKeyword].prefix.join('|')})?\\s?${responseKeyword} (${this.incomingArrays[responseKeyword].suffix.join('|')})\\b`, 'i').test(message.content)) return message.reply(`${this.outgoingArrays(message)[responseKeyword][Math.floor(Math.random()*this.outgoingArrays(message)[responseKeyword].length)]}`).catch(()=>null)
+    if (new RegExp(`^(${this.incomingArrays[responseKeyword].prefix.join('|')})?\\s?${responseKeyword} (${this.incomingArrays[responseKeyword].suffix.join('|')})\\b`, 'i').test(message.content)) return message.reply(`${this.outgoingArrays(client, message)[responseKeyword][Math.floor(Math.random()*this.outgoingArrays(client, message)[responseKeyword].length)]}`).catch(()=>null)
   }
-  protected static outgoingArrays(message:Discord.Message) {
+  protected static outgoingArrays(client:TClient, message:Discord.Message) {
     const PersonnyMcPerson = `**${message.member.displayName}**`;
     // const responseCreator =(id:Discord.Snowflake)=>`\n╰*Response made by <@${id}>*`;
     return {
@@ -42,7 +42,7 @@ export default class Response {
         `Good grief, is it Monday already? Anyways, morning ${PersonnyMcPerson}..`, `This time I can shout! So here we go! 1..2..3\n*inhales*\nMORNING ${PersonnyMcPerson.toUpperCase()}!`,
         'Gooooood morning to you!', `Good morning to you! You know what else is good? A segue to our sponsor, breakfast!\nGet started with getting out of the bed and have some breakfast!`,
         `## Morning ${PersonnyMcPerson}!`, '### Have a wonderful day ahead of you!', `Here, have some pancakes for breakfast, ${PersonnyMcPerson}`, 'Is it Friday yet? This week is getting boring already!',
-        `You have reached ${Formatters.DayOfTheYear(Math.floor(dayjs().diff(dayjs().startOf('year'), 'day', true))+1)} day of the year, also good morning to you as well!`,
+        `You have reached ${Formatters.DayOfTheYear(Math.floor(client.dayjs().diff(client.dayjs().startOf('year'), 'day', true))+1)} day of the year, also good morning to you as well!`,
         'Good morning! Have a cookie to start your day with. :cookie:', 'https://tenor.com/view/rambo-family-rambo-rise-and-shine-wake-up-gif-22012440'
       ],
       afternoon: [