diff --git a/db/initialize.ts b/db/initialize.ts index a988469..36363e3 100644 --- a/db/initialize.ts +++ b/db/initialize.ts @@ -1,7 +1,7 @@ // This file will create all tables for the artificer schema // DATA WILL BE LOST IF DB ALREADY EXISTS, RUN AT OWN RISK -import config from '/config.ts'; +import config from '~config'; import dbClient from 'db/client.ts'; console.log('Attempting to create DB'); diff --git a/db/populateDefaults.ts b/db/populateDefaults.ts index d2ab33e..a2cdb07 100644 --- a/db/populateDefaults.ts +++ b/db/populateDefaults.ts @@ -1,6 +1,6 @@ // This file will populate the tables with default values -import config from '../config.ts'; +import config from '..~config'; import dbClient from 'src/db/client.ts'; console.log('Attempting to populate DB Admin API key'); diff --git a/deno.json b/deno.json index cdca6c5..ebc0aba 100644 --- a/deno.json +++ b/deno.json @@ -27,7 +27,8 @@ "@std/http": "jsr:@std/http@1.0.15", "@nanoid": "https://deno.land/x/nanoid@v3.0.0/mod.ts", "@imagescript": "https://deno.land/x/imagescript@1.3.0/mod.ts", - "/": "./", + "~config": "./config.ts", + "~flags": "./flags.ts", "artigen/": "./src/artigen/", "commands/": "./src/commands/", "endpoints/": "./src/endpoints/", diff --git a/deno.lock b/deno.lock index 05a0ca1..b23d81a 100644 --- a/deno.lock +++ b/deno.lock @@ -834,5 +834,10 @@ "https://raw.githubusercontent.com/Burn-E99/Log4Deno/V2.1.1/mod.ts": "d9c38a41a405cf5732c9233c2391a1d7f5a12d0e464aace6f8f596fabf5f21ba", "https://raw.githubusercontent.com/Burn-E99/Log4Deno/V2.1.1/src/logger.ts": "b3a39724d58102dfbcdcd640a829cbfe1f083065060f68003f9c8fd49fdd658a", "https://unpkg.com/@evan/wasm@0.0.65/target/zlib/deno.js": "36cd3f1edd2f3a6d6fd4c2376f701c2748338c132703810d4866cfa52b5e7bf9" + }, + "workspace": { + "dependencies": [ + "jsr:@std/http@1.0.15" + ] } } diff --git a/mod.ts b/mod.ts index 8c18c53..b18fcf9 100644 --- a/mod.ts +++ b/mod.ts @@ -6,8 +6,8 @@ import { botId, cache, DiscordActivityTypes, DiscordenoGuild, DiscordenoMessage, editBotNickname, editBotStatus, Intents, sendMessage, startBot } from '@discordeno'; import { initLog, log, LogTypes as LT } from '@Log4Deno'; -import config from '/config.ts'; -import { DEBUG, DEVMODE, LOCALMODE } from '/flags.ts'; +import config from '~config'; +import { DEBUG, DEVMODE, LOCALMODE } from '~flags'; import commands from 'commands/_index.ts'; diff --git a/src/api.ts b/src/api.ts index 668c927..74c7e60 100644 --- a/src/api.ts +++ b/src/api.ts @@ -5,7 +5,7 @@ */ import { log, LogTypes as LT } from '@Log4Deno'; -import config from '/config.ts'; +import config from '~config'; import dbClient from 'db/client.ts'; diff --git a/src/artigen/managers/queueManager.ts b/src/artigen/managers/queueManager.ts index 19483ba..75d0630 100644 --- a/src/artigen/managers/queueManager.ts +++ b/src/artigen/managers/queueManager.ts @@ -1,6 +1,6 @@ import { log, LogTypes as LT } from '@Log4Deno'; -import config from '/config.ts'; +import config from '~config'; import { currentWorkers, handleRollWorker } from 'artigen/managers/workerManager.ts'; diff --git a/src/artigen/managers/workerManager.ts b/src/artigen/managers/workerManager.ts index 950b9e2..afdf8b5 100644 --- a/src/artigen/managers/workerManager.ts +++ b/src/artigen/managers/workerManager.ts @@ -1,8 +1,8 @@ import { DiscordenoMessage, sendDirectMessage, sendMessage } from '@discordeno'; import { log, LogTypes as LT } from '@Log4Deno'; -import config from '/config.ts'; -import { DEVMODE } from '/flags.ts'; +import config from '~config'; +import { DEVMODE } from '~flags'; import { loggingEnabled } from 'artigen/rollUtils.ts'; import { SolvedRoll } from 'artigen/solver.d.ts'; @@ -26,7 +26,7 @@ export const handleRollWorker = (rq: QueuedRoll) => { const gmModifiers = JSON.parse(JSON.stringify(rq.modifiers)); gmModifiers.gmRoll = false; - const rollWorker = new Worker(new URL('../artigen/rollWorker.ts', import.meta.url).href, { type: 'module' }); + const rollWorker = new Worker(new URL('../rollWorker.ts', import.meta.url).href, { type: 'module' }); const workerTimeout = setTimeout(async () => { rollWorker.terminate(); diff --git a/src/artigen/parser.ts b/src/artigen/parser.ts index 992c68a..63c00f1 100644 --- a/src/artigen/parser.ts +++ b/src/artigen/parser.ts @@ -1,6 +1,6 @@ import { log, LogTypes as LT } from '@Log4Deno'; -import config from '/config.ts'; +import config from '~config'; import { formatRoll } from 'artigen/rollFormatter.ts'; import { compareTotalRolls, compareTotalRollsReverse, escapeCharacters, legalMathOperators, loggingEnabled } from 'artigen/rollUtils.ts'; diff --git a/src/artigen/rollWorker.ts b/src/artigen/rollWorker.ts index eb0aa25..51c068b 100644 --- a/src/artigen/rollWorker.ts +++ b/src/artigen/rollWorker.ts @@ -1,6 +1,6 @@ import { closeLog, initLog } from '@Log4Deno'; -import { DEBUG } from '/flags.ts'; +import { DEBUG } from '~flags'; import { parseRoll } from 'artigen/parser.ts'; import { loggingEnabled } from 'artigen/rollUtils.ts'; diff --git a/src/artigen/roller.ts b/src/artigen/roller.ts index 8b49b9b..86f8c8b 100644 --- a/src/artigen/roller.ts +++ b/src/artigen/roller.ts @@ -1,6 +1,6 @@ import { log, LogTypes as LT } from '@Log4Deno'; -import config from '/config.ts'; +import config from '~config'; import { compareOrigIdx, compareRolls, genFateRoll, genRoll, loggingEnabled } from 'artigen/rollUtils.ts'; import { RollConf, RollSet, RollType } from 'artigen/solver.d.ts'; diff --git a/src/commandUtils.ts b/src/commandUtils.ts index ac88b7c..942c437 100644 --- a/src/commandUtils.ts +++ b/src/commandUtils.ts @@ -1,6 +1,6 @@ import { log, LogTypes as LT } from '@Log4Deno'; -import config from '/config.ts'; +import config from '~config'; import { loggingEnabled } from 'artigen/rollUtils.ts'; import { CountDetails, SolvedRoll } from 'artigen/solver.d.ts'; diff --git a/src/commands/apiCmd.ts b/src/commands/apiCmd.ts index 2f853c8..75bf490 100644 --- a/src/commands/apiCmd.ts +++ b/src/commands/apiCmd.ts @@ -1,6 +1,6 @@ import { DiscordenoMessage, hasGuildPermissions } from '@discordeno'; -import config from '/config.ts'; +import config from '~config'; import apiCommands from 'commands/apiCmd/_index.ts'; diff --git a/src/commands/apiCmd/apiHelp.ts b/src/commands/apiCmd/apiHelp.ts index 2a5d57d..f2b9642 100644 --- a/src/commands/apiCmd/apiHelp.ts +++ b/src/commands/apiCmd/apiHelp.ts @@ -1,6 +1,6 @@ import { DiscordenoMessage } from '@discordeno'; -import config from '/config.ts'; +import config from '~config'; import { infoColor1, infoColor2 } from 'src/commandUtils.ts'; import utils from 'src/utils.ts'; diff --git a/src/commands/apiCmd/deleteGuild.ts b/src/commands/apiCmd/deleteGuild.ts index 26f5e1d..ef2a2ba 100644 --- a/src/commands/apiCmd/deleteGuild.ts +++ b/src/commands/apiCmd/deleteGuild.ts @@ -1,6 +1,6 @@ import { DiscordenoMessage } from '@discordeno'; -import config from '/config.ts'; +import config from '~config'; import dbClient from 'db/client.ts'; diff --git a/src/commands/audit.ts b/src/commands/audit.ts index d1d20f7..b121355 100644 --- a/src/commands/audit.ts +++ b/src/commands/audit.ts @@ -1,6 +1,6 @@ import { DiscordenoMessage } from '@discordeno'; -import config from '/config.ts'; +import config from '~config'; import auditCommands from 'commands/auditCmd/_index.ts'; diff --git a/src/commands/auditCmd/auditGuilds.ts b/src/commands/auditCmd/auditGuilds.ts index 21ef192..94de09e 100644 --- a/src/commands/auditCmd/auditGuilds.ts +++ b/src/commands/auditCmd/auditGuilds.ts @@ -1,6 +1,6 @@ import { cache, cacheHandlers, DiscordenoGuild, DiscordenoMessage } from '@discordeno'; -import config from '/config.ts'; +import config from '~config'; import { infoColor2 } from 'src/commandUtils.ts'; import utils from 'src/utils.ts'; diff --git a/src/commands/auditCmd/auditHelp.ts b/src/commands/auditCmd/auditHelp.ts index 9c90971..ae93298 100644 --- a/src/commands/auditCmd/auditHelp.ts +++ b/src/commands/auditCmd/auditHelp.ts @@ -1,6 +1,6 @@ import { DiscordenoMessage } from '@discordeno'; -import config from '/config.ts'; +import config from '~config'; import { infoColor1 } from 'src/commandUtils.ts'; import utils from 'src/utils.ts'; diff --git a/src/commands/emoji.ts b/src/commands/emoji.ts index a8a100a..46ac082 100644 --- a/src/commands/emoji.ts +++ b/src/commands/emoji.ts @@ -1,7 +1,7 @@ import { DiscordenoMessage } from '@discordeno'; import { log, LogTypes as LT } from '@Log4Deno'; -import config from '/config.ts'; +import config from '~config'; import dbClient from 'db/client.ts'; import { queries } from 'db/common.ts'; diff --git a/src/commands/handleMentions.ts b/src/commands/handleMentions.ts index 3261b35..fec579f 100644 --- a/src/commands/handleMentions.ts +++ b/src/commands/handleMentions.ts @@ -1,7 +1,7 @@ import { DiscordenoMessage } from '@discordeno'; import { log, LogTypes as LT } from '@Log4Deno'; -import config from '/config.ts'; +import config from '~config'; import dbClient from 'db/client.ts'; import { queries } from 'db/common.ts'; diff --git a/src/commands/heatmap.ts b/src/commands/heatmap.ts index f9ec08e..ce2ebb9 100644 --- a/src/commands/heatmap.ts +++ b/src/commands/heatmap.ts @@ -1,6 +1,6 @@ import { DiscordenoMessage } from '@discordeno'; -import config from '/config.ts'; +import config from '~config'; import dbClient from 'db/client.ts'; import { queries } from 'db/common.ts'; diff --git a/src/commands/help.ts b/src/commands/help.ts index 290f5c6..4a42671 100644 --- a/src/commands/help.ts +++ b/src/commands/help.ts @@ -1,6 +1,6 @@ import { DiscordenoMessage } from '@discordeno'; -import config from '/config.ts'; +import config from '~config'; import dbClient from 'db/client.ts'; import { queries } from 'db/common.ts'; diff --git a/src/commands/info.ts b/src/commands/info.ts index 73cb409..f9f471b 100644 --- a/src/commands/info.ts +++ b/src/commands/info.ts @@ -1,6 +1,6 @@ import { DiscordenoMessage } from '@discordeno'; -import config from '/config.ts'; +import config from '~config'; import dbClient from 'db/client.ts'; import { queries } from 'db/common.ts'; diff --git a/src/commands/optIn.ts b/src/commands/optIn.ts index 39f96c0..bd079fd 100644 --- a/src/commands/optIn.ts +++ b/src/commands/optIn.ts @@ -1,6 +1,6 @@ import { DiscordenoMessage } from '@discordeno'; -import config from '/config.ts'; +import config from '~config'; import dbClient from 'db/client.ts'; import { ignoreList, queries } from 'db/common.ts'; diff --git a/src/commands/optOut.ts b/src/commands/optOut.ts index 9799ebf..5580694 100644 --- a/src/commands/optOut.ts +++ b/src/commands/optOut.ts @@ -1,6 +1,6 @@ import { DiscordenoMessage } from '@discordeno'; -import config from '/config.ts'; +import config from '~config'; import dbClient from 'db/client.ts'; import { ignoreList, queries } from 'db/common.ts'; diff --git a/src/commands/privacy.ts b/src/commands/privacy.ts index 967f3d3..40f73ec 100644 --- a/src/commands/privacy.ts +++ b/src/commands/privacy.ts @@ -1,6 +1,6 @@ import { DiscordenoMessage } from '@discordeno'; -import config from '/config.ts'; +import config from '~config'; import dbClient from 'db/client.ts'; import { queries } from 'db/common.ts'; diff --git a/src/commands/report.ts b/src/commands/report.ts index 0a0c4f0..4804120 100644 --- a/src/commands/report.ts +++ b/src/commands/report.ts @@ -1,6 +1,6 @@ import { DiscordenoMessage, sendMessage } from '@discordeno'; -import config from '/config.ts'; +import config from '~config'; import dbClient from 'db/client.ts'; import { queries } from 'db/common.ts'; diff --git a/src/commands/rip.ts b/src/commands/rip.ts index aef683d..7c20aad 100644 --- a/src/commands/rip.ts +++ b/src/commands/rip.ts @@ -1,6 +1,6 @@ import { DiscordenoMessage } from '@discordeno'; -import config from '/config.ts'; +import config from '~config'; import dbClient from 'db/client.ts'; import { queries } from 'db/common.ts'; diff --git a/src/commands/roll.ts b/src/commands/roll.ts index 1290887..f686961 100644 --- a/src/commands/roll.ts +++ b/src/commands/roll.ts @@ -1,8 +1,8 @@ import { DiscordenoMessage } from '@discordeno'; import { log, LogTypes as LT } from '@Log4Deno'; -import config from '/config.ts'; -import { DEVMODE } from '/flags.ts'; +import config from '~config'; +import { DEVMODE } from '~flags'; import { queueRoll } from 'artigen/managers/queueManager.ts'; diff --git a/src/commands/roll/getModifiers.ts b/src/commands/roll/getModifiers.ts index 38dab09..6bffd1a 100644 --- a/src/commands/roll/getModifiers.ts +++ b/src/commands/roll/getModifiers.ts @@ -1,8 +1,8 @@ import { DiscordenoMessage } from '@discordeno'; import { log, LogTypes as LT } from '@Log4Deno'; -import config from '/config.ts'; -import { DEVMODE } from '/flags.ts'; +import config from '~config'; +import { DEVMODE } from '~flags'; import dbClient from 'db/client.ts'; import { queries } from 'db/common.ts'; diff --git a/src/commands/rollDecorators.ts b/src/commands/rollDecorators.ts index e4a60d3..3ee44d8 100644 --- a/src/commands/rollDecorators.ts +++ b/src/commands/rollDecorators.ts @@ -1,6 +1,6 @@ import { DiscordenoMessage } from '@discordeno'; -import config from '/config.ts'; +import config from '~config'; import dbClient from 'db/client.ts'; import { queries } from 'db/common.ts'; diff --git a/src/commands/rollHelp.ts b/src/commands/rollHelp.ts index c3e9796..28824e0 100644 --- a/src/commands/rollHelp.ts +++ b/src/commands/rollHelp.ts @@ -1,6 +1,6 @@ import { DiscordenoMessage } from '@discordeno'; -import config from '/config.ts'; +import config from '~config'; import dbClient from 'db/client.ts'; import { queries } from 'db/common.ts'; diff --git a/src/commands/version.ts b/src/commands/version.ts index ff41bd7..4df0bcf 100644 --- a/src/commands/version.ts +++ b/src/commands/version.ts @@ -1,6 +1,6 @@ import { DiscordenoMessage } from '@discordeno'; -import config from '/config.ts'; +import config from '~config'; import dbClient from 'db/client.ts'; import { queries } from 'db/common.ts'; diff --git a/src/db/client.ts b/src/db/client.ts index 43afbef..43d8756 100644 --- a/src/db/client.ts +++ b/src/db/client.ts @@ -1,7 +1,7 @@ import { Client } from '@mysql'; -import config from '/config.ts'; -import { LOCALMODE } from '/flags.ts'; +import config from '~config'; +import { LOCALMODE } from '~flags'; const dbClient = await new Client().connect({ hostname: LOCALMODE ? config.db.localhost : config.db.host, diff --git a/src/endpoints/deletes/apiKeyDelete.ts b/src/endpoints/deletes/apiKeyDelete.ts index 02ed0e6..bd64883 100644 --- a/src/endpoints/deletes/apiKeyDelete.ts +++ b/src/endpoints/deletes/apiKeyDelete.ts @@ -1,7 +1,7 @@ import { sendMessage } from '@discordeno'; import { nanoid } from '@nanoid'; -import config from '/config.ts'; +import config from '~config'; import dbClient from 'db/client.ts'; diff --git a/src/endpoints/gets/apiKey.ts b/src/endpoints/gets/apiKey.ts index 73e33d7..cd22146 100644 --- a/src/endpoints/gets/apiKey.ts +++ b/src/endpoints/gets/apiKey.ts @@ -1,7 +1,7 @@ import { sendMessage } from '@discordeno'; import { nanoid } from '@nanoid'; -import config from '/config.ts'; +import config from '~config'; import dbClient from 'db/client.ts'; diff --git a/src/endpoints/gets/apiKeyAdmin.ts b/src/endpoints/gets/apiKeyAdmin.ts index 708c261..1e1be96 100644 --- a/src/endpoints/gets/apiKeyAdmin.ts +++ b/src/endpoints/gets/apiKeyAdmin.ts @@ -1,6 +1,6 @@ import { nanoid } from '@nanoid'; -import config from '/config.ts'; +import config from '~config'; import dbClient from 'db/client.ts'; diff --git a/src/endpoints/gets/apiRoll.ts b/src/endpoints/gets/apiRoll.ts index 6093e32..d7a39e7 100644 --- a/src/endpoints/gets/apiRoll.ts +++ b/src/endpoints/gets/apiRoll.ts @@ -1,7 +1,7 @@ import { cache } from '@discordeno'; import { log, LogTypes as LT } from '@Log4Deno'; -import config from '/config.ts'; +import config from '~config'; import { queueRoll } from 'artigen/managers/queueManager.ts'; diff --git a/src/endpoints/puts/apiChannelManageBan.ts b/src/endpoints/puts/apiChannelManageBan.ts index 79e10c6..75088d8 100644 --- a/src/endpoints/puts/apiChannelManageBan.ts +++ b/src/endpoints/puts/apiChannelManageBan.ts @@ -1,4 +1,4 @@ -import config from '/config.ts'; +import config from '~config'; import dbClient from 'db/client.ts'; diff --git a/src/endpoints/puts/apiKeyManage.ts b/src/endpoints/puts/apiKeyManage.ts index 38942e4..6f8a3c6 100644 --- a/src/endpoints/puts/apiKeyManage.ts +++ b/src/endpoints/puts/apiKeyManage.ts @@ -1,4 +1,4 @@ -import config from '/config.ts'; +import config from '~config'; import dbClient from 'db/client.ts'; diff --git a/src/intervals.ts b/src/intervals.ts index 728cb17..de2c1f7 100644 --- a/src/intervals.ts +++ b/src/intervals.ts @@ -7,7 +7,7 @@ import { cache, cacheHandlers } from '@discordeno'; import { decode, Image } from '@imagescript'; import { log, LogTypes as LT } from '@Log4Deno'; -import config from '/config.ts'; +import config from '~config'; import dbClient from 'db/client.ts'; import { weekDays } from 'db/common.ts';