discos 1.1.6 → 2.0.0

package/dist/models/user.js

@@ -0,0 +1,59 @@
+import { IS_TEST_MODE } from '../exec/terminal-manager.js';
+import logger from '../logging/logger.js';
+import * as COMMON from '../common.js';
+import pty from 'node-pty';
+export class User {
+    dcUid;
+    dcUname;
+    localUser;
+    ptyProcess;
+    buffer = '';
+    respawn = true;
+    constructor(dcUid, dcUname, localUser) {
+        this.dcUid = dcUid;
+        this.dcUname = dcUname;
+        this.localUser = localUser;
+        this.ptyProcess = this.spawnPty();
+    }
+    spawnPty() {
+        let cwd = `/home/${this.localUser}`;
+        let home = `/home/${this.localUser}`;
+        if (IS_TEST_MODE) {
+            this.localUser = 'root';
+            cwd = '/';
+            home = '/';
+        }
+        const newPtyProcess = pty.spawn('sudo', ['-u', this.localUser, '-i', '/bin/bash'], {
+            name: `xterm`,
+            cols: 80,
+            rows: 24,
+            cwd: cwd,
+            env: {
+                HOME: home,
+                USER: this.localUser,
+                LOGNAME: this.localUser,
+                SHELL: '/bin/bash',
+                PATH: '/usr/local/bin:/usr/bin:/bin',
+                LANG: 'C.UTF-8',
+            },
+        });
+        newPtyProcess.onData((data) => {
+            this.buffer += data;
+        });
+        newPtyProcess.onExit(() => {
+            if (!this.respawn)
+                return;
+            this.ptyProcess = this.spawnPty();
+            logger.warn(COMMON.terminalRespawnMessage(this.dcUname, this.localUser));
+        });
+        return newPtyProcess;
+    }
+    write(cmd) {
+        this.ptyProcess.write(cmd + '\n');
+    }
+    destroy() {
+        this.respawn = false;
+        this.ptyProcess.kill();
+    }
+}
+//# sourceMappingURL=user.js.map

package/dist/models/user.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"user.js","sourceRoot":"","sources":["../../src/models/user.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAC1C,OAAO,KAAK,MAAM,MAAM,cAAc,CAAC;AAEvC,OAAO,GAAkB,MAAM,UAAU,CAAC;AAE1C,MAAM,OAAO,IAAI;IAEf,KAAK,CAAS;IAGd,OAAO,CAAS;IAGhB,SAAS,CAAS;IAGlB,UAAU,CAAO;IAGjB,MAAM,GAAW,EAAE,CAAC;IAGpB,OAAO,GAAY,IAAI,CAAC;IAExB,YAAY,KAAa,EAAE,OAAe,EAAE,SAAiB;QAC3D,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;IACpC,CAAC;IAGD,QAAQ;QACN,IAAI,GAAG,GAAG,SAAS,IAAI,CAAC,SAAS,EAAE,CAAC;QACpC,IAAI,IAAI,GAAG,SAAS,IAAI,CAAC,SAAS,EAAE,CAAC;QAIrC,IAAI,YAAY,EAAE,CAAC;YACjB,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC;YACxB,GAAG,GAAG,GAAG,CAAC;YACV,IAAI,GAAG,GAAG,CAAC;QACb,CAAC;QAED,MAAM,aAAa,GAAS,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,WAAW,CAAC,EAAE;YACvF,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,EAAE;YACR,IAAI,EAAE,EAAE;YACR,GAAG,EAAE,GAAG;YACR,GAAG,EAAE;gBACH,IAAI,EAAE,IAAI;gBACV,IAAI,EAAE,IAAI,CAAC,SAAS;gBACpB,OAAO,EAAE,IAAI,CAAC,SAAS;gBACvB,KAAK,EAAE,WAAW;gBAClB,IAAI,EAAE,8BAA8B;gBACpC,IAAI,EAAE,SAAS;aAChB;SACF,CAAC,CAAC;QAGH,aAAa,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;YAC5B,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC;QACtB,CAAC,CAAC,CAAC;QAGH,aAAa,CAAC,MAAM,CAAC,GAAG,EAAE;YACxB,IAAI,CAAC,IAAI,CAAC,OAAO;gBAAE,OAAO;YAC1B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;YAElC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QAC3E,CAAC,CAAC,CAAC;QAEH,OAAO,aAAa,CAAC;IACvB,CAAC;IAGD,KAAK,CAAC,GAAW;QACf,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC;IACpC,CAAC;IAGD,OAAO;QACL,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;IACzB,CAAC;CACF"}

package/dist/modules/admin.d.ts

@@ -1,5 +1,5 @@
 import type { ChatInputCommandInteraction, AutocompleteInteraction, CacheType, Client } from 'discord.js';
-import type { CommandQueues } from '../types/queues.js';
+import type { CommandQueues } from '../interfaces/queues.js';
 export declare function localUserAutocomplete(interaction: AutocompleteInteraction<CacheType>, queues: CommandQueues): Promise<void>;
 export declare function handleAdmin(interaction: ChatInputCommandInteraction<CacheType>, subcommand: string, username: string, queues: CommandQueues, client: Client): Promise<void>;
 //# sourceMappingURL=admin.d.ts.map

