[untested] - deno fmt

This commit is contained in:
Ean Milligan 2025-05-01 18:01:23 -04:00
parent 6e1c6e8db3
commit f50dec29c7
20 changed files with 76 additions and 105 deletions

17
mod.ts
View File

@ -3,18 +3,7 @@
* *
* December 21, 2020 * December 21, 2020
*/ */
import { import { botId, cache, DiscordActivityTypes, DiscordenoGuild, DiscordenoMessage, editBotNickname, editBotStatus, Intents, sendMessage, startBot } from '@discordeno';
botId,
cache,
DiscordActivityTypes,
DiscordenoGuild,
DiscordenoMessage,
editBotNickname,
editBotStatus,
Intents,
sendMessage,
startBot,
} from '@discordeno';
import { initLog, log, LogTypes as LT } from '@Log4Deno'; import { initLog, log, LogTypes as LT } from '@Log4Deno';
import config from '/config.ts'; import config from '/config.ts';
@ -81,9 +70,7 @@ startBot({
}, 30000); }, 30000);
// Interval to update bot list stats every 24 hours // Interval to update bot list stats every 24 hours
LOCALMODE LOCALMODE ? log(LT.INFO, 'updateListStatistics not running') : setInterval(() => {
? log(LT.INFO, 'updateListStatistics not running')
: setInterval(() => {
log(LT.LOG, 'Updating all bot lists statistics'); log(LT.LOG, 'Updating all bot lists statistics');
intervals.updateListStatistics(botId, cache.guilds.size + cache.dispatchedGuildIds.size); intervals.updateListStatistics(botId, cache.guilds.size + cache.dispatchedGuildIds.size);
}, 86400000); }, 86400000);

View File

@ -35,7 +35,7 @@ The results for this roll will replace this message when it is done.`,
setInterval(() => { setInterval(() => {
log( log(
LT.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) { if (rollQueue.length && currentWorkers < config.limits.maxWorkers) {
const temp = rollQueue.shift(); const temp = rollQueue.shift();

View File

@ -40,7 +40,7 @@ export const handleRollWorker = (rq: QueuedRoll) => {
errorCode: 'TooComplex', errorCode: 'TooComplex',
errorMsg: 'Error: Roll took too long to process, try breaking roll down into simpler parts', errorMsg: 'Error: Roll took too long to process, try breaking roll down into simpler parts',
}, },
<RollModifiers>{} <RollModifiers> {},
) )
).embed, ).embed,
], ],
@ -171,9 +171,9 @@ export const handleRollWorker = (rq: QueuedRoll) => {
} }
: { : {
details: pubEmbedDetails, details: pubEmbedDetails,
} },
) ),
) ),
); );
} }
} }

View File

@ -147,7 +147,7 @@ export const parseRoll = (fullCmd: string, modifiers: RollModifiers): SolvedRoll
containsCrit: false, containsCrit: false,
containsFail: false, containsFail: false,
}, },
] ],
); );
i += 2; i += 2;
} else if (!legalMathOperators.includes(strMathConfI) && legalMathOperators.some((mathOp) => strMathConfI.endsWith(mathOp))) { } else if (!legalMathOperators.includes(strMathConfI) && legalMathOperators.some((mathOp) => strMathConfI.endsWith(mathOp))) {
@ -255,10 +255,12 @@ export const parseRoll = (fullCmd: string, modifiers: RollModifiers): SolvedRoll
// Populate line2 (the results) and line3 (the details) with their data // Populate line2 (the results) and line3 (the details) with their data
if (modifiers.order === '') { if (modifiers.order === '') {
line2 += `${preFormat}${modifiers.commaTotals ? e.rollTotal.toLocaleString() : e.rollTotal}${postFormat}${escapeCharacters( line2 += `${preFormat}${modifiers.commaTotals ? e.rollTotal.toLocaleString() : e.rollTotal}${postFormat}${
escapeCharacters(
e.rollPostFormat, e.rollPostFormat,
'|*_~`' '|*_~`',
)} `; )
} `;
} else { } else {
// If order is on, turn rolls into csv without formatting // If order is on, turn rolls into csv without formatting
line2 += `${preFormat}${modifiers.commaTotals ? e.rollTotal.toLocaleString() : e.rollTotal}${postFormat}, `; line2 += `${preFormat}${modifiers.commaTotals ? e.rollTotal.toLocaleString() : e.rollTotal}${postFormat}, `;

View File

@ -49,7 +49,7 @@ export const generateStats = (
utilityCount: bigint, utilityCount: bigint,
rollRate: number, rollRate: number,
utilityRate: number, utilityRate: number,
queryTimeMs: number queryTimeMs: number,
) => ({ ) => ({
embeds: [ embeds: [
{ {

View File

@ -12,7 +12,8 @@ export const help = (message: DiscordenoMessage) => {
{ {
color: infoColor2, color: infoColor2,
title: `${config.name}'s API Details:`, 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}). For information on how to use the API, please check the GitHub README for more information [here](${config.links.sourceCode}).

