aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.eslintrc.json5
-rw-r--r--package.json1
-rw-r--r--src/commands/dev/superUser.ts2
-rw-r--r--src/commands/moderation/evidence.ts2
-rw-r--r--src/commands/utilities/highlight-add.ts2
-rw-r--r--src/commands/utilities/highlight-block.ts2
-rw-r--r--src/commands/utilities/highlight-clear.ts2
-rw-r--r--src/commands/utilities/highlight-remove.ts2
-rw-r--r--src/commands/utilities/highlight-show.ts2
-rw-r--r--src/commands/utilities/highlight-unblock.ts2
-rw-r--r--src/lib/extensions/discord.js/BushBaseGuildVoiceChannel.ts6
-rw-r--r--src/lib/extensions/discord.js/BushClientUser.ts2
-rw-r--r--src/lib/utils/BushLogger.ts2
-rw-r--r--yarn.lock116
14 files changed, 130 insertions, 18 deletions
diff --git a/.eslintrc.json b/.eslintrc.json
index dc80bcf..d2b68f5 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -10,7 +10,7 @@
"sourceType": "module",
"project": "./tsconfig.json"
},
- "plugins": ["@typescript-eslint", "deprecation"],
+ "plugins": ["@typescript-eslint", "deprecation", "node"],
"ignorePatterns": ["dist"],
"rules": {
"no-return-await": "off",
@@ -60,6 +60,7 @@
"@typescript-eslint/no-implied-eval": ["error"],
"deprecation/deprecation": "warn",
"@typescript-eslint/explicit-member-accessibility": ["warn", { "accessibility": "explicit" }],
- "@typescript-eslint/switch-exhaustiveness-check": "warn"
+ "@typescript-eslint/switch-exhaustiveness-check": "warn",
+ "node/file-extension-in-import": ["error", "always", { "tryExtensions": [".js", ".json"] }]
}
}
diff --git a/package.json b/package.json
index 93e2231..6ee1752 100644
--- a/package.json
+++ b/package.json
@@ -101,6 +101,7 @@
"eslint": "^8.8.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-deprecation": "^1.3.2",
+ "eslint-plugin-node": "^11.1.0",
"node-fetch": "^3.2.0"
},
"packageManager": "yarn@3.1.1"
diff --git a/src/commands/dev/superUser.ts b/src/commands/dev/superUser.ts
index b184f6f..56bc4b1 100644
--- a/src/commands/dev/superUser.ts
+++ b/src/commands/dev/superUser.ts
@@ -1,6 +1,6 @@
import { BushCommand, type ArgType, type BushMessage } from '#lib';
import { ArgumentGeneratorReturn } from 'discord-akairo';
-import { ArgumentTypeCasterReturn } from 'discord-akairo/dist/src/struct/commands/arguments/Argument';
+import { ArgumentTypeCasterReturn } from 'discord-akairo/dist/src/struct/commands/arguments/Argument.js';
export default class SuperUserCommand extends BushCommand {
public constructor() {
diff --git a/src/commands/moderation/evidence.ts b/src/commands/moderation/evidence.ts
index 444a173..23ccf59 100644
--- a/src/commands/moderation/evidence.ts
+++ b/src/commands/moderation/evidence.ts
@@ -1,6 +1,6 @@
import { BushCommand, ModLog, type BushMessage, type BushSlashMessage } from '#lib';
import { ArgumentGeneratorReturn } from 'discord-akairo';
-import { ArgumentTypeCasterReturn } from 'discord-akairo/dist/src/struct/commands/arguments/Argument';
+import { ArgumentTypeCasterReturn } from 'discord-akairo/dist/src/struct/commands/arguments/Argument.js';
import { ApplicationCommandOptionType, PermissionFlagsBits } from 'discord.js';
export default class EvidenceCommand extends BushCommand {
diff --git a/src/commands/utilities/highlight-add.ts b/src/commands/utilities/highlight-add.ts
index ec5443c..316a931 100644
--- a/src/commands/utilities/highlight-add.ts
+++ b/src/commands/utilities/highlight-add.ts
@@ -1,7 +1,7 @@
import { AllowedMentions, BushCommand, Highlight, type ArgType, type BushMessage, type BushSlashMessage } from '#lib';
import assert from 'assert';
import { ArgumentGeneratorReturn } from 'discord-akairo';
-import { highlightCommandArgs, highlightSubcommands } from './highlight-!';
+import { highlightCommandArgs, highlightSubcommands } from './highlight-!.js';
export default class HighlightAddCommand extends BushCommand {
public constructor() {
diff --git a/src/commands/utilities/highlight-block.ts b/src/commands/utilities/highlight-block.ts
index 5a18b8a..f546958 100644
--- a/src/commands/utilities/highlight-block.ts
+++ b/src/commands/utilities/highlight-block.ts
@@ -2,7 +2,7 @@ import { AllowedMentions, BushCommand, Highlight, type ArgType, type BushMessage
import assert from 'assert';
import { Argument, ArgumentGeneratorReturn } from 'discord-akairo';
import { Channel, GuildMember } from 'discord.js';
-import { highlightCommandArgs, highlightSubcommands } from './highlight-!';
+import { highlightCommandArgs, highlightSubcommands } from './highlight-!.js';
export default class HighlightBlockCommand extends BushCommand {
public constructor() {
diff --git a/src/commands/utilities/highlight-clear.ts b/src/commands/utilities/highlight-clear.ts
index aded467..e1cce2d 100644
--- a/src/commands/utilities/highlight-clear.ts
+++ b/src/commands/utilities/highlight-clear.ts
@@ -1,6 +1,6 @@
import { AllowedMentions, BushCommand, ConfirmationPrompt, Highlight, type BushMessage, type BushSlashMessage } from '#lib';
import assert from 'assert';
-import { highlightSubcommands } from './highlight-!';
+import { highlightSubcommands } from './highlight-!.js';
export default class HighlightClearCommand extends BushCommand {
public constructor() {
diff --git a/src/commands/utilities/highlight-remove.ts b/src/commands/utilities/highlight-remove.ts
index 0432a16..1f7c4c0 100644
--- a/src/commands/utilities/highlight-remove.ts
+++ b/src/commands/utilities/highlight-remove.ts
@@ -1,7 +1,7 @@
import { AllowedMentions, BushCommand, Highlight, type ArgType, type BushMessage, type BushSlashMessage } from '#lib';
import assert from 'assert';
import { ArgumentGeneratorReturn } from 'discord-akairo';
-import { highlightCommandArgs, highlightSubcommands } from './highlight-!';
+import { highlightCommandArgs, highlightSubcommands } from './highlight-!.js';
export default class HighlightRemoveCommand extends BushCommand {
public constructor() {
diff --git a/src/commands/utilities/highlight-show.ts b/src/commands/utilities/highlight-show.ts
index ab7c0c5..b9f414f 100644
--- a/src/commands/utilities/highlight-show.ts
+++ b/src/commands/utilities/highlight-show.ts
@@ -1,7 +1,7 @@
import { AllowedMentions, BushCommand, Highlight, type BushMessage, type BushSlashMessage } from '#lib';
import assert from 'assert';
import { Embed } from 'discord.js';
-import { highlightSubcommands } from './highlight-!';
+import { highlightSubcommands } from './highlight-!.js';
export default class HighlightShowCommand extends BushCommand {
public constructor() {
diff --git a/src/commands/utilities/highlight-unblock.ts b/src/commands/utilities/highlight-unblock.ts
index 7e5c0fb..475aab0 100644
--- a/src/commands/utilities/highlight-unblock.ts
+++ b/src/commands/utilities/highlight-unblock.ts
@@ -2,7 +2,7 @@ import { AllowedMentions, BushCommand, Highlight, type ArgType, type BushMessage
import assert from 'assert';
import { Argument, ArgumentGeneratorReturn } from 'discord-akairo';
import { Channel, GuildMember } from 'discord.js';
-import { highlightCommandArgs, highlightSubcommands } from './highlight-!';
+import { highlightCommandArgs, highlightSubcommands } from './highlight-!.js';
export default class HighlightUnblockCommand extends BushCommand {
public constructor() {
diff --git a/src/lib/extensions/discord.js/BushBaseGuildVoiceChannel.ts b/src/lib/extensions/discord.js/BushBaseGuildVoiceChannel.ts
index 2ffb2fd..1ebefee 100644
--- a/src/lib/extensions/discord.js/BushBaseGuildVoiceChannel.ts
+++ b/src/lib/extensions/discord.js/BushBaseGuildVoiceChannel.ts
@@ -1,7 +1,7 @@
import { BaseGuildVoiceChannel, Collection, Snowflake } from 'discord.js';
-import { BushCategoryChannel } from './BushCategoryChannel';
-import { BushGuild } from './BushGuild';
-import { BushGuildMember } from './BushGuildMember';
+import { BushCategoryChannel } from './BushCategoryChannel.js';
+import { BushGuild } from './BushGuild.js';
+import { BushGuildMember } from './BushGuildMember.js';
/**
* Represents a voice-based guild channel on Discord.
diff --git a/src/lib/extensions/discord.js/BushClientUser.ts b/src/lib/extensions/discord.js/BushClientUser.ts
index a9a47f9..cee9808 100644
--- a/src/lib/extensions/discord.js/BushClientUser.ts
+++ b/src/lib/extensions/discord.js/BushClientUser.ts
@@ -8,7 +8,7 @@ import type {
PresenceData,
PresenceStatusData
} from 'discord.js';
-import { BushUser } from './BushUser';
+import { BushUser } from './BushUser.js';
/**
* Represents the logged in client's Discord user.
diff --git a/src/lib/utils/BushLogger.ts b/src/lib/utils/BushLogger.ts
index 9fcc059..dc43a4f 100644
--- a/src/lib/utils/BushLogger.ts
+++ b/src/lib/utils/BushLogger.ts
@@ -2,7 +2,7 @@ import chalk from 'chalk';
// eslint-disable-next-line @typescript-eslint/no-unused-vars
import { Embed, Util, type Message, type PartialTextBasedChannelFields } from 'discord.js';
import { inspect } from 'util';
-import { type BushSendMessageType } from '../extensions/discord-akairo/BushClient';
+import { type BushSendMessageType } from '../extensions/discord-akairo/BushClient.js';
/**
* Custom logging utility for the bot.
diff --git a/yarn.lock b/yarn.lock
index 20abb5e..a50ade4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -899,6 +899,7 @@ __metadata:
eslint: ^8.8.0
eslint-config-prettier: ^8.3.0
eslint-plugin-deprecation: ^1.3.2
+ eslint-plugin-node: ^11.1.0
fuse.js: ^6.5.3
got: ^12.0.1
lodash: ^4.17.21
@@ -1327,6 +1328,34 @@ __metadata:
languageName: node
linkType: hard
+"eslint-plugin-es@npm:^3.0.0":
+ version: 3.0.1
+ resolution: "eslint-plugin-es@npm:3.0.1"
+ dependencies:
+ eslint-utils: ^2.0.0
+ regexpp: ^3.0.0
+ peerDependencies:
+ eslint: ">=4.19.1"
+ checksum: e57592c52301ee8ddc296ae44216df007f3a870bcb3be8d1fbdb909a1d3a3efe3fa3785de02066f9eba1d6466b722d3eb3cc3f8b75b3cf6a1cbded31ac6298e4
+ languageName: node
+ linkType: hard
+
+"eslint-plugin-node@npm:^11.1.0":
+ version: 11.1.0
+ resolution: "eslint-plugin-node@npm:11.1.0"
+ dependencies:
+ eslint-plugin-es: ^3.0.0
+ eslint-utils: ^2.0.0
+ ignore: ^5.1.1
+ minimatch: ^3.0.4
+ resolve: ^1.10.1
+ semver: ^6.1.0
+ peerDependencies:
+ eslint: ">=5.16.0"
+ checksum: 5804c4f8a6e721f183ef31d46fbe3b4e1265832f352810060e0502aeac7de034df83352fc88643b19641bb2163f2587f1bd4119aff0fd21e8d98c57c450e013b
+ languageName: node
+ linkType: hard
+
"eslint-scope@npm:^5.1.1":
version: 5.1.1
resolution: "eslint-scope@npm:5.1.1"
@@ -1347,6 +1376,15 @@ __metadata:
languageName: node
linkType: hard
+"eslint-utils@npm:^2.0.0":
+ version: 2.1.0
+ resolution: "eslint-utils@npm:2.1.0"
+ dependencies:
+ eslint-visitor-keys: ^1.1.0
+ checksum: 27500938f348da42100d9e6ad03ae29b3de19ba757ae1a7f4a087bdcf83ac60949bbb54286492ca61fac1f5f3ac8692dd21537ce6214240bf95ad0122f24d71d
+ languageName: node
+ linkType: hard
+
"eslint-utils@npm:^3.0.0":
version: 3.0.0
resolution: "eslint-utils@npm:3.0.0"
@@ -1358,6 +1396,13 @@ __metadata:
languageName: node
linkType: hard
+"eslint-visitor-keys@npm:^1.1.0":
+ version: 1.3.0
+ resolution: "eslint-visitor-keys@npm:1.3.0"
+ checksum: 37a19b712f42f4c9027e8ba98c2b06031c17e0c0a4c696cd429bd9ee04eb43889c446f2cd545e1ff51bef9593fcec94ecd2c2ef89129fcbbf3adadbef520376a
+ languageName: node
+ linkType: hard
+
"eslint-visitor-keys@npm:^2.0.0":
version: 2.1.0
resolution: "eslint-visitor-keys@npm:2.1.0"
@@ -1616,6 +1661,13 @@ __metadata:
languageName: node
linkType: hard
+"function-bind@npm:^1.1.1":
+ version: 1.1.1
+ resolution: "function-bind@npm:1.1.1"
+ checksum: b32fbaebb3f8ec4969f033073b43f5c8befbb58f1a79e12f1d7490358150359ebd92f49e72ff0144f65f2c48ea2a605bff2d07965f548f6474fd8efd95bf361a
+ languageName: node
+ linkType: hard
+
"functional-red-black-tree@npm:^1.0.1":
version: 1.0.1
resolution: "functional-red-black-tree@npm:1.0.1"
@@ -1777,6 +1829,15 @@ __metadata:
languageName: node
linkType: hard
+"has@npm:^1.0.3":
+ version: 1.0.3
+ resolution: "has@npm:1.0.3"
+ dependencies:
+ function-bind: ^1.1.1
+ checksum: b9ad53d53be4af90ce5d1c38331e712522417d017d5ef1ebd0507e07c2fbad8686fffb8e12ddecd4c39ca9b9b47431afbb975b8abf7f3c3b82c98e9aad052792
+ languageName: node
+ linkType: hard
+
"http-cache-semantics@npm:^4.0.0, http-cache-semantics@npm:^4.1.0":
version: 4.1.0
resolution: "http-cache-semantics@npm:4.1.0"
@@ -1840,7 +1901,7 @@ __metadata:
languageName: node
linkType: hard
-"ignore@npm:^5.1.8, ignore@npm:^5.2.0":
+"ignore@npm:^5.1.1, ignore@npm:^5.1.8, ignore@npm:^5.2.0":
version: 5.2.0
resolution: "ignore@npm:5.2.0"
checksum: 6b1f926792d614f64c6c83da3a1f9c83f6196c2839aa41e1e32dd7b8d174cef2e329d75caabb62cb61ce9dc432f75e67d07d122a037312db7caa73166a1bdb77
@@ -1916,6 +1977,15 @@ __metadata:
languageName: node
linkType: hard
+"is-core-module@npm:^2.8.1":
+ version: 2.8.1
+ resolution: "is-core-module@npm:2.8.1"
+ dependencies:
+ has: ^1.0.3
+ checksum: 418b7bc10768a73c41c7ef497e293719604007f88934a6ffc5f7c78702791b8528102fb4c9e56d006d69361549b3d9519440214a74aefc7e0b79e5e4411d377f
+ languageName: node
+ linkType: hard
+
"is-extglob@npm:^2.1.1":
version: 2.1.1
resolution: "is-extglob@npm:2.1.1"
@@ -2520,6 +2590,13 @@ __metadata:
languageName: node
linkType: hard
+"path-parse@npm:^1.0.7":
+ version: 1.0.7
+ resolution: "path-parse@npm:1.0.7"
+ checksum: 49abf3d81115642938a8700ec580da6e830dde670be21893c62f4e10bd7dd4c3742ddc603fe24f898cba7eb0c6bc1777f8d9ac14185d34540c6d4d80cd9cae8a
+ languageName: node
+ linkType: hard
+
"path-type@npm:^4.0.0":
version: 4.0.0
resolution: "path-type@npm:4.0.0"
@@ -2734,7 +2811,7 @@ __metadata:
languageName: node
linkType: hard
-"regexpp@npm:^3.2.0":
+"regexpp@npm:^3.0.0, regexpp@npm:^3.2.0":
version: 3.2.0
resolution: "regexpp@npm:3.2.0"
checksum: a78dc5c7158ad9ddcfe01aa9144f46e192ddbfa7b263895a70a5c6c73edd9ce85faf7c0430e59ac38839e1734e275b9c3de5c57ee3ab6edc0e0b1bdebefccef8
@@ -2755,6 +2832,32 @@ __metadata:
languageName: node
linkType: hard
+"resolve@npm:^1.10.1":
+ version: 1.22.0
+ resolution: "resolve@npm:1.22.0"
+ dependencies:
+ is-core-module: ^2.8.1
+ path-parse: ^1.0.7
+ supports-preserve-symlinks-flag: ^1.0.0
+ bin:
+ resolve: bin/resolve
+ checksum: a2d14cc437b3a23996f8c7367eee5c7cf8149c586b07ca2ae00e96581ce59455555a1190be9aa92154785cf9f2042646c200d0e00e0bbd2b8a995a93a0ed3e4e
+ languageName: node
+ linkType: hard
+
+"resolve@patch:resolve@^1.10.1#~builtin<compat/resolve>":
+ version: 1.22.0
+ resolution: "resolve@patch:resolve@npm%3A1.22.0#~builtin<compat/resolve>::version=1.22.0&hash=07638b"
+ dependencies:
+ is-core-module: ^2.8.1
+ path-parse: ^1.0.7
+ supports-preserve-symlinks-flag: ^1.0.0
+ bin:
+ resolve: bin/resolve
+ checksum: c79ecaea36c872ee4a79e3db0d3d4160b593f2ca16e031d8283735acd01715a203607e9ded3f91f68899c2937fa0d49390cddbe0fb2852629212f3cda283f4a7
+ languageName: node
+ linkType: hard
+
"responselike@npm:^2.0.0":
version: 2.0.0
resolution: "responselike@npm:2.0.0"
@@ -2826,7 +2929,7 @@ __metadata:
languageName: node
linkType: hard
-"semver@npm:^6.0.0":
+"semver@npm:^6.0.0, semver@npm:^6.1.0":
version: 6.3.0
resolution: "semver@npm:6.3.0"
bin:
@@ -3037,6 +3140,13 @@ __metadata:
languageName: node
linkType: hard
+"supports-preserve-symlinks-flag@npm:^1.0.0":
+ version: 1.0.0
+ resolution: "supports-preserve-symlinks-flag@npm:1.0.0"
+ checksum: 53b1e247e68e05db7b3808b99b892bd36fb096e6fba213a06da7fab22045e97597db425c724f2bbd6c99a3c295e1e73f3e4de78592289f38431049e1277ca0ae
+ languageName: node
+ linkType: hard
+
"tar@npm:^6.0.2, tar@npm:^6.1.11, tar@npm:^6.1.2":
version: 6.1.11
resolution: "tar@npm:6.1.11"