diff --git a/mod.ts b/mod.ts index 65daa53..ce73caf 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 68b1e4f..14a2a72 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/commands/apiCmd/apiHelp.ts b/src/commands/apiCmd/apiHelp.ts index def1011..951a8b3 100644 --- a/src/commands/apiCmd/apiHelp.ts +++ b/src/commands/apiCmd/apiHelp.ts @@ -13,7 +13,8 @@ export const help = (message: DiscordenoMessage) => { { color: infoColor2, title: `${config.name}'s API Details:`, - description: `${config.name} has a built in API that allows user to roll dice into Discord using third party programs. By default, API rolls are blocked from being sent in your guild. The API warning is also enabled by default. These commands may only be used by the Owner or Admins of your guild. + description: + `${config.name} has a built in API that allows user to roll dice into Discord using third party programs. By default, API rolls are blocked from being sent in your guild. The API warning is also enabled by default. These commands may only be used by the Owner or Admins of your guild. For information on how to use the API, please check the GitHub README for more information [here](${config.links.sourceCode}). diff --git a/src/commands/help.ts b/src/commands/help.ts index 46b2101..cacec53 100644 --- a/src/commands/help.ts +++ b/src/commands/help.ts @@ -91,7 +91,8 @@ export const help = (message: DiscordenoMessage) => { }, { name: `\`${config.prefix}xdydzracsq!${config.postfix}\` ...`, - value: `Rolls all configs requested, you may repeat the command multiple times in the same message (just ensure you close each roll with \`${config.postfix}\`), run \`${config.prefix}??\` for more details`, + value: + `Rolls all configs requested, you may repeat the command multiple times in the same message (just ensure you close each roll with \`${config.postfix}\`), run \`${config.prefix}??\` for more details`, inline: true, }, ], diff --git a/src/commands/privacy.ts b/src/commands/privacy.ts index 390e8f1..e750fea 100644 --- a/src/commands/privacy.ts +++ b/src/commands/privacy.ts @@ -21,7 +21,8 @@ export const privacy = (message: DiscordenoMessage) => { fields: [ { name: `${config.name} does not track or collect user information via Discord.`, - value: `The only user submitted information that is stored is submitted via the \`${config.prefix}report\` command. This information is only stored for a short period of time in a location that only the Developer of ${config.name} can see. + value: + `The only user submitted information that is stored is submitted via the \`${config.prefix}report\` command. This information is only stored for a short period of time in a location that only the Developer of ${config.name} can see. For more details, please check out the Privacy Policy on the GitHub [here](${config.links.privacyPolicy}). diff --git a/src/commands/roll/getModifiers.ts b/src/commands/roll/getModifiers.ts index 04860a8..20b515d 100644 --- a/src/commands/roll/getModifiers.ts +++ b/src/commands/roll/getModifiers.ts @@ -64,9 +64,7 @@ export const getModifiers = (m: DiscordenoMessage, args: string[], command: stri } if (modifiers.gms.length < 1) { // If -gm is on and none were found, throw an error - m.edit(generateRollError(errorType, 'Must specify at least one GM by @mentioning them')).catch((e) => - utils.commonLoggers.messageEditError('getModifiers.ts:66', m, e) - ); + m.edit(generateRollError(errorType, 'Must specify at least one GM by @mentioning them')).catch((e) => utils.commonLoggers.messageEditError('getModifiers.ts:66', m, e)); if (DEVMODE && config.logRolls) { // If enabled, log rolls so we can verify the bots math @@ -83,9 +81,7 @@ export const getModifiers = (m: DiscordenoMessage, args: string[], command: stri if (!args[i] || (args[i].toLowerCase()[0] !== 'd' && args[i].toLowerCase()[0] !== 'a')) { // If -o is on and asc or desc was not specified, error out - m.edit(generateRollError(errorType, 'Must specify `a` or `d` to order the rolls ascending or descending')).catch((e) => - utils.commonLoggers.messageEditError('getModifiers.ts:81', m, e) - ); + m.edit(generateRollError(errorType, 'Must specify `a` or `d` to order the rolls ascending or descending')).catch((e) => utils.commonLoggers.messageEditError('getModifiers.ts:81', m, e)); if (DEVMODE && config.logRolls) { // If enabled, log rolls so we can verify the bots math @@ -112,9 +108,7 @@ export const getModifiers = (m: DiscordenoMessage, args: string[], command: stri // maxRoll and nominalRoll cannot both be on, throw an error if (modifiers.maxRoll && modifiers.nominalRoll) { - m.edit(generateRollError(errorType, 'Cannot maximize and nominize the roll at the same time')).catch((e) => - utils.commonLoggers.messageEditError('getModifiers.ts:106', m, e) - ); + m.edit(generateRollError(errorType, 'Cannot maximize and nominize the roll at the same time')).catch((e) => utils.commonLoggers.messageEditError('getModifiers.ts:106', m, e)); if (DEVMODE && config.logRolls) { // If enabled, log rolls so we can verify the bots math diff --git a/src/commands/rollDecorators.ts b/src/commands/rollDecorators.ts index 9622eeb..d7e96b9 100644 --- a/src/commands/rollDecorators.ts +++ b/src/commands/rollDecorators.ts @@ -49,8 +49,7 @@ Examples: \`${config.prefix}d20${config.postfix} -nd\`, \`${config.prefix}d20${c }, { name: '`-gm @user1 @user2 @userN` - GM Roll', - value: - 'Rolls the requested roll in GM mode, suppressing all publicly shown results and details and sending the results directly to the specified GMs', + value: 'Rolls the requested roll in GM mode, suppressing all publicly shown results and details and sending the results directly to the specified GMs', inline: true, }, { diff --git a/src/commands/rollHelp.ts b/src/commands/rollHelp.ts index cb3fa2d..650f514 100644 --- a/src/commands/rollHelp.ts +++ b/src/commands/rollHelp.ts @@ -72,32 +72,27 @@ Additionally, replace \`x\` with \`F\` to roll Fate dice`, }, { name: '`rq` [Optional]', - value: - 'Rerolls any rolls that are greater than or equal to `a`, `r3` will reroll every die that land on 3 or greater, throwing out old rolls, cannot be used with `ro`', + value: 'Rerolls any rolls that are greater than or equal to `a`, `r3` will reroll every die that land on 3 or greater, throwing out old rolls, cannot be used with `ro`', inline: true, }, { name: '`roa` or `ro=q` [Optional]', - value: - 'Rerolls any rolls that match `a`, `ro3` will reroll each die that lands on 3 ONLY ONE TIME, throwing out old rolls, cannot be used with `r`', + value: 'Rerolls any rolls that match `a`, `ro3` will reroll each die that lands on 3 ONLY ONE TIME, throwing out old rolls, cannot be used with `r`', inline: true, }, { name: '`roq` [Optional]', - value: - 'Rerolls any rolls that are greater than or equal to `a`, `ro3` will reroll each die that lands on 3 or greater ONLY ONE TIME, throwing out old rolls, cannot be used with `r`', + value: 'Rerolls any rolls that are greater than or equal to `a`, `ro3` will reroll each die that lands on 3 or greater ONLY ONE TIME, throwing out old rolls, cannot be used with `r`', inline: true, }, { @@ -192,32 +187,27 @@ Additionally, replace \`x\` with \`F\` to roll Fate dice`, }, { name: '`!p>u` [Optional]', - value: - 'Penetrating Explosion on `u` and greater, rolls one `dy` for each die that lands on `u` or greater, but subtracts one from each resulting explosion', + value: 'Penetrating Explosion on `u` and greater, rolls one `dy` for each die that lands on `u` or greater, but subtracts one from each resulting explosion', inline: true, }, { name: '`!pu` [Optional]', - value: - 'Compounding Explosion on `u` and greater, rolls one `dy` for each die that lands on `u` or greater, but adds the resulting explosion to the die that caused this explosion', + value: 'Compounding Explosion on `u` and greater, rolls one `dy` for each die that lands on `u` or greater, but adds the resulting explosion to the die that caused this explosion', inline: true, }, { name: '`!! { rolls, total - rolls, rollRate, - totalRate - rollRate - ) + totalRate - rollRate, + ), ).catch((e: Error) => utils.commonLoggers.messageEditError('stats.ts:38', m, e)); } catch (e) { utils.commonLoggers.messageSendError('stats.ts:41', message, e as Error); 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/endpoints/stdResponses.ts b/src/endpoints/stdResponses.ts index 364d3e8..aa42a2f 100644 --- a/src/endpoints/stdResponses.ts +++ b/src/endpoints/stdResponses.ts @@ -5,8 +5,7 @@ import { StatusCode, } from '../../deps.ts'; -const genericResponse = (customText: string, status: StatusCode) => - new Response(customText || STATUS_TEXT[status], { status: status, statusText: STATUS_TEXT[status] }); +const genericResponse = (customText: string, status: StatusCode) => new Response(customText || STATUS_TEXT[status], { status: status, statusText: STATUS_TEXT[status] }); export default { BadRequest: (customText: string) => genericResponse(customText, STATUS_CODE.BadRequest), diff --git a/src/intervals.ts b/src/intervals.ts index 4cc9c84..754a4f7 100644 --- a/src/intervals.ts +++ b/src/intervals.ts @@ -198,7 +198,7 @@ const updateHeatmapPng = async () => { hourPixels[hour][0] + 1, dayPixels[day][1] - dayPixels[day][0] + 1, hourPixels[hour][1] - hourPixels[hour][0] + 1, - is.Image.rgbToColor(255 * (1 - percent), 255 * percent, 0) + is.Image.rgbToColor(255 * (1 - percent), 255 * percent, 0), ); } } diff --git a/src/solver/parser.ts b/src/solver/parser.ts index 939555c..5d2cc5b 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 28fd775..a99e2a5 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/roller.ts b/src/solver/roller.ts index 71c5e89..903fce7 100644 --- a/src/solver/roller.ts +++ b/src/solver/roller.ts @@ -47,22 +47,22 @@ export const roll = (rollStr: string, maximizeRoll: 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: [], }, }; diff --git a/src/solver/solver.ts b/src/solver/solver.ts index 42f3330..c1bf3d5 100644 --- a/src/solver/solver.ts +++ b/src/solver/solver.ts @@ -183,10 +183,10 @@ export const fullSolver = (conf: (string | number | SolvedStep)[], wrapDetails: stepSolve.details = conf[0].toString(); } else { // Else fully populate the stepSolve with what was computed - stepSolve.total = (conf[0]).total; - stepSolve.details = (conf[0]).details; - stepSolve.containsCrit = (conf[0]).containsCrit; - stepSolve.containsFail = (conf[0]).containsFail; + stepSolve.total = ( conf[0]).total; + stepSolve.details = ( conf[0]).details; + stepSolve.containsCrit = ( conf[0]).containsCrit; + stepSolve.containsFail = ( conf[0]).containsFail; } // If this was a nested call, add on parens around the details to show what math we've done diff --git a/src/utils.ts b/src/utils.ts index 978680e..48dfba0 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -23,7 +23,7 @@ const ask = async (question: string, stdin = Deno.stdin, stdout = Deno.stdout): await stdout.write(new TextEncoder().encode(question)); // Read console's input into answer - const n = await stdin.read(buf); + const n = await stdin.read(buf); const answer = new TextDecoder().decode(buf.subarray(0, n)); return answer.trim(); @@ -101,8 +101,7 @@ const messageSendError = (location: string, message: DiscordenoMessage | string, genericLogger(LT.ERROR, `${location} | Failed to send message: ${JSON.stringify(message)} | Error: ${err.name} - ${err.message}`); const messageDeleteError = (location: string, message: DiscordenoMessage | string, err: Error) => genericLogger(LT.ERROR, `${location} | Failed to delete message: ${JSON.stringify(message)} | Error: ${err.name} - ${err.message}`); -const dbError = (location: string, type: string, err: Error) => - genericLogger(LT.ERROR, `${location} | Failed to ${type} database | Error: ${err.name} - ${err.message}`); +const dbError = (location: string, type: string, err: Error) => genericLogger(LT.ERROR, `${location} | Failed to ${type} database | Error: ${err.name} - ${err.message}`); export default { commonLoggers: {