View File

@ -119,23 +119,19 @@ Please see attached file for audit details on cached guilds and members.`,
}, },
{ {
name: 'Repeat Guild Owners:', name: 'Repeat Guild Owners:',
value: value: repeatCounts
repeatCounts
.map((ownerCnt, serverIdx) => `${ownerCnt} ${ownerCnt === 1 ? 'person has' : 'people have'} me in ${serverIdx + 1} of their guilds`) .map((ownerCnt, serverIdx) => `${ownerCnt} ${ownerCnt === 1 ? 'person has' : 'people have'} me in ${serverIdx + 1} of their guilds`)
.filter((str) => str) .filter((str) => str)
.join('\n') || 'No Repeat Guild Owners', .join('\n') || 'No Repeat Guild Owners',
}, },
{ {
name: 'Guild Size Dist:', name: 'Guild Size Dist:',
value: value: Array.from(guildSizeDist)
Array.from(guildSizeDist)
.map( .map(
([size, count], idx) => ([size, count], idx) =>
`${count} Guild${count === 1 ? ' has' : 's have'} ${ `${count} Guild${count === 1 ? ' has' : 's have'} ${
guildSizeDist.has(sizeCats[idx - 1]) guildSizeDist.has(sizeCats[idx - 1]) ? `${size.toLocaleString()} - ${(sizeCats[idx - 1] - 1).toLocaleString()}` : `at least ${size.toLocaleString()}`
? `${size.toLocaleString()} - ${(sizeCats[idx - 1] - 1).toLocaleString()}` } Member${size === 1 ? '' : 's'}`,
: `at least ${size.toLocaleString()}`
} Member${size === 1 ? '' : 's'}`
) )
.join('\n') || 'Not available', .join('\n') || 'Not available',
}, },

View File

@ -91,7 +91,8 @@ export const help = (message: DiscordenoMessage) => {
}, },
{ {
name: `\`${config.prefix}xdydzracsq!${config.postfix}\` ...`, 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, inline: true,
}, },
], ],

View File

