From 103ad8a8f530cccb3eccb1ef06b0c344747c88ac Mon Sep 17 00:00:00 2001 From: Ean Milligan Date: Sat, 26 Apr 2025 22:38:11 -0400 Subject: [PATCH] deno fmt --- deps.ts | 2 +- mod.ts | 26 +++++--------------------- src/commandUtils.ts | 2 +- src/endpoints/gets/apiRoll.ts | 2 +- src/solver/parser.ts | 12 ++++++------ src/solver/rollQueue.ts | 20 ++++++++++---------- src/solver/rollWorker.ts | 2 +- src/solver/roller.ts | 8 ++++---- 8 files changed, 29 insertions(+), 45 deletions(-) diff --git a/deps.ts b/deps.ts index 3ef6b33..c276735 100644 --- a/deps.ts +++ b/deps.ts @@ -24,6 +24,6 @@ export type { StatusCode } from 'jsr:@std/http@1.0.15'; export { nanoid } from 'https://deno.land/x/nanoid@v3.0.0/mod.ts'; -export { initLog, closeLog, log, LogTypes as LT } from 'https://raw.githubusercontent.com/Burn-E99/Log4Deno/V2.1.1/mod.ts'; +export { closeLog, initLog, log, LogTypes as LT } from 'https://raw.githubusercontent.com/Burn-E99/Log4Deno/V2.1.1/mod.ts'; export * as is from 'https://deno.land/x/imagescript@1.3.0/mod.ts'; diff --git a/mod.ts b/mod.ts index 1e0337b..ec3bc51 100644 --- a/mod.ts +++ b/mod.ts @@ -6,21 +6,7 @@ import config from './config.ts'; import { DEBUG, DEVMODE, LOCALMODE } from './flags.ts'; -import { - botId, - cache, - DiscordActivityTypes, - DiscordenoGuild, - DiscordenoMessage, - editBotNickname, - editBotStatus, - initLog, - Intents, - log, - LT, - sendMessage, - startBot, -} from './deps.ts'; +import { botId, cache, DiscordActivityTypes, DiscordenoGuild, DiscordenoMessage, editBotNickname, editBotStatus, initLog, Intents, log, LT, sendMessage, startBot } from './deps.ts'; import api from './src/api.ts'; import dbClient from './src/db/client.ts'; import { ignoreList } from './src/db/common.ts'; @@ -80,12 +66,10 @@ startBot({ }, 30000); // Interval to update bot list stats every 24 hours - LOCALMODE - ? log(LT.INFO, 'updateListStatistics not running') - : setInterval(() => { - log(LT.LOG, 'Updating all bot lists statistics'); - intervals.updateListStatistics(botId, cache.guilds.size + cache.dispatchedGuildIds.size); - }, 86400000); + LOCALMODE ? log(LT.INFO, 'updateListStatistics not running') : setInterval(() => { + log(LT.LOG, 'Updating all bot lists statistics'); + intervals.updateListStatistics(botId, cache.guilds.size + cache.dispatchedGuildIds.size); + }, 86400000); // Interval to update hourlyRates every hour setInterval(() => { diff --git a/src/commandUtils.ts b/src/commandUtils.ts index 10f063b..28b3978 100644 --- a/src/commandUtils.ts +++ b/src/commandUtils.ts @@ -45,7 +45,7 @@ export const generateStats = ( rollCount: bigint, utilityCount: bigint, rollRate: number, - utilityRate: number + utilityRate: number, ) => ({ embeds: [ { diff --git a/src/endpoints/gets/apiRoll.ts b/src/endpoints/gets/apiRoll.ts index 3abca4e..bf46667 100644 --- a/src/endpoints/gets/apiRoll.ts +++ b/src/endpoints/gets/apiRoll.ts @@ -113,7 +113,7 @@ export const apiRoll = async (query: Map, apiUserid: bigint): Pr } else { // Alert API user that they messed up return stdResp.Forbidden( - `Verify you are a member of the guild you are sending this roll to. If you are, the ${config.name} may not have that registered, please send a message in the guild so ${config.name} can register this. This registration is temporary, so if you see this error again, just poke your server again.` + `Verify you are a member of the guild you are sending this roll to. If you are, the ${config.name} may not have that registered, please send a message in the guild so ${config.name} can register this. This registration is temporary, so if you see this error again, just poke your server again.`, ); } } else { diff --git a/src/solver/parser.ts b/src/solver/parser.ts index cd65705..c43b094 100644 --- a/src/solver/parser.ts +++ b/src/solver/parser.ts @@ -16,7 +16,7 @@ import { fullSolver } from './solver.ts'; // parseRoll handles converting fullCmd into a computer readable format for processing, and finally executes the solving export const parseRoll = (fullCmd: string, modifiers: RollModifiers): SolvedRoll => { const operators = ['^', '*', '/', '%', '+', '-', '(', ')']; - const returnmsg = { + const returnmsg = { error: false, errorCode: '', errorMsg: '', @@ -57,7 +57,7 @@ export const parseRoll = (fullCmd: string, modifiers: RollModifiers): SolvedRoll const [tempConf, tempFormat] = sepRoll.split(config.postfix); // Remove all spaces from the operation config and split it by any operator (keeping the operator in mathConf for fullSolver to do math on) - const mathConf: (string | number | SolvedStep)[] = <(string | number | SolvedStep)[]>tempConf.replace(/ /g, '').split(/([-+()*/%^])/g); + const mathConf: (string | number | SolvedStep)[] = <(string | number | SolvedStep)[]> tempConf.replace(/ /g, '').split(/([-+()*/%^])/g); // Verify there are equal numbers of opening and closing parenthesis by adding 1 for opening parens and subtracting 1 for closing parens let parenCnt = 0; @@ -139,7 +139,7 @@ export const parseRoll = (fullCmd: string, modifiers: RollModifiers): SolvedRoll containsCrit: false, containsFail: false, }, - ] + ], ); } else if (!operators.includes(mathConf[i].toString())) { // If nothing else has handled it by now, try it as a roll @@ -150,10 +150,10 @@ export const parseRoll = (fullCmd: string, modifiers: RollModifiers): SolvedRoll if (mathConf[i - 1] === '-' && ((!mathConf[i - 2] && mathConf[i - 2] !== 0) || mathConf[i - 2] === '(')) { if (typeof mathConf[i] === 'number') { - mathConf[i] = mathConf[i] * -1; + mathConf[i] = mathConf[i] * -1; } else { - (mathConf[i]).total = (mathConf[i]).total * -1; - (mathConf[i]).details = `-${(mathConf[i]).details}`; + ( mathConf[i]).total = ( mathConf[i]).total * -1; + ( mathConf[i]).details = `-${( mathConf[i]).details}`; } mathConf.splice(i - 1, 1); i--; diff --git a/src/solver/rollQueue.ts b/src/solver/rollQueue.ts index 67064ae..79f516a 100644 --- a/src/solver/rollQueue.ts +++ b/src/solver/rollQueue.ts @@ -44,12 +44,12 @@ const handleRollWorker = (rq: ApiQueuedRoll | DDQueuedRoll) => { ( await generateRollEmbed( rq.dd.message.authorId, - { + { error: true, errorCode: 'TooComplex', errorMsg: 'Error: Roll took too long to process, try breaking roll down into simpler parts', }, - {} + {}, ) ).embed, ], @@ -175,14 +175,14 @@ const handleRollWorker = (rq: ApiQueuedRoll | DDQueuedRoll) => { JSON.stringify( rq.modifiers.count ? { - counts: countEmbed, - details: pubEmbedDetails, - } + counts: countEmbed, + details: pubEmbedDetails, + } : { - details: pubEmbedDetails, - } - ) - ) + details: pubEmbedDetails, + }, + ), + ), ); } } @@ -223,7 +223,7 @@ The results for this roll will replace this message when it is done.`, setInterval(() => { log( LT.LOG, - `Checking rollQueue for items, rollQueue length: ${rollQueue.length}, currentWorkers: ${currentWorkers}, config.limits.maxWorkers: ${config.limits.maxWorkers}` + `Checking rollQueue for items, rollQueue length: ${rollQueue.length}, currentWorkers: ${currentWorkers}, config.limits.maxWorkers: ${config.limits.maxWorkers}`, ); if (rollQueue.length && currentWorkers < config.limits.maxWorkers) { const temp = rollQueue.shift(); diff --git a/src/solver/rollWorker.ts b/src/solver/rollWorker.ts index e50b1db..6727520 100644 --- a/src/solver/rollWorker.ts +++ b/src/solver/rollWorker.ts @@ -1,4 +1,4 @@ -import { initLog, closeLog } from '../../deps.ts'; +import { closeLog, initLog } from '../../deps.ts'; import { DEBUG } from '../../flags.ts'; import { parseRoll } from './parser.ts'; import { loggingEnabled } from './rollUtils.ts'; diff --git a/src/solver/roller.ts b/src/solver/roller.ts index 9dc2e78..34c626a 100644 --- a/src/solver/roller.ts +++ b/src/solver/roller.ts @@ -47,22 +47,22 @@ export const roll = (rollStr: string, maximiseRoll: boolean, nominalRoll: boolea reroll: { on: false, once: false, - nums: [], + nums: [], }, critScore: { on: false, - range: [], + range: [], }, critFail: { on: false, - range: [], + range: [], }, exploding: { on: false, once: false, compounding: false, penetrating: false, - nums: [], + nums: [], }, };