Brexbot · mmerfort · Aug 2, 2024 · Jul 14, 2024 · Jul 14, 2024 · Jul 17, 2024
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -22,40 +22,38 @@
     "url": "https://github.com/Brexbot/DiscordBot/issues"
   },
   "homepage": "https://github.com/Brexbot/DiscordBot#readme",
-  "type": "commonjs",
+  "type": "module",
   "devDependencies": {
     "@types/cron": "^2.0.1",
-    "@types/node": "^20.14.12",
+    "@types/node": "^20.14.10",
     "@types/node-fetch": "^2.6.11",
-    "@typescript-eslint/eslint-plugin": "^7.17.0",
-    "@typescript-eslint/parser": "^7.17.0",
+    "@types/sharp": "^0.31.1",
+    "@typescript-eslint/eslint-plugin": "^7.16.0",
+    "@typescript-eslint/parser": "^7.16.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.2.1",
+    "eslint-plugin-prettier": "^5.1.3",
     "nodemon": "^3.1.4",
     "prettier": "^3.3.3",
     "rimraf": "^6.0.1",
     "ts-node": "^10.9.2",
     "tslib": "^2.6.3",
-    "typescript": "^5.5.4"
+    "typescript": "^5.5.3"
   },
   "dependencies": {
     "@dice-roller/rpg-dice-roller": "^5.5.0",
     "@discordx/importer": "^1.3.1",
     "@discordx/pagination": "^3.5.4",
     "@discordx/utilities": "^7.0.1",
-    "@prisma/client": "^5.17.0",
+    "@prisma/client": "^5.16.2",
     "@twurple/api": "^7.1.0",
     "@twurple/auth": "^7.1.0",
-    "@types/sharp": "^0.31.1",
     "cron": "^3.1.7",
-    "discord-api-types": "^0.37.93",
+    "discord-api-types": "^0.37.92",
     "discord.js": "^14.15.3",
     "discordx": "^11.12.0",
-    "fs": "^0.0.1-security",
     "hsl-rgb": "^1.0.0",
     "localisetimemodule": "github:QOAL/localiseTimeModule#20230503",
-    "path": "^0.12.7",
-    "prisma": "^5.17.0",
+    "prisma": "^5.16.2",
     "reflect-metadata": "^0.2.2",
     "sharp": "^0.33.4",
     "sponge-case": "^2.0.3"

diff --git a/src/commands/NFD.ts b/src/commands/NFD.ts
@@ -22,11 +22,11 @@ import {
   userMention,
 } from 'discord.js'
 import { Discord, Guard, Slash, SlashChoice, SlashGroup, SlashOption } from 'discordx'
-import { getCallerFromCommand, getNicknameFromUser } from '../utils/CommandUtils'
+import { getCallerFromCommand, getNicknameFromUser } from '../utils/CommandUtils.js'
 import { injectable } from 'tsyringe'
-import { ORM } from '../persistence'
-import { NFDItem } from '../../prisma/generated/prisma-client-js'
-import { IsSuperUser } from '../guards/RoleChecks'
+import { ORM } from '../persistence/ORM.js'
+import { NFDItem } from '../../prisma/generated/prisma-client-js/index.js'
+import { IsSuperUser } from '../guards/RoleChecks.js'
 import sharp from 'sharp'
 
 type BodyParts = {
@@ -1223,8 +1223,8 @@ class NFD {
   ) {
     const nfdName = nfd.name
 
-    const author = owner ? owner.nickname ?? owner.user.username : 'UNKNOWN'
-    const avatar = owner ? owner.user.avatarURL() ?? undefined : undefined
+    const author = owner ? (owner.nickname ?? owner.user.username) : 'UNKNOWN'
+    const avatar = owner ? (owner.user.avatarURL() ?? undefined) : undefined
 
     // Check for the existence of the image in the cache, if it doesn't exist, make it.
 

diff --git a/src/commands/RPG/Character.ts b/src/commands/RPG/Character.ts
@@ -1,5 +1,5 @@
-import { adjectives, nouns, CharacterClass, classes, CharacterSpecie, species } from './Data'
-import { getSeededRandomElement, rollSeeded_dy_x_TimesPick_z, mulberry32, cyrb53 } from './util'
+import { adjectives, nouns, CharacterClass, classes, CharacterSpecie, species } from './Data.js'
+import { getSeededRandomElement, rollSeeded_dy_x_TimesPick_z, mulberry32, cyrb53 } from './util.js'
 import { EmbedBuilder, User } from 'discord.js'
 
 export class Character {
@@ -23,7 +23,11 @@ export class Character {
 
   rng: () => number
 
-  public constructor(public user: User, public nickname: string, private seedPhrase?: string) {
+  public constructor(
+    public user: User,
+    public nickname: string,
+    private seedPhrase?: string
+  ) {
     // Maybe the screen name is better until folks can build their own character
     if (this.seedPhrase) {
       this.seed = cyrb53(this.seedPhrase)

diff --git a/src/commands/RPG/RPG.ts b/src/commands/RPG/RPG.ts
@@ -1,7 +1,7 @@
-import { Character } from './Character'
-import { getEloRankChange, getRandomElement as getRandomElement, roll_dy_x_TimesPick_z } from './util'
-import { attackTexts, defenceFailureTexts, defenceSuccessTexts, ladderTexts, victoryTexts } from './Dialogue'
-import { ELO_K } from './Data'
+import { Character } from './Character.js'
+import { getEloRankChange, getRandomElement as getRandomElement, roll_dy_x_TimesPick_z } from './util.js'
+import { attackTexts, defenceFailureTexts, defenceSuccessTexts, ladderTexts, victoryTexts } from './Dialogue.js'
+import { ELO_K } from './Data.js'
 
 import {
   ActionRowBuilder,

diff --git a/src/commands/RPG/util.ts b/src/commands/RPG/util.ts
@@ -1,4 +1,4 @@
-import { classes } from './Data'
+import { classes } from './Data.js'
 
 export function cyrb53(str: string, seed = 0): number {
   // Hash the input string to int

diff --git a/src/commands/chatters/artemis.ts b/src/commands/chatters/artemis.ts
@@ -1,5 +1,5 @@
 import { Discord, SimpleCommand, SimpleCommandMessage, SimpleCommandOption, SimpleCommandOptionType } from 'discordx'
-import { shuffleArray } from '../../utils/Helpers'
+import { shuffleArray } from '../../utils/Helpers.js'
 
 @Discord()
 class Artemis {

diff --git a/src/commands/duel.ts b/src/commands/duel.ts
@@ -5,20 +5,20 @@ import {
   ButtonStyle,
   CommandInteraction,
   EmbedBuilder,
-  Formatters,
   GuildMember,
   Message,
   MessageActionRowComponentBuilder,
+  inlineCode,
 } from 'discord.js'
 import { Discord, Slash, SlashGroup } from 'discordx'
 import { injectable } from 'tsyringe'
-import { ORM } from '../persistence/ORM'
+import { ORM } from '../persistence/ORM.js'
 
-import { Duels } from '../../prisma/generated/prisma-client-js'
-import { ColorRoles } from './roleCommands/changecolor'
-import { getCallerFromCommand, getGuildAndCallerFromCommand } from '../utils/CommandUtils'
-import { getGlobalDuelCDRemaining, getTimeLeftInReadableFormat } from '../utils/CooldownUtils'
-import { shuffleArray } from '../utils/Helpers'
+import { Duels } from '../../prisma/generated/prisma-client-js/index.js'
+import { ColorRoles } from './roleCommands/changecolor.js'
+import { getCallerFromCommand, getGuildAndCallerFromCommand } from '../utils/CommandUtils.js'
+import { getGlobalDuelCDRemaining, getTimeLeftInReadableFormat } from '../utils/CooldownUtils.js'
+import { shuffleArray } from '../utils/Helpers.js'
 
 @Discord()
 @SlashGroup({ name: 'duel', description: 'Duel minigame' })
@@ -143,7 +143,7 @@ export class Duel {
 
         // Check if there is no current duel
         await collectionInteraction.followUp({
-          content: `Someone beat you to the challenge! (or the duel expired... who knows!). You may issue a new challenge with ${Formatters.inlineCode(
+          content: `Someone beat you to the challenge! (or the duel expired... who knows!). You may issue a new challenge with ${inlineCode(
             '/duel'
           )}.`,
           ephemeral: true,

diff --git a/src/commands/minesweeper.ts b/src/commands/minesweeper.ts
@@ -1,4 +1,4 @@
-import { ApplicationCommandOptionType, CommandInteraction, Formatters } from 'discord.js'
+import { ApplicationCommandOptionType, CommandInteraction, spoiler } from 'discord.js'
 import {
   Discord,
   SimpleCommand,
@@ -116,13 +116,13 @@ class Board {
 
       const tile = this.neighbors[i]
       if (tile === -1) {
-        board += Formatters.spoiler(`:${this.randomBomb()}:`)
+        board += spoiler(`:${this.randomBomb()}:`)
       } else {
         if (tile === 0 && !startRevealed) {
           board += `:${Board.neighborCounts[tile]}:`
           startRevealed = true
         } else {
-          board += Formatters.spoiler(`:${Board.neighborCounts[tile]}:`)
+          board += spoiler(`:${Board.neighborCounts[tile]}:`)
         }
       }
     }

diff --git a/src/commands/mixu.ts b/src/commands/mixu.ts
@@ -1,9 +1,9 @@
 import { CommandInteraction, Guild } from 'discord.js'
 import { Discord, SimpleCommand, SimpleCommandMessage, Slash } from 'discordx'
 import { injectable } from 'tsyringe'
-import { ORM } from '../persistence'
-import { BestMixu } from '../../prisma/generated/prisma-client-js'
-import { shuffleArray } from '../utils/Helpers'
+import { ORM } from '../persistence/ORM.js'
+import { BestMixu } from '../../prisma/generated/prisma-client-js/index.js'
+import { shuffleArray } from '../utils/Helpers.js'
 
 @Discord()
 @injectable()

diff --git a/src/commands/modCommands/Pardon.ts b/src/commands/modCommands/Pardon.ts
@@ -1,8 +1,8 @@
 import { Client, Discord, Guard, SimpleCommand, SimpleCommandMessage } from 'discordx'
 import { GuildMember } from 'discord.js'
 import { injectable } from 'tsyringe'
-import { ORM } from '../../persistence'
-import { IsSuperUser } from '../../guards/RoleChecks'
+import { ORM } from '../../persistence/index.js'
+import { IsSuperUser } from '../../guards/RoleChecks.js'
 
 @Discord()
 @injectable()

diff --git a/src/commands/modCommands/releasetheeggplant.ts b/src/commands/modCommands/releasetheeggplant.ts
@@ -8,7 +8,7 @@ import {
   SimpleCommandOption,
   SimpleCommandOptionType,
 } from 'discordx'
-import { IsSuperUser, memberIsSU } from '../../guards/RoleChecks'
+import { IsSuperUser, memberIsSU } from '../../guards/RoleChecks.js'
 
 @Discord()
 @Guard(IsSuperUser)

diff --git a/src/commands/modCommands/setgamble.ts b/src/commands/modCommands/setgamble.ts
@@ -6,10 +6,10 @@ import {
   SimpleCommandOption,
   SimpleCommandOptionType,
 } from 'discordx'
-import { Prisma } from '../../../prisma/generated/prisma-client-js'
+import { Prisma } from '../../../prisma/generated/prisma-client-js/index.js'
 import { injectable } from 'tsyringe'
 import { ORM } from '../../persistence'
-import { IsSuperUser } from '../../guards/RoleChecks'
+import { IsSuperUser } from '../../guards/RoleChecks.js'
 
 @Discord()
 @injectable()

diff --git a/src/commands/quote.ts b/src/commands/quote.ts
@@ -8,7 +8,7 @@ import {
   Slash,
   SlashOption,
 } from 'discordx'
-import { uwuify } from './uwu'
+import { uwuify } from './uwu.js'
 
 interface Quote {
   id: number

diff --git a/src/commands/roleCommands/changecolor.ts b/src/commands/roleCommands/changecolor.ts
@@ -11,18 +11,18 @@ import {
 import {
   ApplicationCommandOptionType,
   CommandInteraction,
-  Formatters,
+  italic,
   Guild,
   GuildMember,
   HexColorString,
 } from 'discord.js'
 import { injectable } from 'tsyringe'
-import { ORM } from '../../persistence'
-import { Prisma } from '../../../prisma/generated/prisma-client-js'
+import { ORM } from '../../persistence/index.js'
+import { Prisma } from '../../../prisma/generated/prisma-client-js/index.js'
 import { IsSuperUser, superUserIds, superUserRoles } from '../../guards/RoleChecks'
-import { getCallerFromCommand, getGuildAndCallerFromCommand, getGuildFromCommand } from '../../utils/CommandUtils'
-import { Duel } from '../duel'
-import { getTimeLeftInReadableFormat } from '../../utils/CooldownUtils'
+import { getCallerFromCommand, getGuildAndCallerFromCommand, getGuildFromCommand } from '../../utils/CommandUtils.js'
+import { Duel } from '../duel.js'
+import { getTimeLeftInReadableFormat } from '../../utils/CooldownUtils.js'
 
 @Discord()
 @injectable()
@@ -293,7 +293,7 @@ export class ColorRoles {
     const hexColor: HexColorString = color[0] !== '#' ? `#${color}` : (color as HexColorString)
     let favoriteString = ' '
     if (isFavorite || hexColor === userOptions.favColor?.toUpperCase()) {
-      favoriteString += Formatters.italic('favorite') + ' '
+      favoriteString += italic('favorite') + ' '
     }
 
     await ColorRoles.setColor(hexColor, member, guild)

diff --git a/src/commands/roleCommands/embedpls.ts b/src/commands/roleCommands/embedpls.ts
@@ -1,6 +1,6 @@
 import { Discord, SimpleCommand, SimpleCommandMessage, Slash, SlashOption } from 'discordx'
-import { ApplicationCommandOptionType, CommandInteraction, GuildMember, GuildMemberRoleManager, User } from 'discord.js'
-import { memberIsSU } from '../../guards/RoleChecks'
+import { ApplicationCommandOptionType, CommandInteraction, GuildMember, GuildMemberRoleManager } from 'discord.js'
+import { memberIsSU } from '../../guards/RoleChecks.js'
 
 // Intentionally leaving out the slash command for this as it doesn't really make sense to
 // clutter the slash menu with a command that most users will only ever use once

diff --git a/src/commands/roleCommands/icon.ts b/src/commands/roleCommands/icon.ts
@@ -9,7 +9,7 @@ import {
   SlashOption,
 } from 'discordx'
 import { ApplicationCommandOptionType, CommandInteraction, GuildMemberRoleManager, RoleManager } from 'discord.js'
-import { IsSuperUser } from '../../guards/RoleChecks'
+import { IsSuperUser } from '../../guards/RoleChecks.js'
 
 @Discord()
 class Icon {

diff --git a/src/commands/roleCommands/rolesub.ts b/src/commands/roleCommands/rolesub.ts
@@ -9,7 +9,7 @@ import {
   SlashOption,
 } from 'discordx'
 import { ApplicationCommandOptionType, CommandInteraction, GuildMemberRoleManager, RoleManager } from 'discord.js'
-import { IsSuperUser } from '../../guards/RoleChecks'
+import { IsSuperUser } from '../../guards/RoleChecks.js'
 
 @Discord()
 class Rolesub {

diff --git a/src/commands/roll.ts b/src/commands/roll.ts
@@ -1,7 +1,7 @@
 import { DiceRoll } from '@dice-roller/rpg-dice-roller'
 import { ApplicationCommandOptionType, CommandInteraction } from 'discord.js'
 import { Discord, Slash, SlashGroup, SlashOption } from 'discordx'
-import { getRandomElement } from './RPG/util'
+import { getRandomElement } from './RPG/util.js'
 
 @SlashGroup({ name: 'roll', description: 'Ask the dice for advice' })
 @SlashGroup('roll')

diff --git a/src/commands/rps.ts b/src/commands/rps.ts
@@ -10,7 +10,7 @@ import {
   MessageActionRowComponentBuilder,
 } from 'discord.js'
 import { Discord, Slash } from 'discordx'
-import { getCallerFromCommand } from '../utils/CommandUtils'
+import { getCallerFromCommand } from '../utils/CommandUtils.js'
 
 type RPSChoice = 'rock' | 'paper' | 'scissors'
 

diff --git a/src/commands/timeout.ts b/src/commands/timeout.ts
@@ -4,7 +4,7 @@ import {
   ButtonBuilder,
   ButtonStyle,
   CommandInteraction,
-  Formatters,
+  quote,
   Guild,
   GuildMember,
   GuildMemberRoleManager,
@@ -22,7 +22,7 @@ import {
   Slash,
   SlashOption,
 } from 'discordx'
-import { IsSuperUser, memberIsSU } from '../guards/RoleChecks'
+import { IsSuperUser, memberIsSU } from '../guards/RoleChecks.js'
 
 @Discord()
 abstract class Timeout {
@@ -67,7 +67,7 @@ abstract class Timeout {
   async sudoku(member: GuildMember | null, message?: string): Promise<string> {
     const time = this.sudokuDuration()
     await member?.timeout(time * 1000, "Sudoku'd").catch(console.error)
-    const msg = message && message.length < 150 ? `\n${Formatters.quote(message)}` : ''
+    const msg = message && message.length < 150 ? `\n${quote(message)}` : ''
 
     // If the Sudoku-ee is a Super User send them a DM with a button to remove the timeout
     if (memberIsSU(member)) {