@ -21,7 +21,8 @@ export const privacy = (message: DiscordenoMessage) => {
fields: [ fields: [
{ {
name: `${config.name} does not track or collect user information via Discord.`, 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}). For more details, please check out the Privacy Policy on the GitHub [here](${config.links.privacyPolicy}).

View File

@ -68,9 +68,7 @@ export const getModifiers = (m: DiscordenoMessage, args: string[], command: stri
} }
if (modifiers.gms.length < 1) { if (modifiers.gms.length < 1) {
// If -gm is on and none were found, throw an error // 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) => m.edit(generateRollError(errorType, 'Must specify at least one GM by @mentioning them')).catch((e) => utils.commonLoggers.messageEditError('getModifiers.ts:66', m, e));
utils.commonLoggers.messageEditError('getModifiers.ts:66', m, e)
);
if (DEVMODE && config.logRolls) { if (DEVMODE && config.logRolls) {
// If enabled, log rolls so we can verify the bots math // If enabled, log rolls so we can verify the bots math
@ -87,9 +85,7 @@ export const getModifiers = (m: DiscordenoMessage, args: string[], command: stri
if (!args[i] || (args[i].toLowerCase()[0] !== 'd' && args[i].toLowerCase()[0] !== 'a')) { 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 // 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) => 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));
utils.commonLoggers.messageEditError('getModifiers.ts:81', m, e)
);
if (DEVMODE && config.logRolls) { if (DEVMODE && config.logRolls) {
// If enabled, log rolls so we can verify the bots math // If enabled, log rolls so we can verify the bots math

View File

@ -54,8 +54,7 @@ Examples: \`${config.prefix}d20${config.postfix} -nd\`, \`${config.prefix}d20${c
}, },
{ {
name: '`-gm @user1 @user2 @userN` - GM Roll', name: '`-gm @user1 @user2 @userN` - GM Roll',
value: value: 'Rolls the requested roll in GM mode, suppressing all publicly shown results and details and sending the results directly to the specified GMs',
'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, inline: true,
}, },
{ {

View File

@ -72,32 +72,27 @@ Additionally, replace \`x\` with \`F\` to roll Fate dice`,
}, },
{ {
name: '`r<q` [Optional]', name: '`r<q` [Optional]',
value: value: 'Rerolls any rolls that are less than or equal to `a`, `r3` will reroll every die that land on 3, 2, or 1, throwing out old rolls, cannot be used with `ro`',
'Rerolls any rolls that are less than or equal to `a`, `r3` will reroll every die that land on 3, 2, or 1, throwing out old rolls, cannot be used with `ro`',
inline: true, inline: true,
}, },
{ {
name: '`r>q` [Optional]', name: '`r>q` [Optional]',
value: 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`',
'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, inline: true,
}, },
{ {
name: '`roa` or `ro=q` [Optional]', name: '`roa` or `ro=q` [Optional]',
value: 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`',
'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, inline: true,
}, },
{ {
name: '`ro<q` [Optional]', name: '`ro<q` [Optional]',
value: value: 'Rerolls any rolls that are less than or equal to `a`, `ro3` will reroll each die that lands on 3, 2, or 1 ONLY ONE TIME, throwing out old rolls, cannot be used with `r`',
'Rerolls any rolls that are less than or equal to `a`, `ro3` will reroll each die that lands on 3, 2, or 1 ONLY ONE TIME, throwing out old rolls, cannot be used with `r`',
inline: true, inline: true,
}, },
{ {
name: '`ro>q` [Optional]', name: '`ro>q` [Optional]',
value: 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`',
'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, inline: true,
}, },
{ {
@ -192,32 +187,27 @@ Additionally, replace \`x\` with \`F\` to roll Fate dice`,
}, },
{ {
name: '`!p>u` [Optional]', name: '`!p>u` [Optional]',
value: 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',
'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, inline: true,
}, },
{ {
name: '`!p<u` [Optional]', name: '`!p<u` [Optional]',
value: value: 'Penetrating Explosion on `u` and under, rolls one `dy` for each die that lands on `u` or under, but subtracts one from each resulting explosion',
'Penetrating Explosion on `u` and under, rolls one `dy` for each die that lands on `u` or under, but subtracts one from each resulting explosion',
inline: true, inline: true,
}, },
{ {
name: '`!!=u` [Optional]', name: '`!!=u` [Optional]',
value: value: 'Compounding Explosion on `u`, rolls one `dy` for each die that lands on `u`, but adds the resulting explosion to the die that caused this explosion',
'Compounding Explosion on `u`, rolls one `dy` for each die that lands on `u`, but adds the resulting explosion to the die that caused this explosion',
inline: true, inline: true,
}, },
{ {
name: '`!!>u` [Optional]', name: '`!!>u` [Optional]',
value: 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',
'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, inline: true,
}, },
{ {
name: '`!!<u` [Optional]', name: '`!!<u` [Optional]',
value: value: 'Compounding Explosion on `u` and under, rolls one `dy` for each die that lands on `u` or under, but adds the resulting explosion to the die that caused this explosion',
'Compounding Explosion on `u` and under, rolls one `dy` for each die that lands on `u` or under, but adds the resulting explosion to the die that caused this explosion',
inline: true, inline: true,
}, },
], ],

View File

@ -42,8 +42,8 @@ export const stats = async (message: DiscordenoMessage) => {
total - rolls, total - rolls,
rollRate, rollRate,
totalRate - rollRate, totalRate - rollRate,
endTime - startTime endTime - startTime,
) ),
).catch((e: Error) => utils.commonLoggers.messageEditError('stats.ts:38', m, e)); ).catch((e: Error) => utils.commonLoggers.messageEditError('stats.ts:38', m, e));
} catch (e) { } catch (e) {
utils.commonLoggers.messageSendError('stats.ts:41', message, e as Error); utils.commonLoggers.messageSendError('stats.ts:41', message, e as Error);

View File

@ -115,7 +115,7 @@ export const apiRoll = async (query: Map<string, string>, apiUserid: bigint): Pr
} else { } else {
// Alert API user that they messed up // Alert API user that they messed up
return stdResp.Forbidden( 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 { } else {

View File

@ -1,7 +1,6 @@
import { STATUS_CODE, STATUS_TEXT, StatusCode } from '@std/http'; import { STATUS_CODE, STATUS_TEXT, StatusCode } from '@std/http';
const genericResponse = (customText: string, status: StatusCode) => const genericResponse = (customText: string, status: StatusCode) => new Response(customText || STATUS_TEXT[status], { status: status, statusText: STATUS_TEXT[status] });
new Response(customText || STATUS_TEXT[status], { status: status, statusText: STATUS_TEXT[status] });
export default { export default {
BadRequest: (customText: string) => genericResponse(customText, STATUS_CODE.BadRequest), BadRequest: (customText: string) => genericResponse(customText, STATUS_CODE.BadRequest),

View File

@ -4,7 +4,7 @@
* December 21, 2020 * December 21, 2020
*/ */
import { cache, cacheHandlers } from '@discordeno'; import { cache, cacheHandlers } from '@discordeno';
import { Image, decode } from '@imagescript'; import { decode, Image } from '@imagescript';
import { log, LogTypes as LT } from '@Log4Deno'; import { log, LogTypes as LT } from '@Log4Deno';
import config from '/config.ts'; import config from '/config.ts';
@ -193,7 +193,7 @@ const updateHeatmapPng = async () => {
hourPixels[hour][0] + 1, hourPixels[hour][0] + 1,
dayPixels[day][1] - dayPixels[day][0] + 1, dayPixels[day][1] - dayPixels[day][0] + 1,
hourPixels[hour][1] - hourPixels[hour][0] + 1, hourPixels[hour][1] - hourPixels[hour][0] + 1,
Image.rgbToColor(255 * (1 - percent), 255 * percent, 0) Image.rgbToColor(255 * (1 - percent), 255 * percent, 0),
); );
} }
} }

View File

@ -93,8 +93,7 @@ const messageSendError = (location: string, message: DiscordenoMessage | string,
genericLogger(LT.ERROR, `${location} | Failed to send message: ${JSON.stringify(message)} | Error: ${err.name} - ${err.message}`); 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) => 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}`); genericLogger(LT.ERROR, `${location} | Failed to delete message: ${JSON.stringify(message)} | Error: ${err.name} - ${err.message}`);
const dbError = (location: string, type: string, err: Error) => const dbError = (location: string, type: string, err: Error) => genericLogger(LT.ERROR, `${location} | Failed to ${type} database | Error: ${err.name} - ${err.message}`);
genericLogger(LT.ERROR, `${location} | Failed to ${type} database | Error: ${err.name} - ${err.message}`);
export default { export default {
commonLoggers: { commonLoggers: {