package/dist/modules/admin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"admin.d.ts","sourceRoot":"","sources":["../../src/modules/admin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,uBAAuB,EAAE,SAAS,EAAS,MAAM,EAAE,MAAM,YAAY,CAAC;AAcjH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAkDxD,wBAAsB,qBAAqB,CAAC,WAAW,EAAE,uBAAuB,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAsCjI;AAoFD,wBAAsB,WAAW,CAC/B,WAAW,EAAE,2BAA2B,CAAC,SAAS,CAAC,EACnD,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAsSf"}
+{"version":3,"file":"admin.d.ts","sourceRoot":"","sources":["../../src/modules/admin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,uBAAuB,EAAE,SAAS,EAAS,MAAM,EAAE,MAAM,YAAY,CAAC;AAiBjH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAkD7D,wBAAsB,qBAAqB,CAAC,WAAW,EAAE,uBAAuB,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAuCjI;AAqFD,wBAAsB,WAAW,CAC/B,WAAW,EAAE,2BAA2B,CAAC,SAAS,CAAC,EACnD,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAsUf"}

package/dist/modules/admin.js

@@ -1,14 +1,17 @@
 import { execCommand } from './command.js';
-import { startIPCServer } from '../tools/ipcServer.js';
-import * as queueUtils from '../tools/queue-utils.js';
-import { ping, post } from '../tools/backend.js';
+import { startIPCServer } from '../security/ipcServer.js';
+import { clearHistory } from './clear.js';
+import * as queueUtils from '../security/queue-utils.js';
+import { ping, post } from '../exec/backend.js';
+import { destroyTerminalForUser, syncTerminalsWithConfig } from '../exec/terminal-manager.js';
+import logger from '../logging/logger.js';
 import shellEscape from 'shell-escape';
 import * as COMMON from '../common.js';
-import { ROOT_UID } from '../shared/consts.js';
-import { Config } from '../config.js';
-import { clearHistory } from './clear.js';
-import fs from 'fs';
-import { validateDb } from '../tools/validateDb.js';
+import { ROOT_UID, INTERNAL_UID, INTERNAL_UNAME } from '../shared/consts.js';
+import { Config } from '../config/config.js';
+import fs from 'node:fs';
+import { validateDb } from '../config/validateDb.js';
+import { discordUsername } from '../exec/username.js';
 async function listUsers(interaction, guild, group) {
     await guild.members.fetch();
     const userList = group.map((userId) => {
@@ -23,7 +26,7 @@ async function dbPrep(interaction) {
         const rawData = fs.readFileSync(Config.databasePath, 'utf-8');
         const db = JSON.parse(rawData);
         if (typeof db !== 'object' || db === null)
-            throw new Error();
+            throw new Error('Database could not be read or parsed.');
         return db;
     }
     catch {
@@ -43,16 +46,17 @@ export async function localUserAutocomplete(interaction, queues) {
     }
     const focusedValue = interaction.options.getFocused();
     const payload = {
-        user: ROOT_UID,
+        user: INTERNAL_UID,
+        username: INTERNAL_UNAME,
         cmd: `grep -vE ':(/usr/sbin/nologin|/bin/false|/sbin/nologin)$' /etc/passwd | cut -d: -f1 | grep -F -- "${shellEscape([focusedValue])}" | head -n 5`,
     };
     queueUtils.addToAll(queues, payload);
-    const res = await post(payload, false);
+    const res = await post(payload, false, true);
     queueUtils.removeFromAll(queues, payload);
     const items = res.data
         .toString('utf-8')
         .split('\n')
-        .filter((item) => item.trim());
+        .filter((item) => item.trim() !== '');
     if (items.length === 0) {
         items.push(focusedValue);
     }
@@ -71,11 +75,12 @@ const LOCAL_USER_SUCCESS = 'true';
 async function localUserHandler(localUser, propagate, operation, queue) {
     if (operation) {
         const payload = {
-            user: ROOT_UID,
+            user: INTERNAL_UID,
+            username: INTERNAL_UNAME,
             cmd: `id -u ${shellEscape([localUser])}`,
         };
         queueUtils.addToAll(queue, payload);
-        const res = await post(payload, false);
+        const res = await post(payload, false, true);
         queueUtils.removeFromAll(queue, payload);
         let userExists = true;
         if (res.data.toString('utf-8').trim().startsWith('id: ')) {
@@ -84,29 +89,29 @@ async function localUserHandler(localUser, propagate, operation, queue) {
         if (propagate) {
             if (!userExists) {
                 const payload = {
-                    user: ROOT_UID,
+                    user: INTERNAL_UID,
+                    username: INTERNAL_UNAME,
                     cmd: `useradd -m ${shellEscape([localUser])}`,
                 };
                 queueUtils.addToAll(queue, payload);
-                await post(payload, false);
+                await post(payload, false, true);
                 queueUtils.removeFromAll(queue, payload);
                 return LOCAL_USER_SUCCESS;
             }
         }
-        else {
-            if (!userExists) {
-                return LOCAL_USER_FAILED;
-            }
+        else if (!userExists) {
+            return LOCAL_USER_FAILED;
         }
     }
     else {
         if (propagate) {
             const payload = {
-                user: ROOT_UID,
+                user: INTERNAL_UID,
+                username: INTERNAL_UNAME,
                 cmd: `id -u ${shellEscape([localUser])} >/dev/null 2>&1 && userdel -r ${shellEscape([localUser])} >/dev/null 2>&1`,
             };
             queueUtils.addToAll(queue, payload);
-            void post(payload, false);
+            void post(payload, false, true);
             queueUtils.removeFromAll(queue, payload);
         }
         return LOCAL_USER_SUCCESS;
@@ -116,7 +121,7 @@ async function localUserHandler(localUser, propagate, operation, queue) {
 function truncUname(input) {
     const MAX_LEN = 32;
     input = input.toLowerCase().trim();
-    input = input.replace(/[^a-z0-9_.]/g, '');
+    input = input.replaceAll(/[^a-z0-9_.]/g, '');
     if (input.length > MAX_LEN) {
         return input.substring(0, MAX_LEN);
     }
@@ -175,12 +180,18 @@ export async function handleAdmin(interaction, subcommand, username, queues, cli
             await rootCommand(interaction);
             break;
         }
+        case COMMON.RESET: {
+            destroyTerminalForUser(ROOT_UID);
+            await interaction.editReply({ content: COMMON.PTY_RESET_SUCCESS });
+            break;
+        }
         case COMMON.HELP: {
             await interaction.editReply({ content: COMMON.HELP_ADMIN });
             break;
         }
     }
     async function kill(interaction) {
+        logger.info(COMMON.ADMIN_KILL_LOG(discordUsername(interaction)));
         await interaction.editReply({
             content: COMMON.SHUTDOWN_MSG,
         });
@@ -188,16 +199,19 @@ export async function handleAdmin(interaction, subcommand, username, queues, cli
     }
     async function mode(interaction) {
         const standalone = interaction.options.getBoolean(COMMON.STANDALONE, true);
+        let switchHappened = false;
         let pingRes = '';
-        if (!standalone) {
-            pingRes = await ping();
-        }
         if (Config.standalone && !standalone) {
             Config.ipcServer = startIPCServer(queues);
+            logger.info(COMMON.MODE_SWITCH_LOG(discordUsername(interaction), 'backend'));
+            pingRes = await ping();
+            switchHappened = true;
         }
         else if (!Config.standalone && standalone) {
             Config.ipcServer.close();
+            logger.info(COMMON.MODE_SWITCH_LOG(discordUsername(interaction), 'standalone'));
             Config.ipcServer = null;
+            switchHappened = true;
         }
         const db = await dbPrep(interaction);
         if (!db)
@@ -207,6 +221,8 @@ export async function handleAdmin(interaction, subcommand, username, queues, cli
         await interaction.editReply({
             content: COMMON.MODE_REPLY(standalone, pingRes),
         });
+        if (switchHappened)
+            await syncTerminalsWithConfig(true, queues);
     }
     async function safemode(interaction) {
         const enabled = interaction.options.getBoolean(COMMON.CMD_VAL, true);
@@ -215,6 +231,7 @@ export async function handleAdmin(interaction, subcommand, username, queues, cli
             return;
         db.safemode = enabled;
         dbClose(db, queues);
+        logger.info(COMMON.SAFEMODE_SWITCHED_LOG(discordUsername(interaction), enabled));
         await interaction.editReply({
             content: COMMON.SAFEMODE_REPLY(enabled),
         });
@@ -228,6 +245,7 @@ export async function handleAdmin(interaction, subcommand, username, queues, cli
         let localUser = interaction.options.getString(COMMON.LOCAL_USER, false)?.trim() ?? userObj.username;
         const propagate = interaction.options.getBoolean(COMMON.PROPAGATE, false) ?? COMMON.DEFAULT_PROPAGATE;
         const adminAsWell = interaction.options.getBoolean(COMMON.ADMIN_AS_WELL, false) ?? COMMON.DEFAULT_ADMIN_AS_WELL;
+        logger.info(COMMON.USERMGMT_LOG(discordUsername(interaction), operation, targetUser, localUser, propagate, adminAsWell));
         let deleteUser = false;
         const db = await dbPrep(interaction);
         if (!db)
@@ -247,13 +265,14 @@ export async function handleAdmin(interaction, subcommand, username, queues, cli
             await interaction.editReply({
                 content: COMMON.ADMIN_OPS(targetUser, localUser, true, existed, false),
             });
-            if (!adminAsWell)
-                await sendDM(client, userId, COMMON.USER_GREETING(targetUser, localUser, guildName));
-            else {
+            if (adminAsWell) {
                 dbClose(db, queues);
                 await new Promise((r) => setTimeout(r, 2000));
                 await adminMgmt(interaction, client);
             }
+            else {
+                await sendDM(client, userId, COMMON.USER_GREETING(targetUser, localUser, guildName));
+            }
         }
         else {
             if (Object.keys(db.users).length === 1) {
@@ -281,6 +300,7 @@ export async function handleAdmin(interaction, subcommand, username, queues, cli
         }
         if (!adminAsWell)
             dbClose(db, queues);
+        await syncTerminalsWithConfig(false, queues);
     }
     async function adminMgmt(interaction, client) {
         const userObj = interaction.options.getUser(COMMON.USER, true);
@@ -288,6 +308,7 @@ export async function handleAdmin(interaction, subcommand, username, queues, cli
         const targetUser = userObj.username;
         const userId = userObj.id;
         const operation = interaction.options.getBoolean(COMMON.OPERATION, true);
+        logger.info(COMMON.ADMINMGMT_LOG(discordUsername(interaction), operation, targetUser));
         if (!Config.allowedUsers.includes(userId)) {
             await interaction.editReply({
                 content: COMMON.NOT_IN_USERLIST_ERR(targetUser),
@@ -328,6 +349,7 @@ export async function handleAdmin(interaction, subcommand, username, queues, cli
         const channelId = channel.id;
         const channelName = channel.name;
         const operation = interaction.options.getBoolean(COMMON.OPERATION, true);
+        logger.info(COMMON.CHMGMT_LOG(discordUsername(interaction), operation, channelName));
         const db = await dbPrep(interaction);
         if (!db)
             return;
@@ -361,13 +383,16 @@ export async function handleAdmin(interaction, subcommand, username, queues, cli
             return;
         db.lockdown = enabled;
         dbClose(db, queues);
+        logger.info(COMMON.LOCKDOWN_SWITCHED_LOG(discordUsername(interaction), enabled));
         await interaction.editReply({
             content: COMMON.LOCKDOWN_REPLY(enabled),
         });
     }
     async function rootCommand(interaction) {
-        const command = interaction.options.getString(COMMON.CMD, true);
-        const payload = { user: ROOT_UID, cmd: command };
+        let command = interaction.options.getString(COMMON.CMD, false);
+        if (!command || command.trim().length === 0)
+            command = '';
+        const payload = { user: ROOT_UID, username: discordUsername(interaction), cmd: command };
         queueUtils.addToAll(queues, payload);
         await execCommand(payload, interaction, command, username, 0, queues);
     }

package/dist/modules/admin.js.map

@@ -1 +1 @@
-{"version":3,"file":"admin.js","sourceRoot":"","sources":["../../src/modules/admin.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGvD,OAAO,KAAK,UAAU,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,WAAW,MAAM,cAAc,CAAC;AAGvC,OAAO,KAAK,MAAM,MAAM,cAAc,CAAC;AAGvC,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAG/C,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAG1C,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAGpD,KAAK,UAAU,SAAS,CAAC,WAAmD,EAAE,KAAY,EAAE,KAAe;IAEzG,MAAM,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IAG5B,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACpC,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC/C,MAAM,WAAW,GAAG,MAAM,EAAE,QAAQ,IAAI,MAAM,EAAE,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC;QACpE,OAAO,MAAM,CAAC,CAAC,CAAC,IAAI,WAAW,KAAK,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,YAAY,KAAK,MAAM,GAAG,CAAC;IACvF,CAAC,CAAC,CAAC;IAEH,MAAM,WAAW,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,gBAAgB,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,EAAE,CAAC,CAAC;AAC7F,CAAC;AAGD,KAAK,UAAU,MAAM,CAAC,WAAmD;IACvE,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAC9D,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAO,CAAC;QAErC,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,EAAE,KAAK,IAAI;YAAE,MAAM,IAAI,KAAK,EAAE,CAAC;QAC7D,OAAO,EAAE,CAAC;IACZ,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,WAAW,CAAC,SAAS,CAAC;YAC1B,OAAO,EAAE,MAAM,CAAC,MAAM;SACvB,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,OAAO,CAAC,EAAM,EAAE,MAAqB;IAC5C,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IAC5E,UAAU,CAAC,MAAM,CAAC,CAAC;AACrB,CAAC;AAGD,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,WAA+C,EAAE,MAAqB;IAEhH,IAAI,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;QACxI,OAAO;IACT,CAAC;IAGD,MAAM,YAAY,GAAG,WAAW,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;IAGtD,MAAM,OAAO,GAAsB;QACjC,IAAI,EAAE,QAAQ;QACd,GAAG,EAAE,qGAAqG,WAAW,CAAC,CAAC,YAAY,CAAC,CAAC,eAAe;KACrJ,CAAC;IAEF,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACvC,UAAU,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAE1C,MAAM,KAAK,GAAc,GAAG,CAAC,IAAe;SACzC,QAAQ,CAAC,OAAO,CAAC;SACjB,KAAK,CAAC,IAAI,CAAC;SACX,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IAGjC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC3B,CAAC;IAGD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;IAE3E,MAAM,WAAW,CAAC,OAAO,CACvB,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QACrB,IAAI,EAAE,MAAM,GAAG,MAAM;QACrB,KAAK,EAAE,MAAM;KACd,CAAC,CAAC,CACJ,CAAC;AACJ,CAAC;AAGD,KAAK,UAAU,MAAM,CAAC,MAAc,EAAE,MAAc,EAAE,OAAe;IACnE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAE9C,KAAK,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC1B,CAAC;AAGD,MAAM,iBAAiB,GAAG,OAAO,CAAC;AAClC,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAElC,KAAK,UAAU,gBAAgB,CAAC,SAAiB,EAAE,SAAkB,EAAE,SAAkB,EAAE,KAAoB;IAC7G,IAAI,SAAS,EAAE,CAAC;QAEd,MAAM,OAAO,GAAsB;YACjC,IAAI,EAAE,QAAQ;YACd,GAAG,EAAE,SAAS,WAAW,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE;SACzC,CAAC;QAEF,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACpC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACvC,UAAU,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAEzC,IAAI,UAAU,GAAG,IAAI,CAAC;QACtB,IAAK,GAAG,CAAC,IAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YACrE,UAAU,GAAG,KAAK,CAAC;QACrB,CAAC;QAED,IAAI,SAAS,EAAE,CAAC;YACd,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,MAAM,OAAO,GAAsB;oBACjC,IAAI,EAAE,QAAQ;oBACd,GAAG,EAAE,cAAc,WAAW,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE;iBAC9C,CAAC;gBAEF,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;gBACpC,MAAM,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;gBAC3B,UAAU,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;gBAEzC,OAAO,kBAAkB,CAAC;YAC5B,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,OAAO,iBAAiB,CAAC;YAC3B,CAAC;QACH,CAAC;IACH,CAAC;SAAM,CAAC;QAEN,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,OAAO,GAAsB;gBACjC,IAAI,EAAE,QAAQ;gBACd,GAAG,EAAE,SAAS,WAAW,CAAC,CAAC,SAAS,CAAC,CAAC,kCAAkC,WAAW,CAAC,CAAC,SAAS,CAAC,CAAC,kBAAkB;aACnH,CAAC;YAEF,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YACpC,KAAK,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC1B,UAAU,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC3C,CAAC;QAED,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAED,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAGD,SAAS,UAAU,CAAC,KAAa;IAC/B,MAAM,OAAO,GAAW,EAAE,CAAC;IAE3B,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;IAGnC,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;IAE1C,IAAI,KAAK,CAAC,MAAM,GAAG,OAAO,EAAE,CAAC;QAC3B,OAAO,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IACrC,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAGD,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,WAAmD,EACnD,UAAkB,EAClB,QAAgB,EAChB,MAAqB,EACrB,MAAc;IAGd,MAAM,WAAW,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;IAG5C,MAAM,KAAK,GAAG,WAAW,CAAC,KAAM,CAAC;IAGjC,QAAQ,UAAU,EAAE,CAAC;QACnB,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;YACjB,MAAM,IAAI,CAAC,WAAW,CAAC,CAAC;YACxB,MAAM;QACR,CAAC;QACD,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;YACjB,MAAM,IAAI,CAAC,WAAW,CAAC,CAAC;YACxB,MAAM;QACR,CAAC;QACD,KAAK,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;YACrB,MAAM,QAAQ,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM;QACR,CAAC;QACD,KAAK,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YAClB,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;YACtE,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YAC5E,MAAM,UAAU,GAAW,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC;YAEtG,MAAM,QAAQ,GAAW,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,gBAAgB,CAAC;YAC3G,MAAM,cAAc,GAAY,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,qBAAqB,CAAC;YACtH,MAAM,YAAY,CAAC,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC;YACtE,MAAM;QACR,CAAC;QACD,KAAK,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;YACtB,MAAM,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YACpC,MAAM;QACR,CAAC;QACD,KAAK,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;YAChB,MAAM,SAAS,CAAC,WAAW,EAAE,KAAK,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;YACzD,MAAM;QACR,CAAC;QACD,KAAK,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;YACvB,MAAM,SAAS,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YACrC,MAAM;QACR,CAAC;QACD,KAAK,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;YAChB,MAAM,SAAS,CAAC,WAAW,EAAE,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;YACvD,MAAM;QACR,CAAC;QACD,KAAK,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;YACpB,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC;YAC1B,MAAM;QACR,CAAC;QACD,KAAK,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;YACrB,MAAM,QAAQ,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM;QACR,CAAC;QACD,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;YACjB,MAAM,WAAW,CAAC,WAAW,CAAC,CAAC;YAC/B,MAAM;QACR,CAAC;QACD,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;YACjB,MAAM,WAAW,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;YAC5D,MAAM;QACR,CAAC;IACH,CAAC;IAGD,KAAK,UAAU,IAAI,CAAC,WAAmD;QACrE,MAAM,WAAW,CAAC,SAAS,CAAC;YAC1B,OAAO,EAAE,MAAM,CAAC,YAAY;SAC7B,CAAC,CAAC;QAEH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAGD,KAAK,UAAU,IAAI,CAAC,WAAmD;QACrE,MAAM,UAAU,GAAG,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAI3E,IAAI,OAAO,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,GAAG,MAAM,IAAI,EAAE,CAAC;QACzB,CAAC;QAGD,IAAI,MAAM,CAAC,UAAU,IAAI,CAAC,UAAU,EAAE,CAAC;YACrC,MAAM,CAAC,SAAS,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;QAC5C,CAAC;aAAM,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,UAAU,EAAE,CAAC;YAC5C,MAAM,CAAC,SAAU,CAAC,KAAK,EAAE,CAAC;YAC1B,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC;QAC1B,CAAC;QAGD,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC;QACrC,IAAI,CAAC,EAAE;YAAE,OAAO;QAChB,EAAE,CAAC,UAAU,GAAG,UAAU,CAAC;QAC3B,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QAEpB,MAAM,WAAW,CAAC,SAAS,CAAC;YAC1B,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE,OAAO,CAAC;SAChD,CAAC,CAAC;IACL,CAAC;IAGD,KAAK,UAAU,QAAQ,CAAC,WAAmD;QACzE,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAGrE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC;QACrC,IAAI,CAAC,EAAE;YAAE,OAAO;QAChB,EAAE,CAAC,QAAQ,GAAG,OAAO,CAAC;QACtB,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QAEpB,MAAM,WAAW,CAAC,SAAS,CAAC;YAC1B,OAAO,EAAE,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC;SACxC,CAAC,CAAC;IACL,CAAC;IAGD,KAAK,UAAU,QAAQ,CAAC,WAAmD,EAAE,MAAc;QACzF,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC/D,MAAM,SAAS,GAAG,WAAW,CAAC,KAAM,CAAC,IAAI,CAAC;QAC1C,MAAM,UAAU,GAAW,OAAO,CAAC,QAAQ,CAAC;QAC5C,MAAM,MAAM,GAAG,OAAO,CAAC,EAAE,CAAC;QAC1B,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QACzE,IAAI,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,OAAO,CAAC,QAAQ,CAAC;QACpG,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,iBAAiB,CAAC;QACtG,MAAM,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,aAAa,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,qBAAqB,CAAC;QAEhH,IAAI,UAAU,GAAG,KAAK,CAAC;QAEvB,MAAM,EAAE,GAAe,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC;QACjD,IAAI,CAAC,EAAE;YAAE,OAAO;QAEhB,IAAI,SAAS,EAAE,CAAC;YAEd,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE,IAAI,EAAE;gBAAE,SAAS,GAAG,UAAU,CAAC,MAAM,CAAC,YAAY,GAAG,GAAG,GAAG,UAAU,CAAC,CAAC;YAGrI,MAAM,GAAG,GAAW,MAAM,gBAAgB,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;YACpF,IAAI,GAAG,KAAK,iBAAiB,EAAE,CAAC;gBAC9B,MAAM,WAAW,CAAC,SAAS,CAAC;oBAC1B,OAAO,EAAE,MAAM,CAAC,qBAAqB,CAAC,SAAS,CAAC;iBACjD,CAAC,CAAC;gBACH,OAAO;YACT,CAAC;YAED,MAAM,OAAO,GAAY,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,SAAS,CAAC;YACxD,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;YAC7B,MAAM,WAAW,CAAC,SAAS,CAAC;gBAC1B,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC;aACvE,CAAC,CAAC;YAEH,IAAI,CAAC,WAAW;gBAAE,MAAM,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,aAAa,CAAC,UAAU,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;iBAClG,CAAC;gBACJ,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;gBACpB,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;gBAC9C,MAAM,SAAS,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YACvC,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACvC,MAAM,WAAW,CAAC,SAAS,CAAC;oBAC1B,OAAO,EAAE,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC;iBAC/C,CAAC,CAAC;gBACH,OAAO;YACT,CAAC;iBAAM,CAAC;gBACN,IAAI,MAAM,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC;oBAEvB,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;wBACnC,EAAE,CAAC,UAAU,GAAG,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC;wBAC1D,MAAM,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC;oBACjE,CAAC;oBAGD,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,SAAS,CAAC;oBACvG,IAAI,UAAU;wBAAE,MAAM,gBAAgB,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;oBAElF,OAAO,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;oBAExB,MAAM,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC;gBAChE,CAAC;gBACD,MAAM,WAAW,CAAC,SAAS,CAAC;oBAC1B,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC;iBAC3E,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,IAAI,CAAC,WAAW;YAAE,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IACxC,CAAC;IAGD,KAAK,UAAU,SAAS,CAAC,WAAmD,EAAE,MAAc;QAC1F,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC/D,MAAM,SAAS,GAAG,WAAW,CAAC,KAAM,CAAC,IAAI,CAAC;QAC1C,MAAM,UAAU,GAAW,OAAO,CAAC,QAAQ,CAAC;QAC5C,MAAM,MAAM,GAAG,OAAO,CAAC,EAAE,CAAC;QAC1B,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAGzE,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1C,MAAM,WAAW,CAAC,SAAS,CAAC;gBAC1B,OAAO,EAAE,MAAM,CAAC,mBAAmB,CAAC,UAAU,CAAC;aAChD,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC;QACrC,IAAI,CAAC,EAAE;YAAE,OAAO;QAEhB,IAAI,SAAS,EAAE,CAAC;YACd,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBACpC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC3B,MAAM,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;YAC/F,CAAC;YACD,MAAM,WAAW,CAAC,SAAS,CAAC;gBAC1B,OAAO,EAAE,MAAM,CAAC,eAAe,CAAC,UAAU,EAAE,IAAI,CAAC;aAClD,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,IAAI,EAAE,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC/B,MAAM,WAAW,CAAC,SAAS,CAAC;oBAC1B,OAAO,EAAE,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC;iBAC/C,CAAC,CAAC;gBACH,OAAO;YACT,CAAC;iBAAM,CAAC;gBACN,EAAE,CAAC,UAAU,GAAG,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,MAAM,CAAC,CAAC;gBAC5D,MAAM,WAAW,CAAC,SAAS,CAAC;oBAC1B,OAAO,EAAE,MAAM,CAAC,eAAe,CAAC,UAAU,EAAE,KAAK,CAAC;iBACnD,CAAC,CAAC;gBAEH,MAAM,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC;YACjE,CAAC;QACH,CAAC;QAED,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IACtB,CAAC;IAGD,KAAK,UAAU,MAAM,CAAC,WAAmD;QACvE,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACrE,MAAM,SAAS,GAAG,OAAO,CAAC,EAAE,CAAC;QAC7B,MAAM,WAAW,GAAG,OAAO,CAAC,IAAK,CAAC;QAClC,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAEzE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC;QACrC,IAAI,CAAC,EAAE;YAAE,OAAO;QAEhB,IAAI,SAAS,EAAE,CAAC;YACd,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,QAAQ,CAAC,SAAS,CAAC;gBAAE,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAChF,MAAM,WAAW,CAAC,SAAS,CAAC;gBAC1B,OAAO,EAAE,MAAM,CAAC,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC;aAChD,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,IAAI,EAAE,CAAC,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACpC,MAAM,WAAW,CAAC,SAAS,CAAC;oBAC1B,OAAO,EAAE,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC;iBACjD,CAAC,CAAC;gBACH,OAAO;YACT,CAAC;iBAAM,CAAC;gBACN,EAAE,CAAC,eAAe,GAAG,EAAE,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC;gBACzE,MAAM,WAAW,CAAC,SAAS,CAAC;oBAC1B,OAAO,EAAE,MAAM,CAAC,YAAY,CAAC,WAAW,EAAE,KAAK,CAAC;iBACjD,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IACtB,CAAC;IAGD,KAAK,UAAU,QAAQ,CAAC,WAAmD;QACzE,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAGrE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC;QACrC,IAAI,CAAC,EAAE;YAAE,OAAO;QAChB,EAAE,CAAC,QAAQ,GAAG,OAAO,CAAC;QACtB,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QAEpB,MAAM,WAAW,CAAC,SAAS,CAAC;YAC1B,OAAO,EAAE,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC;SACxC,CAAC,CAAC;IACL,CAAC;IAGD,KAAK,UAAU,WAAW,CAAC,WAAmD;QAC5E,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAChE,MAAM,OAAO,GAAsB,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC;QAGpE,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACrC,MAAM,WAAW,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;IAExE,CAAC;AACH,CAAC"}
+{"version":3,"file":"admin.js","sourceRoot":"","sources":["../../src/modules/admin.ts"],"names":[],"mappings":"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"}

package/dist/modules/clear.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clear.d.ts","sourceRoot":"","sources":["../../src/modules/clear.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,SAAS,EAAW,MAAM,YAAY,CAAC;AAOlF,wBAAsB,YAAY,CAChC,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,2BAA2B,CAAC,SAAS,CAAC,EACnD,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,OAAO,GACtB,OAAO,CAAC,IAAI,CAAC,CAwDf"}
+{"version":3,"file":"clear.d.ts","sourceRoot":"","sources":["../../src/modules/clear.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,SAAS,EAAW,MAAM,YAAY,CAAC;AAOlF,wBAAsB,YAAY,CAChC,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,2BAA2B,CAAC,SAAS,CAAC,EACnD,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,OAAO,GACtB,OAAO,CAAC,IAAI,CAAC,CAsDf"}

package/dist/modules/clear.js

@@ -3,9 +3,8 @@ const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 export async function clearHistory(lookback, interaction, username, sendSuccessMsg) {
     let loop = true;
     let deleteCount = 0;
-    if (username === COMMON.CLEAR_ALL_USER) {
+    if (username === COMMON.CLEAR_ALL_USER)
         username = '';
-    }
     while (loop) {
         const messages = await interaction.channel?.messages.fetch({ limit: 100 });
         if (!messages) {
@@ -14,20 +13,20 @@ export async function clearHistory(lookback, interaction, username, sendSuccessM
         }
         const filtered = [...messages.values()]
             .filter((m) => m.author.id === interaction.client.user?.id)
-            .filter((m) => m.content.includes(`@${username}`))
+            .filter((m) => m.content.includes(`${username}`))
             .sort((a, b) => b.createdTimestamp - a.createdTimestamp);
         const toDelete = lookback === -1 ? filtered : filtered.slice(0, lookback);
-        if (toDelete.length !== 0) {
+        if (toDelete.length == 0) {
+            loop = false;
+        }
+        else {
             const deletions = toDelete.map((m) => m.delete().catch(() => null));
             await Promise.all(deletions);
             deleteCount += toDelete.length;
             lookback = Math.max(0, lookback - toDelete.length);
             loop = lookback !== 0;
         }
-        else {
-            loop = false;
-        }
-        await sleep(500);
+        await sleep(100);
     }
     if (sendSuccessMsg) {
         if (username === COMMON.CLEAR_ALL_USER) {

package/dist/modules/clear.js.map

@@ -1 +1 @@
-{"version":3,"file":"clear.js","sourceRoot":"","sources":["../../src/modules/clear.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"clear.js","sourceRoot":"","sources":["../../src/modules/clear.ts"],"names":[],"mappings":"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"}

package/dist/modules/command.d.ts

@@ -1,5 +1,5 @@
 import type { ChatInputCommandInteraction, CacheType } from 'discord.js';
 import type { ICommandQueueItem } from '../shared/interfaces.js';
-import type { CommandQueues } from '../types/queues.js';
+import type { CommandQueues } from '../interfaces/queues.js';
 export declare function execCommand(payload: ICommandQueueItem, interaction: ChatInputCommandInteraction<CacheType>, userCmd: string, username: string, prefixChoice: number, queues: CommandQueues, silent?: boolean): Promise<string>;
 //# sourceMappingURL=command.d.ts.map

package/dist/modules/command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/modules/command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAazE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAMxD,wBAAsB,WAAW,CAC/B,OAAO,EAAE,iBAAiB,EAC1B,WAAW,EAAE,2BAA2B,CAAC,SAAS,CAAC,EACnD,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,aAAa,EACrB,MAAM,GAAE,OAAe,GACtB,OAAO,CAAC,MAAM,CAAC,CAwDjB"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/modules/command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAazE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAM7D,wBAAsB,WAAW,CAC/B,OAAO,EAAE,iBAAiB,EAC1B,WAAW,EAAE,2BAA2B,CAAC,SAAS,CAAC,EACnD,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,aAAa,EACrB,MAAM,GAAE,OAAe,GACtB,OAAO,CAAC,MAAM,CAAC,CAwDjB"}

package/dist/modules/command.js

@@ -1,6 +1,6 @@
-import * as queueUtils from '../tools/queue-utils.js';
-import { post } from '../tools/backend.js';
-import { Config } from '../config.js';
+import * as queueUtils from '../security/queue-utils.js';
+import { post } from '../exec/backend.js';
+import { Config } from '../config/config.js';
 import * as COMMON from '../common.js';
 const READ_BIN_OVERRIDE = Config.readBinOverride.map((bin) => `${bin} `);
 export async function execCommand(payload, interaction, userCmd, username, prefixChoice, queues, silent = false) {
@@ -28,10 +28,10 @@ export async function execCommand(payload, interaction, userCmd, username, prefi
             return reply;
         }
         else {
-            const res = await post(payload, false);
+            const res = await post(payload, false, prefixChoice === 1 ? true : silent);
             const resString = res.data.toString('utf-8').trim();
             const replyContent = resString === COMMON.BACKEND_EXEC_ERR ? COMMON.BACKEND_EXEC_ERR_OVERRIDE : resString;
-            const replyContentFormatted = replyPrefix + replyContent;
+            const replyContentFormatted = replyContent;
             if (!silent) {
                 await interaction.editReply({
                     content: '```plaintext\n' + replyContentFormatted + '\n```',

package/dist/modules/command.js.map

@@ -1 +1 @@
-{"version":3,"file":"command.js","sourceRoot":"","sources":["../../src/modules/command.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,UAAU,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAG3C,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAGtC,OAAO,KAAK,MAAM,MAAM,cAAc,CAAC;AAQvC,MAAM,iBAAiB,GAAa,MAAM,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC;AAEnF,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,OAA0B,EAC1B,WAAmD,EACnD,OAAe,EACf,QAAgB,EAChB,YAAoB,EACpB,MAAqB,EACrB,SAAkB,KAAK;IAEvB,IAAI,WAAW,GAAW,EAAE,CAAC;IAG7B,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;QACvB,WAAW,GAAG,MAAM,CAAC,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC1D,CAAC;SAEI,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;QAC5B,WAAW,GAAG,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAGhD,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,CAAC;IAED,IAAI,CAAC;QAEH,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YAC3D,MAAM,KAAK,GAAW,MAAM,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;YAC3D,MAAM,WAAW,CAAC,SAAS,CAAC;gBAC1B,OAAO,EAAE,KAAK;aACf,CAAC,CAAC;YACH,OAAO,KAAK,CAAC;QACf,CAAC;aAEI,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YACpC,MAAM,KAAK,GAAW,MAAM,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;YAC9D,MAAM,WAAW,CAAC,SAAS,CAAC;gBAC1B,OAAO,EAAE,KAAK;aACf,CAAC,CAAC;YACH,OAAO,KAAK,CAAC;QACf,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAEvC,MAAM,SAAS,GAAY,GAAG,CAAC,IAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;YACxE,MAAM,YAAY,GAAG,SAAS,KAAK,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,MAAM,CAAC,yBAAyB,CAAC,CAAC,CAAC,SAAS,CAAC;YAC1G,MAAM,qBAAqB,GAAG,WAAW,GAAG,YAAY,CAAC;YAGzD,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,WAAW,CAAC,SAAS,CAAC;oBAC1B,OAAO,EAAE,gBAAgB,GAAG,qBAAqB,GAAG,OAAO;iBAC5D,CAAC,CAAC;YACL,CAAC;YAED,OAAO,YAAY,CAAC;QACtB,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,WAAW,CAAC,SAAS,CAAC;YAC1B,OAAO,EAAE,MAAM,CAAC,WAAW;SAC5B,CAAC,CAAC;QACH,OAAO,MAAM,CAAC,WAAW,CAAC;IAC5B,CAAC;YAAS,CAAC;QAET,UAAU,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,CAAC;AACH,CAAC"}
+{"version":3,"file":"command.js","sourceRoot":"","sources":["../../src/modules/command.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAG1C,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAG7C,OAAO,KAAK,MAAM,MAAM,cAAc,CAAC;AAQvC,MAAM,iBAAiB,GAAa,MAAM,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC;AAEnF,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,OAA0B,EAC1B,WAAmD,EACnD,OAAe,EACf,QAAgB,EAChB,YAAoB,EACpB,MAAqB,EACrB,SAAkB,KAAK;IAEvB,IAAI,WAAW,GAAW,EAAE,CAAC;IAG7B,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;QACvB,WAAW,GAAG,MAAM,CAAC,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC1D,CAAC;SAEI,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;QAC5B,WAAW,GAAG,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAGhD,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,CAAC;IAED,IAAI,CAAC;QAEH,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YAC3D,MAAM,KAAK,GAAW,MAAM,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;YAC3D,MAAM,WAAW,CAAC,SAAS,CAAC;gBAC1B,OAAO,EAAE,KAAK;aACf,CAAC,CAAC;YACH,OAAO,KAAK,CAAC;QACf,CAAC;aAEI,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YACpC,MAAM,KAAK,GAAW,MAAM,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;YAC9D,MAAM,WAAW,CAAC,SAAS,CAAC;gBAC1B,OAAO,EAAE,KAAK;aACf,CAAC,CAAC;YACH,OAAO,KAAK,CAAC;QACf,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YAE3E,MAAM,SAAS,GAAY,GAAG,CAAC,IAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;YACxE,MAAM,YAAY,GAAG,SAAS,KAAK,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,MAAM,CAAC,yBAAyB,CAAC,CAAC,CAAC,SAAS,CAAC;YAC1G,MAAM,qBAAqB,GAAG,YAAY,CAAC;YAG3C,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,WAAW,CAAC,SAAS,CAAC;oBAC1B,OAAO,EAAE,gBAAgB,GAAG,qBAAqB,GAAG,OAAO;iBAC5D,CAAC,CAAC;YACL,CAAC;YAED,OAAO,YAAY,CAAC;QACtB,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,WAAW,CAAC,SAAS,CAAC;YAC1B,OAAO,EAAE,MAAM,CAAC,WAAW;SAC5B,CAAC,CAAC;QACH,OAAO,MAAM,CAAC,WAAW,CAAC;IAC5B,CAAC;YAAS,CAAC;QAET,UAAU,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,CAAC;AACH,CAAC"}

package/dist/modules/debug.d.ts

@@ -1,4 +1,4 @@
 import type { ChatInputCommandInteraction, CacheType, Client } from 'discord.js';
-import type { CommandQueues } from '../types/queues.js';
+import type { CommandQueues } from '../interfaces/queues.js';
 export declare function debug(interaction: ChatInputCommandInteraction<CacheType>, username: string, userId: string, queues: CommandQueues, client: Client<boolean>): Promise<void>;
 //# sourceMappingURL=debug.d.ts.map

package/dist/modules/debug.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"debug.d.ts","sourceRoot":"","sources":["../../src/modules/debug.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAOjF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAmBxD,wBAAsB,KAAK,CACzB,WAAW,EAAE,2BAA2B,CAAC,SAAS,CAAC,EACnD,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,GACtB,OAAO,CAAC,IAAI,CAAC,CA6Bf"}
+{"version":3,"file":"debug.d.ts","sourceRoot":"","sources":["../../src/modules/debug.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAOjF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAmB7D,wBAAsB,KAAK,CACzB,WAAW,EAAE,2BAA2B,CAAC,SAAS,CAAC,EACnD,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,GACtB,OAAO,CAAC,IAAI,CAAC,CA8Bf"}

package/dist/modules/debug.js

@@ -1,5 +1,5 @@
-import os from 'os';
-import { Config } from '../config.js';
+import os from 'node:os';
+import { Config } from '../config/config.js';
 function formatDate(seconds) {
     const days = Math.floor(seconds / 86400);
     const hours = Math.floor((seconds % 86400) / 3600);
@@ -23,6 +23,7 @@ export async function debug(interaction, username, userId, queues, client) {
         `Bot User:                 ${client.user.tag}\n` +
         `Command Queue Size (D):   ${queues.duplicateQueue.length}\n` +
         `Command Queue Size (V):   ${queues.validationQueue.length}\n` +
+        `User Rate Limit:          ${Config.userRateLimit}\n` +
         `Command Queue Max:        ${Config.cmdQueueMaxSize}\n` +
         `Backend URL:              ${Config.backend}\n` +
         `Database Path:            ${Config.databasePath}\n` +

package/dist/modules/debug.js.map

@@ -1 +1 @@
-{"version":3,"file":"debug.js","sourceRoot":"","sources":["../../src/modules/debug.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,IAAI,CAAC;AAGpB,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAMtC,SAAS,UAAU,CAAC,OAAe;IACjC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC;IACzC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,GAAG,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;IACnD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAClD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC;IAEtC,MAAM,IAAI,GAAG,EAAE,CAAC;IAEhB,IAAI,IAAI,GAAG,CAAC;QAAE,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC;IACpC,IAAI,KAAK,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM;QAAE,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;IACrD,IAAI,OAAO,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM;QAAE,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,GAAG,CAAC,CAAC;IACzD,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC;IAEtB,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACxB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,KAAK,CACzB,WAAmD,EACnD,QAAgB,EAChB,MAAc,EACd,MAAqB,EACrB,MAAuB;IAGvB,MAAM,iBAAiB,GAAa,MAAM,CAAC,eAAe,CAAC;IAG3D,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACvD,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC;IAGhD,MAAM,KAAK,GACT,8BAA8B,QAAQ,UAAU,MAAM,OAAO;QAC7D,6BAA6B,MAAM,CAAC,IAAK,CAAC,GAAG,IAAI;QACjD,6BAA6B,MAAM,CAAC,cAAc,CAAC,MAAM,IAAI;QAC7D,6BAA6B,MAAM,CAAC,eAAe,CAAC,MAAM,IAAI;QAC9D,6BAA6B,MAAM,CAAC,eAAe,IAAI;QACvD,6BAA6B,MAAM,CAAC,OAAO,IAAI;QAC/C,6BAA6B,MAAM,CAAC,YAAY,IAAI;QACpD,6BAA6B,MAAM,CAAC,WAAW,OAAO;QACtD,6BAA6B,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI;QAC9D,6BAA6B,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI;QAC7D,6BAA6B,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,IAAI;QACrE,6BAA6B,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,IAAI;QACnE,6BAA6B,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,IAAI;QACnE,6BAA6B,UAAU,CAAC,eAAe,CAAC,IAAI;QAC5D,6BAA6B,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;IAE/D,MAAM,WAAW,CAAC,SAAS,CAAC;QAC1B,OAAO,EAAE,gBAAgB,GAAG,KAAK,GAAG,OAAO;KAC5C,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"debug.js","sourceRoot":"","sources":["../../src/modules/debug.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,SAAS,CAAC;AAGzB,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAM7C,SAAS,UAAU,CAAC,OAAe;IACjC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC;IACzC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,GAAG,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;IACnD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAClD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC;IAEtC,MAAM,IAAI,GAAG,EAAE,CAAC;IAEhB,IAAI,IAAI,GAAG,CAAC;QAAE,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC;IACpC,IAAI,KAAK,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM;QAAE,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;IACrD,IAAI,OAAO,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM;QAAE,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,GAAG,CAAC,CAAC;IACzD,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC;IAEtB,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACxB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,KAAK,CACzB,WAAmD,EACnD,QAAgB,EAChB,MAAc,EACd,MAAqB,EACrB,MAAuB;IAGvB,MAAM,iBAAiB,GAAa,MAAM,CAAC,eAAe,CAAC;IAG3D,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACvD,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC;IAGhD,MAAM,KAAK,GACT,8BAA8B,QAAQ,UAAU,MAAM,OAAO;QAC7D,6BAA6B,MAAM,CAAC,IAAK,CAAC,GAAG,IAAI;QACjD,6BAA6B,MAAM,CAAC,cAAc,CAAC,MAAM,IAAI;QAC7D,6BAA6B,MAAM,CAAC,eAAe,CAAC,MAAM,IAAI;QAC9D,6BAA6B,MAAM,CAAC,aAAa,IAAI;QACrD,6BAA6B,MAAM,CAAC,eAAe,IAAI;QACvD,6BAA6B,MAAM,CAAC,OAAO,IAAI;QAC/C,6BAA6B,MAAM,CAAC,YAAY,IAAI;QACpD,6BAA6B,MAAM,CAAC,WAAW,OAAO;QACtD,6BAA6B,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI;QAC9D,6BAA6B,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI;QAC7D,6BAA6B,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,IAAI;QACrE,6BAA6B,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,IAAI;QACnE,6BAA6B,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,IAAI;QACnE,6BAA6B,UAAU,CAAC,eAAe,CAAC,IAAI;QAC5D,6BAA6B,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;IAE/D,MAAM,WAAW,CAAC,SAAS,CAAC;QAC1B,OAAO,EAAE,gBAAgB,GAAG,KAAK,GAAG,OAAO;KAC5C,CAAC,CAAC;AACL,CAAC"}

package/dist/modules/file.d.ts

@@ -1,9 +1,10 @@
 import type { ChatInputCommandInteraction, AutocompleteInteraction, CacheType, Attachment } from 'discord.js';
 import type { ICommandQueueItem } from '../shared/interfaces.js';
-import type { CommandQueues } from '../types/queues.js';
+import type { CommandQueues } from '../interfaces/queues.js';
 export declare function checkSize(bytes: number): boolean;
 export declare function read(interaction: ChatInputCommandInteraction<CacheType>, username: string, path: string, payload: ICommandQueueItem): Promise<void>;
 export declare function write(interaction: ChatInputCommandInteraction<CacheType>, username: string, file: Attachment, path: string, payload: ICommandQueueItem, queues: CommandQueues): Promise<void>;
-export declare function absPath(path: string, user: string, queues: CommandQueues): Promise<string>;
+export declare function absPath(fileName: string, path: string, user: string, queues: CommandQueues): Promise<string>;
+export declare function cwdPath(fileName: string, user: string, queues: CommandQueues): Promise<string>;
 export declare function pathAutocomplete(interaction: AutocompleteInteraction<CacheType>, queues: CommandQueues): Promise<void>;
 //# sourceMappingURL=file.d.ts.map

package/dist/modules/file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file.d.ts","sourceRoot":"","sources":["../../src/modules/file.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,uBAAuB,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAe9G,OAAO,KAAK,EAAE,iBAAiB,EAAqB,MAAM,yBAAyB,CAAC;AACpF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAYxD,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAKhD;AAED,wBAAsB,IAAI,CACxB,WAAW,EAAE,2BAA2B,CAAC,SAAS,CAAC,EACnD,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,IAAI,CAAC,CA8Df;AAED,wBAAsB,KAAK,CACzB,WAAW,EAAE,2BAA2B,CAAC,SAAS,CAAC,EACnD,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,iBAAiB,EAC1B,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,IAAI,CAAC,CAwDf;AAID,wBAAsB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAehG;AAGD,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,uBAAuB,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAiE5H"}
+{"version":3,"file":"file.d.ts","sourceRoot":"","sources":["../../src/modules/file.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,uBAAuB,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAe9G,OAAO,KAAK,EAAE,iBAAiB,EAAqB,MAAM,yBAAyB,CAAC;AACpF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAa7D,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAKhD;AAED,wBAAsB,IAAI,CACxB,WAAW,EAAE,2BAA2B,CAAC,SAAS,CAAC,EACnD,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,IAAI,CAAC,CA6Df;AAED,wBAAsB,KAAK,CACzB,WAAW,EAAE,2BAA2B,CAAC,SAAS,CAAC,EACnD,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,iBAAiB,EAC1B,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,IAAI,CAAC,CAyDf;AAKD,wBAAsB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAelH;AAGD,wBAAsB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAWpG;AAGD,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,uBAAuB,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAgF5H"}