categorize cmds in file struct

commands/anime/anime.js

@@ -1,9 +1,9 @@
-const {TagFilter} = require("../util/tagfilter");
+const {TagFilter} = require("../../util/tagfilter");
-const {Tag} = require ("../util/tag");
+const {Tag} = require ("../../util/tag");
 
 const Discord = require('discord.js');
-const UserData = require('../models/user');
+const UserData = require('../../models/user');
-const AniData = require('../models/anime');
+const AniData = require('../../models/anime');
 
 module.exports = {
     name: "anime",

commands/dev/admin.js

@@ -1,5 +1,5 @@
 const Discord = require('discord.js');
-const UserData = require('../models/user');
+const UserData = require('../../models/user');
 
 module.exports = {
     name: "admin",

commands/dev/blacklist.js

@@ -1,6 +1,6 @@
 const Discord = require('discord.js');
-const UserData = require('../models/user');
+const UserData = require('../../models/user');
-const GuildData = require('../models/guild')
+const GuildData = require('../../models/guild')
 
 module.exports = {
     name: "blacklist",

commands/dev/developer.js

@@ -1,6 +1,6 @@
 const Discord = require('discord.js');
 const mongoose = require('mongoose');
-const UserData = require('../models/user');
+const UserData = require('../../models/user');
 
 module.exports = {
     name: "developer",

commands/dev/eval.js

@@ -1,8 +1,8 @@
 const Discord = require('discord.js');
 const chalk = require('chalk');
 
-const {Tag} = require('../util/tag');
+const {Tag} = require('../../util/tag');
-const {TagFilter} = require('../util/tagfilter');
+const {TagFilter} = require('../../util/tagfilter');
 
 module.exports = {
     name: 'eval',

commands/dev/pull.js

@@ -1,7 +1,7 @@
 const Discord = require('discord.js');
 const fs = require('fs');
 const chalk = require('chalk');
-const UserData = require('../models/user');
+const UserData = require('../../models/user');
 const cp = require('child_process');
 
 module.exports = {

commands/dev/reload.js

@@ -3,7 +3,7 @@ const fs = require('fs');
 const chalk = require('chalk');
 const ora = require('ora');
 
-const UserData = require("../models/user");
+const UserData = require("../../models/user");
 
 module.exports = {
     name: "reload",

commands/dev/setstatus.js

@@ -1,9 +1,9 @@
 const Discord = require('discord.js');
 
-const UserData = require('../models/user');
+const UserData = require('../../models/user');
 
-const {TagFilter} = require('../util/tagfilter');
+const {TagFilter} = require('../../util/tagfilter');
-const {Tag} = require('../util/tag');
+const {Tag} = require('../../util/tag');
 
 module.exports = {
     name: "setstatus",

commands/dev/staff.js

@@ -1,5 +1,5 @@
 const Discord = require('discord.js');
-const UserData = require('../models/user');
+const UserData = require('../../models/user');
 
 module.exports = {
     name: "staff",

commands/dev/support.js

@@ -1,5 +1,5 @@
 const Discord = require('discord.js');
-const UserData = require('../models/user');
+const UserData = require('../../models/user');
 
 module.exports = {
     name: "support",

commands/dev/vip.js

@@ -18,7 +18,7 @@ module.exports = {
         if (!message.guild) {return message.reply("This command is server-only!");}
         if (!args.length) {return message.channel.send(`Syntax: \`${prefix}vip <add|remove|check>\``);}
         if (!client.developers.includes(message.author.id) && !['check', 'c', 'view', 'v'].includes(args[0])) {return message.reply("Unfortunately, this is a **developer-only command**!");}
-        const GuildSettings = require('../models/guild');
+        const GuildSettings = require('../../models/guild');
         const logemb = (act) => new Discord.MessageEmbed()
         .setAuthor(`VIP Server ${act}`, message.author.avatarURL())
         .setDescription("A Server's VIP status was updated.")

commands/fun/deathnote.js

@@ -1,10 +1,10 @@
 const Discord = require('discord.js');
 const moment = require('moment');
 
-const VC = require('../models/vscount');
+const VC = require('../../models/vscount');
 
-const {Tag} = require('../util/tag');
+const {Tag} = require('../../util/tag');
-const {TagFilter} = require('../util/tagfilter');
+const {TagFilter} = require('../../util/tagfilter');
 
 const deaths = [
     "watching too much anime", "an overdose of waifus", "Hypotakunemia", "trying to self-isekai",
@@ -111,7 +111,7 @@ module.exports = {
             .setTimestamp()
         );
 
-        await require('../util/wait')(2500);
+        await require('../../util/wait')(2500);
 
         let text = reptype.texts[Math.floor(Math.random() * reptype.texts.length)]
         .replace(/{p}/g, victim) //{p} = victim

commands/fun/kiss.js

@@ -1,7 +1,7 @@
 const Discord = require('discord.js');
-const Saves = require('../models/saves');
+const Saves = require('../../models/saves');
-const UserData = require('../models/user');
+const UserData = require('../../models/user');
-const makeId = require('../util/makeid');
+const makeId = require('../../util/makeid');
 
 module.exports = {
     name: "kiss",

commands/fun/secretsanta.js

@@ -1,7 +1,7 @@
 const Discord = require('discord.js');
-const SS = require('../models/secretsanta');
+const SS = require('../../models/secretsanta');
 
-const ask = require('../util/ask');
+const ask = require('../../util/ask');
 
 module.exports = {
     name: "secretsanta",
@@ -55,7 +55,7 @@ module.exports = {
 
             let id;
             while (true) {
-                id = require('../util/makeid')(6);
+                id = require('../../util/makeid')(6);
                 let test = await SS.findOne({ssid: id});
                 if (!test) {break;}
             }

commands/fun/slap.js

@@ -1,10 +1,10 @@
 const Discord = require('discord.js');
 
-const Saves = require('../models/saves');
+const Saves = require('../../models/saves');
-const UserData = require('../models/user');
+const UserData = require('../../models/user');
-const VC = require('../models/vscount');
+const VC = require('../../models/vscount');
 
-const makeId = require('../util/makeid');
+const makeId = require('../../util/makeid');
 
 module.exports = {
     name: "slap",

commands/leveling/levelchannel.js

@@ -1,7 +1,7 @@
 const Discord = require('discord.js');
 
-const UserData = require('../models/user');
+const UserData = require('../../models/user');
-const LXP = require('../models/localxp');
+const LXP = require('../../models/localxp');
 
 module.exports = {
     name: "levelchannel",

commands/leveling/levelrole.js

@@ -1,9 +1,9 @@
 const Discord = require('discord.js');
 
-const GuildData = require('../models/guild');
+const GuildData = require('../../models/guild');
-const LR = require('../models/levelroles');
+const LR = require('../../models/levelroles');
 
-const ask = require('../util/ask');
+const ask = require('../../util/ask');
 
 module.exports = {
     name: "levelrole",

commands/leveling/setupleveling.js

@@ -1,6 +1,6 @@
 const Discord = require('discord.js');
 
-const LXP = require('../models/localxp');
+const LXP = require('../../models/localxp');
 
 module.exports = {
     name: "setupleveling",

commands/leveling/stats.js

@@ -1,6 +1,6 @@
 const Discord = require('discord.js');
 
-const LXP = require('../models/localxp');
+const LXP = require('../../models/localxp');
 
 module.exports = {
     name: "stats",

commands/misc/ar.js

@@ -1,9 +1,9 @@
 const Discord = require('discord.js');
 
-const AR = require('../models/ar');
+const AR = require('../../models/ar');
-const GuildData = require('../models/guild');
+const GuildData = require('../../models/guild');
 
-const ask = require('../util/ask');
+const ask = require('../../util/ask');
 
 module.exports = {
     name: "ar",

commands/misc/avatar.js

@@ -1,6 +1,6 @@
 const Discord = require('discord.js');
-const {Tag} = require('../util/tag');
+const {Tag} = require('../../util/tag');
-const {TagFilter} = require('../util/tagfilter');
+const {TagFilter} = require('../../util/tagfilter');
 
 module.exports = {
     name: "avatar",

commands/misc/help.js

@@ -1,7 +1,7 @@
 const Discord = require("discord.js");
 
-const {Pagination} = require('../util/pagination');
+const {Pagination} = require('../../util/pagination');
-const ask = require('../util/ask');
+const ask = require('../../util/ask');
 
 module.exports = {
     name: "help",
@@ -50,7 +50,7 @@ module.exports = {
             if (['l', 'leveling', 'level'].includes(`${cat}`.trim().toLowerCase())) {pages = helpSorted['Leveling'];}
             if (['a', 'all'].includes(`${cat}`.trim().toLowerCase())) {pages = []; let c; for (c of Object.values(helpSorted)) {let h; for (h of c) {pages.push(h)}}}
 
-            await require('../util/wait')(500);
+            await require('../../util/wait')(500);
 
             if (pages.length > 1) {
                 let help = new Pagination(message.channel, pages, message, client, true);

commands/misc/info.js

@@ -12,7 +12,7 @@ module.exports = {
         extra: null
     },
     async execute(message, msg, args, cmd, prefix, mention, client) {
-        let botData = await require('../models/bot').findOne({finder: 'lel'});
+        let botData = await require('../../models/bot').findOne({finder: 'lel'});
 
         return message.channel.send(new Discord.MessageEmbed()
             .setAuthor("About Me!", client.users.cache.get(client.developers[Math.floor(Math.random() * client.developers.length)]).avatarURL())

commands/misc/ingorear.js

@@ -1,7 +1,7 @@
 const Discord = require('discord.js');
 
-const AR = require('../models/ar');
+const AR = require('../../models/ar');
-const GuildData = require('../models/guild');
+const GuildData = require('../../models/guild');
 
 module.exports = {
     name: "ignorear",

commands/misc/prefix.js

@@ -1,6 +1,6 @@
 const Discord = require('discord.js');
 const mongoose = require('mongoose');
-const GuildSettings = require('../models/guild');
+const GuildSettings = require('../../models/guild');
 
 module.exports = {
     name: "prefix",
@@ -34,7 +34,7 @@ module.exports = {
         }
         client.guildconfig.prefixes.set(message.guild.id, np);
         let upm = await message.reply("sure thing!");
-        await require('../util/wait')(1750);
+        await require('../../util/wait')(1750);
         return upm.edit(new Discord.MessageEmbed()
             .setAuthor('Prefix updated!', message.author.avatarURL())
             .setDescription(`New prefix: \`${np}\``)

commands/misc/userinfo.js

@@ -1,7 +1,7 @@
 const Discord = require('discord.js');
 const moment = require('moment');
 const mongoose = require('mongoose');
-const UserData = require('../models/user');
+const UserData = require('../../models/user');
 
 module.exports = {
     name: "userinfo",

commands/moderation/autorole.js

@@ -1,5 +1,5 @@
 const Discord = require('discord.js');
-const GuildData = require('../models/guild');
+const GuildData = require('../../models/guild');
 
 module.exports = {
     name: "autorole",

commands/moderation/ban.js

@@ -1,9 +1,9 @@
 const Discord = require('discord.js');
 
-const Mod = require('../models/mod');
+const Mod = require('../../models/mod');
 
-const {Tag} = require('../util/tag');
+const {Tag} = require('../../util/tag');
-const {TagFilter} = require('../util/tagfilter');
+const {TagFilter} = require('../../util/tagfilter');
 
 module.exports = {
     name: "ban",

commands/moderation/clearwarnings.js

@@ -1,6 +1,6 @@
 const Discord = require('discord.js');
 
-const Mod = require('../models/mod');
+const Mod = require('../../models/mod');
 
 module.exports = {
     name: "clearwarnings",

commands/moderation/kick.js

@@ -1,9 +1,9 @@
 const Discord = require('discord.js');
 
-const Mod = require('../models/mod');
+const Mod = require('../../models/mod');
 
-const {Tag} = require('../util/tag');
+const {Tag} = require('../../util/tag');
-const {TagFilter} = require('../util/tagfilter');
+const {TagFilter} = require('../../util/tagfilter');
 
 module.exports = {
     name: "kick",

commands/moderation/leave.js

@@ -1,7 +1,7 @@
 const Discord = require('discord.js');
-const GuildData = require('../models/guild');
+const GuildData = require('../../models/guild');
-const Responses = require('../models/responses');
+const Responses = require('../../models/responses');
-const sendResponse = require('../util/response/sendresponse');
+const sendResponse = require('../../util/response/sendresponse');
 
 module.exports = {
     name: "leave",

commands/moderation/logs.js

@@ -1,7 +1,7 @@
 const Discord = require("discord.js");
 
-const GuildData = require('../models/guild');
+const GuildData = require('../../models/guild');
-const LogData = require('../models/log');
+const LogData = require('../../models/log');
 
 
 const ObjLogTypes = {

commands/moderation/response.js

@@ -1,12 +1,12 @@
 const Discord = require('discord.js');
 
-const GuildData = require('../models/guild');
+const GuildData = require('../../models/guild');
-const Responses = require('../models/responses');
+const Responses = require('../../models/responses');
 
-const sendResponse = require('../util/response/sendresponse');
+const sendResponse = require('../../util/response/sendresponse');
-const parseResponse = require('../util/response/parseresponse');
+const parseResponse = require('../../util/response/parseresponse');
-const saveResponse = require('../util/response/saveresponse');
+const saveResponse = require('../../util/response/saveresponse');
-const getResponse = require('../util/response/getresponse');
+const getResponse = require('../../util/response/getresponse');
 
 module.exports = {
     name: "response",

commands/moderation/softban.js

@@ -1,7 +1,7 @@
 const Discord = require('discord.js');
 
-const {Tag} = require("../util/tag");
+const {Tag} = require("../../util/tag");
-const {TagFilter} = require("../util/tagfilter");
+const {TagFilter} = require("../../util/tagfilter");
 
 module.exports = {
     name: "softban",

commands/moderation/staffrole.js

@@ -1,6 +1,6 @@
 const Discord = require('discord.js');
 const mongoose = require('mongoose');
-const GuildSettings = require('../models/guild');
+const GuildSettings = require('../../models/guild');
 
 module.exports = {
     name: "staffrole",
@@ -40,7 +40,7 @@ module.exports = {
             tguild.staffrole = role.id;
             tguild.save();
             let upm = await message.reply("sure thing!");
-            await require('../util/wait')(1750);
+            await require('../../util/wait')(1750);
             return upm.edit(new Discord.MessageEmbed()
                 .setAuthor('Staff role updated!', message.author.avatarURL())
                 .setDescription(`<@&${tguild.staffrole}> can now edit my settings in this server.`)

commands/moderation/togglestatuses.js

@@ -1,5 +1,5 @@
 const Discord = require('discord.js');
-const GuildSettings = require('../models/guild');
+const GuildSettings = require('../../models/guild');
 
 module.exports = {
     name: "togglestatuses",

commands/moderation/warn.js

@@ -1,9 +1,9 @@
 const Discord = require('discord.js');
 
-const Mod = require('../models/mod');
+const Mod = require('../../models/mod');
 
-const {TagFilter} = require('../util/tagfilter');
+const {TagFilter} = require('../../util/tagfilter');
-const {Tag} = require('../util/tag');
+const {Tag} = require('../../util/tag');
 
 module.exports = {
     name: "warn",

commands/moderation/welcome.js

@@ -1,7 +1,7 @@
 const Discord = require('discord.js');
-const GuildData = require('../models/guild');
+const GuildData = require('../../models/guild');
-const Responses = require('../models/responses');
+const Responses = require('../../models/responses');
-const sendResponse = require('../util/response/sendresponse');
+const sendResponse = require('../../util/response/sendresponse');
 
 module.exports = {
     name: "welcome",

commands/social/afk.js

@@ -1,6 +1,6 @@
 const Discord = require('discord.js');
 const mongoose = require('mongoose');
-const UserData = require('../models/user');
+const UserData = require('../../models/user');
 
 module.exports = {
     name: "afk",
@@ -34,7 +34,7 @@ module.exports = {
         let tempDate = new Date();
         tu.statusclearat = tempDate.setHours(tempDate.getHours() + 12);
         tu.save();
-        require('../util/cachestatus')(message.author.id, tempDate.setHours(tempDate.getHours() + 12));
+        require('../../util/cachestatus')(message.author.id, tempDate.setHours(tempDate.getHours() + 12));
         return message.reply(`I set your ${tu.statusclearmode === 'auto' ? 'automatically' : 'manually'}-clearing AFK message to: ${reason.trim()}`);
     }
 };

commands/social/bio.js

@@ -1,5 +1,5 @@
 const Discord = require('discord.js');
-const UserData = require('../models/user');
+const UserData = require('../../models/user');
 
 module.exports = {
     name: "bio",

commands/social/clearstatus.js

@@ -1,7 +1,7 @@
 const Discord = require('discord.js');
 const mongooes = require('mongoose');
 
-const UserData = require('../models/user');
+const UserData = require('../../models/user');
 
 module.exports = {
     name: "clearstatus",
@@ -20,7 +20,7 @@ module.exports = {
         tu.statusmsg = '';
         tu.statustype = '';
         tu.save();
-        require('../util/siftstatuses')(client, message.author.id, true);
+        require('../../util/siftstatuses')(client, message.author.id, true);
         return message.reply("welcome back! I cleared your status.").then(m => {m.delete({timeout: 5000}).then(() => {if (message.guild && message.guild.me.permissions.has("DELETE_MESSAGES")) {message.delete().catch(() => {});}})});
     }
 };

commands/social/cry.js

@@ -1,7 +1,7 @@
 const Discord = require('discord.js');
-const Saves = require('../models/saves');
+const Saves = require('../../models/saves');
-const UserData = require('../models/user');
+const UserData = require('../../models/user');
-const makeId = require('../util/makeid');
+const makeId = require('../../util/makeid');
 
 module.exports = {
     name: "cry",

commands/social/dnd.js

@@ -1,6 +1,6 @@
 const Discord = require('discord.js');
 const mongoose = require('mongoose');
-const UserData = require('../models/user');
+const UserData = require('../../models/user');
 
 module.exports = {
     name: "dnd",
@@ -34,7 +34,7 @@ module.exports = {
         let tempDate = new Date();
         tu.statusclearat = tempDate.setHours(tempDate.getHours() + 12);
         tu.save();
-        require('../util/cachestatus')(message.author.id, tempDate.setHours(tempDate.getHours() + 12));
+        require('../../util/cachestatus')(message.author.id, tempDate.setHours(tempDate.getHours() + 12));
         return message.reply(`I set your ${tu.statusclearmode === 'auto' ? 'automatically' : 'manually'}-clearing Do not Disturb message to: ${reason.trim()}`);
     }
 };

commands/social/hug.js

@@ -1,10 +1,10 @@
 const Discord = require('discord.js');
 
-const Saves = require('../models/saves');
+const Saves = require('../../models/saves');
-const UserData = require('../models/user');
+const UserData = require('../../models/user');
-const VC = require('../models/vscount');
+const VC = require('../../models/vscount');
 
-const makeId = require('../util/makeid');
+const makeId = require('../../util/makeid');
 
 module.exports = {
     name: "hug",

commands/social/sip.js

@@ -1,7 +1,7 @@
 const Discord = require('discord.js');
-const Saves = require('../models/saves');
+const Saves = require('../../models/saves');
-const UserData = require('../models/user');
+const UserData = require('../../models/user');
-const makeId = require('../util/makeid');
+const makeId = require('../../util/makeid');
 
 module.exports = {
     name: "sip",

commands/social/starboard.js

@@ -1,6 +1,6 @@
 const Discord = require('discord.js');
-const GuildData = require('../models/guild');
+const GuildData = require('../../models/guild');
-const ask = require('../util/ask');
+const ask = require('../../util/ask');
 
 module.exports = {
     name: "starboard",

handle/command.js

@@ -4,7 +4,8 @@ const chalk = require('chalk');
 //const ora = require('ora');
 
 module.exports = client => {
-    var commands = fs.readdirSync('./commands').filter(file => file.endsWith('.js'));
+    let commands = fs.readdirSync('./commands').filter(file => file.endsWith('.js'));
+    fs.readdirSync('./commands').filter(file => !file.includes('.')).forEach(dir => fs.readdirSync(`./commands/${dir}`).filter(file => file.endsWith('.js')).forEach(x => commands.push(x)));
 
     //console.log('');
     //let cora = ora(`${chalk.white("Loading commands into client.")} ${chalk.blue("[")}${chalk.blueBright("0")}${chalk.blue("/")}${chalk.blueBright(`${commands.length}`)}${chalk.blue("]")}`).start();
@@ -17,12 +18,12 @@ module.exports = client => {
         var command = require(`../commands/${commandf}`);
         client.commands.set(command.name, command);
         if (command.aliases) {command.aliases.forEach(a => client.aliases.set(a, command.name));}
-        console.log(`${chalk.gray('[LOG] ')} >> ${chalk.blueBright('Loaded Command')} ${chalk.white(command.name)} ${chalk.blueBright('with')} ${chalk.white(command.aliases && command.aliases.length ? command.aliases.length : 0)} ${chalk.blueBright('aliases')}`);
+        console.log(`${chalk.gray('[LOAD]')} >> ${chalk.blueBright('Loaded Command')} ${chalk.white(command.name)} ${chalk.blueBright('with')} ${chalk.white(command.aliases && command.aliases.length ? command.aliases.length : 0)} ${chalk.blueBright('aliases')}`);
     }
     /*cora.stop(); cora.clear();
     console.log(`${chalk.gray('[BOOT]')} >> ${chalk.blue('Getting Commands...')}\n`);
     Array.from(client.commands.values()).forEach(command => {
-        console.log(`${chalk.gray('[LOG] ')} >> ${chalk.blueBright('Loaded Command')} ${chalk.white(command.name)} ${chalk.blueBright('with')} ${chalk.white(command.aliases && command.aliases.length ? command.aliases.length : 0)} ${chalk.blueBright('aliases')}`);
+        console.log(`${chalk.gray('[LOAD]')} >> ${chalk.blueBright('Loaded Command')} ${chalk.white(command.name)} ${chalk.blueBright('with')} ${chalk.white(command.aliases && command.aliases.length ? command.aliases.length : 0)} ${chalk.blueBright('aliases')}`);
     });*/
     console.log(`\n${chalk.gray('[BOOT]')} >> ${chalk.blue('Loaded all Commands')}`);
 };

handle/event.js

@@ -11,7 +11,7 @@ module.exports = client => {
         let evt = require('../events/' + file);
         client.removeAllListeners(evtName);
         client.on(evtName, evt.bind(null, client));
-        console.log(`${chalk.gray('[LOG] ')} >> ${chalk.blueBright('Loaded Event')} ${chalk.white(evtName)}`);
+        console.log(`${chalk.gray('[LOAD]')} >> ${chalk.blueBright('Loaded Event')} ${chalk.white(evtName)}`);
     }
     console.log(`\n${chalk.gray('[BOOT]')} >> ${chalk.blue('Loaded all Events')}`);
 };

handle/response.js

@@ -10,7 +10,7 @@ module.exports = client => {
         var response = require(`../responses/${responsef}`);
         client.responses.triggers.push([response.name, response.condition]);
         client.responses.commands.set(response.name, response);
-        console.log(`${chalk.gray('[LOG] ')} >> ${chalk.blueBright('Loaded Response')} ${chalk.white(response.name)}`);
+        console.log(`${chalk.gray('[LOAD]')} >> ${chalk.blueBright('Loaded Response')} ${chalk.white(response.name)}`);
     }
     console.log(`\n${chalk.gray('[BOOT]')} >> ${chalk.blue('Loaded all Responses')}`);
 };

util/cache.js

@@ -22,5 +22,5 @@ module.exports = async (client) => {
     let ora_lrCache = ora("Caching Level Roles...").start();
     await require('./cache/lr')(client);
     ora_lrCache.stop(); ora_lrCache.clear();
-    console.log(`${chalk.gray('[PROC]')} >> ${chalk.blueBright(`Cached`)} ${chalk.white(`${client.misc.cache.lxp.enabled.length}`)} ${chalk.blueBright(`guilds with Level Roles enabled.`)}`);
+    console.log(`${chalk.gray('[PROC]')} >> ${chalk.blueBright(`Cached`)} ${chalk.white(`${client.misc.cache.lxp.hasLevelRoles.length}`)} ${chalk.blueBright(`guilds with Level Roles enabled.`)}`);
 };