aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.vscode/launch.json21
-rw-r--r--package.json29
-rw-r--r--src/arguments/abbreviatedNumber.ts2
-rw-r--r--src/arguments/contentWithDuration.ts2
-rw-r--r--src/arguments/discordEmoji.ts2
-rw-r--r--src/arguments/duration.ts2
-rw-r--r--src/arguments/durationSeconds.ts2
-rw-r--r--src/arguments/globalUser.ts2
-rw-r--r--src/arguments/permission.ts2
-rw-r--r--src/arguments/roleWithDuration.ts2
-rw-r--r--src/arguments/snowflake.ts2
-rw-r--r--src/commands/config/config.ts1
-rw-r--r--src/commands/config/features.ts27
-rw-r--r--src/commands/utilities/uuid.ts2
-rw-r--r--src/commands/utilities/wolframAlpha.ts2
-rw-r--r--src/lib/common/typings/BushInspectOptions.d.ts10
-rw-r--r--src/lib/extensions/discord-akairo/BushClient.ts92
-rw-r--r--src/lib/extensions/discord-akairo/BushClientUtil.ts3
-rw-r--r--src/lib/extensions/discord.js/BushGuild.ts2
-rw-r--r--src/lib/utils/BushCache.ts18
-rw-r--r--tsconfig.json3
-rw-r--r--yarn.lock604
22 files changed, 317 insertions, 515 deletions
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 16a966e..3237d6d 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -2,27 +2,22 @@
"configurations": [
{
"command": "yarn dev",
- "name": "BushBot (tsc)",
+ "name": "BushBot",
"request": "launch",
- "type": "node-terminal",
- "skipFiles": ["<node_internals>/**",
+ "type": "pwa-node",
+ "skipFiles": [
+ "<node_internals>/**",
// "**/Yarn/**",
- "**/.pnp.js", "**/.yarn/releases/**"],
+ "**/.pnp.js",
+ "**/.yarn/releases/**"
+ ],
"outFiles": [
"${workspaceRoot}/dist/**/*.js",
- "${workspaceRoot}/.yarn/unplugged/**/node_modules/discord-akairo/lib/**/.js)"
],
"sourceMaps": true,
"resolveSourceMapLocations": [
"${workspaceFolder}/**",
]
- },
- {
- "command": "yarn start",
- "name": "BushBot (esbuild)",
- "request": "launch",
- "type": "node-terminal",
- "skipFiles": ["<node_internals>/**", "**/Yarn/**", "**/.pnp.js", "**/.yarn/releases/**"]
}
]
-}
+} \ No newline at end of file
diff --git a/package.json b/package.json
index ba1b852..4f2627e 100644
--- a/package.json
+++ b/package.json
@@ -34,15 +34,17 @@
"format": "yarn prettier . --write",
"lint": "yarn eslint --ext js,jsx,ts,tsx src",
"format:check": "yarn prettier . --check",
- "upgrade": "yarn rimraf yarn.lock && yarn cache clean && yarn install && yarn up || true || yarn dlx @yarnpkg/sdks vscode",
+ "upgrade": "yarn rimraf yarn.lock && yarn cache clean && yarn install && yarn up && yarn up -R",
+ "upgrade:sdk": "yarn dlx @yarnpkg/sdks vscode",
"beta": "git push && git checkout beta && git merge master && git push && git checkout master",
"deploy:beta": "wsl /bin/bash -c \"pm2 deploy ecosystem.config.cjs beta\"",
"deploy:production": "wsl /bin/bash -c \"pm2 deploy ecosystem.config.cjs production\"",
"deploy:all": "yarn beta && wsl /bin/bash -c \"pm2 deploy ecosystem.config.cjs production && pm2 deploy ecosystem.config.cjs beta\""
},
"dependencies": {
- "@sentry/node": "^6.14.1",
- "@sentry/tracing": "^6.14.1",
+ "@notenoughupdates/wolfram-alpha-api": "^1.0.0",
+ "@sentry/node": "^6.14.3",
+ "@sentry/tracing": "^6.14.3",
"canvas": "^2.8.0",
"chalk": "^4.1.2",
"discord-akairo": "npm:@notenoughupdates/discord-akairo@dev",
@@ -53,9 +55,9 @@
"got": "^11.8.2",
"humanize-duration": "^3.27.0",
"lodash": "^4.17.21",
- "mathjs": "^9.5.0",
+ "mathjs": "^10.0.0",
"moment": "^2.29.1",
- "nanoid": "^3.1.28",
+ "nanoid": "^3.1.30",
"node-os-utils": "^1.3.5",
"numeral": "^2.0.6",
"pg": "^8.7.1",
@@ -63,27 +65,26 @@
"prettier": "^2.4.1",
"pretty-bytes": "^5.6.0",
"rimraf": "^3.0.2",
- "sequelize": "^6.6.5",
+ "sequelize": "^6.9.0",
"simplify-number": "^1.0.0",
"source-map-support": "^0.5.20",
"tinycolor2": "^1.4.2",
"tslib": "^2.3.1",
- "typescript": "rc",
- "wolfram-alpha-api": "npm:@notenoughupdates/wolfram-alpha-api@latest"
+ "typescript": "rc"
},
"devDependencies": {
"@types/express": "^4.17.13",
- "@types/humanize-duration": "^3.25.1",
+ "@types/humanize-duration": "^3.27.0",
"@types/lodash": "^4.14.176",
- "@types/node": "^16.11.6",
+ "@types/node": "^16.11.7",
"@types/node-os-utils": "^1.2.0",
"@types/numeral": "^2.0.2",
"@types/tinycolor2": "^1.4.3",
- "@types/validator": "^13.6.3",
- "@typescript-eslint/eslint-plugin": "^5.2.0",
- "@typescript-eslint/parser": "^5.2.0",
+ "@types/validator": "^13.6.6",
+ "@typescript-eslint/eslint-plugin": "^5.3.1",
+ "@typescript-eslint/parser": "^5.3.1",
"discord-api-types": "0.24.0",
- "eslint": "^7.32.0",
+ "eslint": "^8.2.0",
"eslint-config-prettier": "^8.3.0"
},
"eslintConfig": {
diff --git a/src/arguments/abbreviatedNumber.ts b/src/arguments/abbreviatedNumber.ts
index 4dae2ff..3a447d7 100644
--- a/src/arguments/abbreviatedNumber.ts
+++ b/src/arguments/abbreviatedNumber.ts
@@ -1,7 +1,7 @@
import { type BushArgumentTypeCaster } from '#lib';
import numeral from 'numeral';
-export const abbreviatedNumberTypeCaster: BushArgumentTypeCaster = (_, phrase): number | null => {
+export const abbreviatedNumber: BushArgumentTypeCaster = (_, phrase): number | null => {
if (!phrase) return null;
const num = numeral(phrase?.toLowerCase()).value();
diff --git a/src/arguments/contentWithDuration.ts b/src/arguments/contentWithDuration.ts
index 9bebaef..a9a7c23 100644
--- a/src/arguments/contentWithDuration.ts
+++ b/src/arguments/contentWithDuration.ts
@@ -1,6 +1,6 @@
import { type BushArgumentTypeCaster } from '#lib';
-export const contentWithDurationTypeCaster: BushArgumentTypeCaster = async (
+export const contentWithDuration: BushArgumentTypeCaster = async (
_,
phrase
): Promise<{ duration: number | null; contentWithoutTime: string | null }> => {
diff --git a/src/arguments/discordEmoji.ts b/src/arguments/discordEmoji.ts
index 6fb971a..8648f7f 100644
--- a/src/arguments/discordEmoji.ts
+++ b/src/arguments/discordEmoji.ts
@@ -1,7 +1,7 @@
import { type BushArgumentTypeCaster } from '#lib';
import { type Snowflake } from 'discord-api-types';
-export const discordEmojiTypeCaster: BushArgumentTypeCaster = (_, phrase): { name: string; id: Snowflake } | null => {
+export const discordEmoji: BushArgumentTypeCaster = (_, phrase): { name: string; id: Snowflake } | null => {
if (!phrase) return null;
const validEmoji: RegExpExecArray | null = client.consts.regex.discordEmoji.exec(phrase);
if (!validEmoji || !validEmoji.groups) return null;
diff --git a/src/arguments/duration.ts b/src/arguments/duration.ts
index e369ddd..9cb1d03 100644
--- a/src/arguments/duration.ts
+++ b/src/arguments/duration.ts
@@ -1,5 +1,5 @@
import { type BushArgumentTypeCaster } from '#lib';
-export const durationTypeCaster: BushArgumentTypeCaster = (_, phrase): number | null => {
+export const duration: BushArgumentTypeCaster = (_, phrase): number | null => {
return client.util.parseDuration(phrase).duration;
};
diff --git a/src/arguments/durationSeconds.ts b/src/arguments/durationSeconds.ts
index 78be1ce..8cbfa21 100644
--- a/src/arguments/durationSeconds.ts
+++ b/src/arguments/durationSeconds.ts
@@ -1,6 +1,6 @@
import { type BushArgumentTypeCaster } from '#lib';
-export const durationSecondsTypeCaster: BushArgumentTypeCaster = (_, phrase): number | null => {
+export const durationSeconds: BushArgumentTypeCaster = (_, phrase): number | null => {
phrase += 's';
return client.util.parseDuration(phrase).duration;
};
diff --git a/src/arguments/globalUser.ts b/src/arguments/globalUser.ts
index 344fe78..081eabf 100644
--- a/src/arguments/globalUser.ts
+++ b/src/arguments/globalUser.ts
@@ -1,7 +1,7 @@
import { BushUser, type BushArgumentTypeCaster } from '#lib';
// resolve non-cached users
-export const globalUserTypeCaster: BushArgumentTypeCaster = async (_, phrase): Promise<BushUser | null> => {
+export const globalUser: BushArgumentTypeCaster = async (_, phrase): Promise<BushUser | null> => {
return client.users.cache.has(phrase)
? client.users.cache.get(`${phrase}`) ?? null
: await client.users.fetch(`${phrase}`).catch(() => null);
diff --git a/src/arguments/permission.ts b/src/arguments/permission.ts
index 4f335dc..36c8fcb 100644
--- a/src/arguments/permission.ts
+++ b/src/arguments/permission.ts
@@ -1,7 +1,7 @@
import { type BushArgumentTypeCaster } from '#lib';
import { Permissions } from 'discord.js';
-export const permissionTypeCaster: BushArgumentTypeCaster = (_, phrase) => {
+export const permission: BushArgumentTypeCaster = (_, phrase) => {
if (!phrase) return null;
phrase = phrase.toUpperCase().replace(/ /g, '_');
if (!Reflect.has(Permissions.FLAGS, phrase)) {
diff --git a/src/arguments/roleWithDuration.ts b/src/arguments/roleWithDuration.ts
index 455ad76..9bf4bb2 100644
--- a/src/arguments/roleWithDuration.ts
+++ b/src/arguments/roleWithDuration.ts
@@ -1,6 +1,6 @@
import { type BushArgumentTypeCaster } from '#lib';
-export const roleWithDurationTypeCaster: BushArgumentTypeCaster = async (
+export const roleWithDuration: BushArgumentTypeCaster = async (
message,
phrase
): Promise<{ duration: number | null; role: string | null } | null> => {
diff --git a/src/arguments/snowflake.ts b/src/arguments/snowflake.ts
index 03d78c2..455ed63 100644
--- a/src/arguments/snowflake.ts
+++ b/src/arguments/snowflake.ts
@@ -1,7 +1,7 @@
import { type BushArgumentTypeCaster } from '#lib';
import { type Snowflake } from 'discord.js';
-export const snowflakeTypeCaster: BushArgumentTypeCaster = (_, phrase): Snowflake | null => {
+export const snowflake: BushArgumentTypeCaster = (_, phrase): Snowflake | null => {
if (!phrase) return null;
if (client.consts.regex.snowflake.test(phrase)) return phrase;
return null;
diff --git a/src/commands/config/config.ts b/src/commands/config/config.ts
index 7811663..00c6a69 100644
--- a/src/commands/config/config.ts
+++ b/src/commands/config/config.ts
@@ -101,7 +101,6 @@ export default class SettingsCommand extends BushCommand {
});
}
- // I make very readable code :)
override *args(message: BushMessage): Generator<ArgumentOptions | Flag> {
const optional = message.util.parsed!.alias === 'settings';
const setting = yield {
diff --git a/src/commands/config/features.ts b/src/commands/config/features.ts
index 7f9ffc9..8c9351d 100644
--- a/src/commands/config/features.ts
+++ b/src/commands/config/features.ts
@@ -74,21 +74,20 @@ export default class FeaturesCommand extends BushCommand {
);
}
- public generateComponents(guildFeatures: GuildFeatures[], disable: boolean): MessageActionRow {
+ public generateComponents(guildFeatures: GuildFeatures[], disable: boolean) {
return new MessageActionRow().addComponents(
- new MessageSelectMenu()
- .addOptions(
- ...guildFeatures.map((f) => ({
- label: guildFeaturesObj[f].name,
- value: f,
- description: guildFeaturesObj[f].description
- }))
- )
- .setPlaceholder('Select A Feature to Toggle')
- .setMaxValues(1)
- .setMinValues(1)
- .setCustomId('command_selectFeature')
- .setDisabled(disable)
+ new MessageSelectMenu({
+ customId: 'command_selectFeature',
+ disabled: disable,
+ maxValues: 1,
+ minValues: 2,
+ options: guildFeatures.map((f) => ({
+ label: guildFeaturesObj[f].name,
+ value: f,
+ description: guildFeaturesObj[f].description
+ })),
+ placeholder: 'Select A Feature to Toggle'
+ })
);
}
}
diff --git a/src/commands/utilities/uuid.ts b/src/commands/utilities/uuid.ts
index 556a4de..1be6079 100644
--- a/src/commands/utilities/uuid.ts
+++ b/src/commands/utilities/uuid.ts
@@ -2,7 +2,7 @@ import { BushCommand, type BushMessage } from '#lib';
export default class UuidCommand extends BushCommand {
public constructor() {
- super('uuid', {
+ super('uuid', {
aliases: ['uuid'],
category: 'utilities',
description: {
diff --git a/src/commands/utilities/wolframAlpha.ts b/src/commands/utilities/wolframAlpha.ts
index aba0f57..13512bb 100644
--- a/src/commands/utilities/wolframAlpha.ts
+++ b/src/commands/utilities/wolframAlpha.ts
@@ -1,6 +1,6 @@
import { AllowedMentions, BushCommand, type BushMessage, type BushSlashMessage } from '#lib';
import { MessageEmbed, type MessageOptions } from 'discord.js';
-const {default: WolframAlphaAPI} = (await import("wolfram-alpha-api")).default as unknown as typeof import( "wolfram-alpha-api")
+const { default: WolframAlphaAPI } = (await import("@notenoughupdates/wolfram-alpha-api")).default as unknown as typeof import("@notenoughupdates/wolfram-alpha-api")
export default class WolframAlphaCommand extends BushCommand {
public constructor() {
diff --git a/src/lib/common/typings/BushInspectOptions.d.ts b/src/lib/common/typings/BushInspectOptions.d.ts
index 11c2dc1..e51e758 100644
--- a/src/lib/common/typings/BushInspectOptions.d.ts
+++ b/src/lib/common/typings/BushInspectOptions.d.ts
@@ -12,6 +12,7 @@ export interface BushInspectOptions extends InspectOptions {
* **Default**: `false`.
*/
showHidden?: boolean | undefined;
+
/**
* Specifies the number of times to recurse while formatting `object`. This is useful
* for inspecting large objects. To recurse up to the maximum call stack size pass
@@ -20,24 +21,28 @@ export interface BushInspectOptions extends InspectOptions {
* **Default**: `2`.
*/
depth?: number | null | undefined;
+
/**
* If `true`, the output is styled with ANSI color codes. Colors are customizable. See [Customizing util.inspect colors](https://nodejs.org/api/util.html#util_customizing_util_inspect_colors).
*
* **Default**: `false`.
*/
colors?: boolean | undefined;
+
/**
* If `false`, `[util.inspect.custom](depth, opts)` functions are not invoked.
*
* **Default**: `true`.
*/
customInspect?: boolean | undefined;
+
/**
* If `true`, `Proxy` inspection includes the [`target` and `handler`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Proxy#Terminology) objects.
*
* **Default**: `false`.
*/
showProxy?: boolean | undefined;
+
/**
* Specifies the maximum number of `Array`, [`TypedArray`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/TypedArray), [`WeakMap`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WeakMap) and
* [`WeakSet`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WeakSet) elements to include when formatting. Set to `null` or `Infinity` to
@@ -46,6 +51,7 @@ export interface BushInspectOptions extends InspectOptions {
* **Default**: `100`.
*/
maxArrayLength?: number | null | undefined;
+
/**
* Specifies the maximum number of characters to include when formatting. Set to
* `null` or `Infinity` to show all elements. Set to `0` or negative to show no
@@ -54,6 +60,7 @@ export interface BushInspectOptions extends InspectOptions {
* **Default**: `10000`.
*/
maxStringLength?: number | null | undefined;
+
/**
* The length at which input values are split across multiple lines. Set to
* `Infinity` to format the input as a single line (in combination with compact set
@@ -62,6 +69,7 @@ export interface BushInspectOptions extends InspectOptions {
* **Default**: `80`.
*/
breakLength?: number | undefined;
+
/**
* Setting this to `false` causes each object key to be displayed on a new line. It
* will break on new lines in text that is longer than `breakLength`. If set to a
@@ -71,6 +79,7 @@ export interface BushInspectOptions extends InspectOptions {
* **Default**: `3`
*/
compact?: boolean | number | undefined;
+
/**
* If set to `true` or a function, all properties of an object, and `Set` and `Map`
* entries are sorted in the resulting string. If set to `true` the [default sort](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort) is used.
@@ -79,6 +88,7 @@ export interface BushInspectOptions extends InspectOptions {
* **Default**: `false`.
*/
sorted?: boolean | ((a: string, b: string) => number) | undefined;
+
/**
* If set to `true`, getters are inspected. If set to `'get'`, only getters without a
* corresponding setter are inspected. If set to `'set'`, only getters with a
diff --git a/src/lib/extensions/discord-akairo/BushClient.ts b/src/lib/extensions/discord-akairo/BushClient.ts
index 39eff3b..93ed9d7 100644
--- a/src/lib/extensions/discord-akairo/BushClient.ts
+++ b/src/lib/extensions/discord-akairo/BushClient.ts
@@ -34,15 +34,15 @@ import path from 'path';
import readline from 'readline';
import type { Sequelize as SequelizeType } from 'sequelize';
import { fileURLToPath } from 'url';
-import { abbreviatedNumberTypeCaster } from '../../../arguments/abbreviatedNumber.js';
-import { contentWithDurationTypeCaster } from '../../../arguments/contentWithDuration.js';
-import { discordEmojiTypeCaster } from '../../../arguments/discordEmoji.js';
-import { durationTypeCaster } from '../../../arguments/duration.js';
-import { durationSecondsTypeCaster } from '../../../arguments/durationSeconds.js';
-import { globalUserTypeCaster } from '../../../arguments/globalUser.js';
-import { permissionTypeCaster } from '../../../arguments/permission.js';
-import { roleWithDurationTypeCaster } from '../../../arguments/roleWithDuration.js';
-import { snowflakeTypeCaster } from '../../../arguments/snowflake.js';
+import { abbreviatedNumber } from '../../../arguments/abbreviatedNumber.js';
+import { contentWithDuration } from '../../../arguments/contentWithDuration.js';
+import { discordEmoji } from '../../../arguments/discordEmoji.js';
+import { duration } from '../../../arguments/duration.js';
+import { durationSeconds } from '../../../arguments/durationSeconds.js';
+import { globalUser } from '../../../arguments/globalUser.js';
+import { permission } from '../../../arguments/permission.js';
+import { roleWithDuration } from '../../../arguments/roleWithDuration.js';
+import { snowflake } from '../../../arguments/snowflake.js';
import UpdateCacheTask from '../../../tasks/updateCache.js';
import UpdateStatsTask from '../../../tasks/updateStats.js';
import { ActivePunishment } from '../../models/ActivePunishment.js';
@@ -136,7 +136,7 @@ export class BushClient<Ready extends boolean = boolean> extends AkairoClient<Re
public db: SequelizeType;
public logger = BushLogger;
public constants = BushConstants;
- public cache = BushCache;
+ public cache = new BushCache();
public sentry!: typeof Sentry;
public constructor(config: Config) {
@@ -279,15 +279,15 @@ export class BushClient<Ready extends boolean = boolean> extends AkairoClient<Re
gateway: this.ws
});
this.commandHandler.resolver.addTypes({
- duration: durationTypeCaster,
- contentWithDuration: contentWithDurationTypeCaster,
- permission: permissionTypeCaster,
- snowflake: snowflakeTypeCaster,
- discordEmoji: discordEmojiTypeCaster,
- roleWithDuration: roleWithDurationTypeCaster,
- abbreviatedNumber: abbreviatedNumberTypeCaster,
- durationSeconds: durationSecondsTypeCaster,
- globalUser: globalUserTypeCaster
+ duration,
+ contentWithDuration,
+ permission,
+ snowflake,
+ discordEmoji,
+ roleWithDuration,
+ abbreviatedNumber,
+ durationSeconds,
+ globalUser
});
this.sentry = Sentry;
@@ -384,49 +384,25 @@ export class BushClient<Ready extends boolean = boolean> extends AkairoClient<Re
}
public override isSuperUser(user: BushUserResolvable): boolean {
const userID = this.users.resolveId(user)!;
- return !!BushCache?.global?.superUsers?.includes(userID) || this.config.owners.includes(userID);
+ return !!client.cache?.global?.superUsers?.includes(userID) || this.config.owners.includes(userID);
}
- public override on<K extends keyof BushClientEvents>(
- event: K,
- listener: (...args: BushClientEvents[K]) => Awaitable<void>
- ): this;
- public override on<S extends string | symbol>(
- event: Exclude<S, keyof BushClientEvents>,
- listener: (...args: any[]) => Awaitable<void>
- ): this {
- return super.on(event as any, listener);
- }
- public override once<K extends keyof BushClientEvents>(
- event: K,
- listener: (...args: BushClientEvents[K]) => Awaitable<void>
- ): this;
- public override once<S extends string | symbol>(
- event: Exclude<S, keyof BushClientEvents>,
- listener: (...args: any[]) => Awaitable<void>
- ): this {
- return super.once(event as any, listener);
- }
+}
- public override emit<K extends keyof BushClientEvents>(event: K, ...args: BushClientEvents[K]): boolean;
- public override emit<S extends string | symbol>(event: Exclude<S, keyof BushClientEvents>, ...args: unknown[]): boolean {
- return super.emit(event as any, ...args);
- }
+export interface BushClient {
+ on<K extends keyof BushClientEvents>(event: K, listener: (...args: BushClientEvents[K]) => Awaitable<void>): this;
+ on<S extends string | symbol>(event: Exclude<S, keyof BushClientEvents>, listener: (...args: any[]) => Awaitable<void>): this
- public override off<K extends keyof BushClientEvents>(
- event: K,
- listener: (...args: BushClientEvents[K]) => Awaitable<void>
- ): this;
- public override off<S extends string | symbol>(
- event: Exclude<S, keyof BushClientEvents>,
- listener: (...args: any[]) => Awaitable<void>
- ): this {
- return super.off(event as any, listener);
- }
+ once<K extends keyof BushClientEvents>(event: K, listener: (...args: BushClientEvents[K]) => Awaitable<void>): this;
+ once<S extends string | symbol>(event: Exclude<S, keyof BushClientEvents>, listener: (...args: any[]) => Awaitable<void>): this
- public override removeAllListeners<K extends keyof BushClientEvents>(event?: K): this;
- public override removeAllListeners<S extends string | symbol>(event?: Exclude<S, keyof BushClientEvents>): this {
- return super.removeAllListeners(event as any);
- }
+ emit<K extends keyof BushClientEvents>(event: K, ...args: BushClientEvents[K]): boolean;
+ emit<S extends string | symbol>(event: Exclude<S, keyof BushClientEvents>, ...args: unknown[]): boolean
+
+ off<K extends keyof BushClientEvents>(event: K, listener: (...args: BushClientEvents[K]) => Awaitable<void>): this;
+ off<S extends string | symbol>(event: Exclude<S, keyof BushClientEvents>, listener: (...args: any[]) => Awaitable<void>): this
+
+ removeAllListeners<K extends keyof BushClientEvents>(event?: K): this;
+ removeAllListeners<S extends string | symbol>(event?: Exclude<S, keyof BushClientEvents>): this
}
diff --git a/src/lib/extensions/discord-akairo/BushClientUtil.ts b/src/lib/extensions/discord-akairo/BushClientUtil.ts
index f619b4b..4b68b2e 100644
--- a/src/lib/extensions/discord-akairo/BushClientUtil.ts
+++ b/src/lib/extensions/discord-akairo/BushClientUtil.ts
@@ -2,7 +2,6 @@ import {
Arg,
BushConstants,
Global,
- type BushCache,
type BushClient,
type BushInspectOptions,
type BushMessage,
@@ -388,7 +387,7 @@ export class BushClientUtil extends ClientUtil {
public async insertOrRemoveFromGlobal(
action: 'add' | 'remove',
- key: keyof typeof BushCache['global'],
+ key: keyof typeof client['cache']['global'],
value: any
): Promise<Global | void> {
const row =
diff --git a/src/lib/extensions/discord.js/BushGuild.ts b/src/lib/extensions/discord.js/BushGuild.ts
index dd01c55..5849749 100644
--- a/src/lib/extensions/discord.js/BushGuild.ts
+++ b/src/lib/extensions/discord.js/BushGuild.ts
@@ -191,7 +191,7 @@ export class BushGuild extends Guild {
const userObject = client.users.cache.get(user.id);
const dmSuccess = await userObject
- ?.send(`You have been unbanned from **${this}** for **${options.reason ?? 'No reason provided'}**.`)
+ ?.send(`You have been unbanned from **${util.discord.escapeMarkdown(this.toString())}** for **${options.reason ?? 'No reason provided'}**.`)
.catch(() => false);
dmSuccessEvent = !!dmSuccess;
diff --git a/src/lib/utils/BushCache.ts b/src/lib/utils/BushCache.ts
index d633898..3808538 100644
--- a/src/lib/utils/BushCache.ts
+++ b/src/lib/utils/BushCache.ts
@@ -2,12 +2,14 @@ import { Collection, type Snowflake } from 'discord.js';
import { Guild } from '../models/Guild.js';
export class BushCache {
- public static global = {
- superUsers: new Array<Snowflake>(),
- disabledCommands: new Array<string>(),
- blacklistedChannels: new Array<Snowflake>(),
- blacklistedGuilds: new Array<Snowflake>(),
- blacklistedUsers: new Array<Snowflake>()
- };
- public static guilds = new Collection<Snowflake, Guild>();
+ public global = new GlobalCache();
+ public guilds = new Collection<Snowflake, Guild>();
+}
+
+export class GlobalCache {
+ public superUsers: Snowflake[] = [];
+ public disabledCommands: string[] = []
+ public blacklistedChannels: Snowflake[] = [];
+ public blacklistedGuilds: Snowflake[] = [];
+ public blacklistedUsers: Snowflake[] = [];
}
diff --git a/tsconfig.json b/tsconfig.json
index a5025c0..136ef4a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -6,8 +6,6 @@
"outDir": "dist",
"lib": ["esnext", "esnext.array", "esnext.asyncIterable", "esnext.intl", "esnext.symbol"],
"sourceMap": true,
- // "inlineSourceMap": true,
- // "inlineSources": true,
"incremental": true,
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
@@ -21,7 +19,6 @@
"noEmitHelpers": true,
"importHelpers": true,
"allowSyntheticDefaultImports": true,
- // "importsNotUsedAsValues": "error",
"preserveValueImports": true,
"removeComments": true,
"paths": {
diff --git a/yarn.lock b/yarn.lock
index 7b2353f..ec70510 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5,39 +5,12 @@ __metadata:
version: 5
cacheKey: 8
-"@babel/code-frame@npm:7.12.11":
- version: 7.12.11
- resolution: "@babel/code-frame@npm:7.12.11"
- dependencies:
- "@babel/highlight": ^7.10.4
- checksum: 3963eff3ebfb0e091c7e6f99596ef4b258683e4ba8a134e4e95f77afe85be5c931e184fff6435fb4885d12eba04a5e25532f7fbc292ca13b48e7da943474e2f3
- languageName: node
- linkType: hard
-
-"@babel/helper-validator-identifier@npm:^7.15.7":
- version: 7.15.7
- resolution: "@babel/helper-validator-identifier@npm:7.15.7"
- checksum: f041c28c531d1add5cc345b25d5df3c29c62bce3205b4d4a93dcd164ccf630350acba252d374fad8f5d8ea526995a215829f27183ba7ce7ce141843bf23068a6
- languageName: node
- linkType: hard
-
-"@babel/highlight@npm:^7.10.4":
- version: 7.16.0
- resolution: "@babel/highlight@npm:7.16.0"
- dependencies:
- "@babel/helper-validator-identifier": ^7.15.7
- chalk: ^2.0.0
- js-tokens: ^4.0.0
- checksum: abf244c48fcff20ec87830e8b99c776f4dcdd9138e63decc195719a94148da35339639e0d8045eb9d1f3e67a39ab90a9c3f5ce2d579fb1a0368d911ddf29b4e5
- languageName: node
- linkType: hard
-
-"@babel/runtime@npm:^7.15.4":
- version: 7.16.0
- resolution: "@babel/runtime@npm:7.16.0"
+"@babel/runtime@npm:^7.16.0":
+ version: 7.16.3
+ resolution: "@babel/runtime@npm:7.16.3"
dependencies:
regenerator-runtime: ^0.13.4
- checksum: bfbca3ec52c94de262a3932473bceeead1a088b50194108fa1ff6eda447333f0f7d43fa4e9c5937c6e5d45bf838da8480905d0a227589b257c51f954ea060bac
+ checksum: ab8ac887096d76185ddbf291d28fb976cd32473696dc497ad4905b784acbd5aa462533ad83a5c5104e10ead28c2e0e119840ee28ed8eff90dcdde9d57f916eda
languageName: node
linkType: hard
@@ -72,20 +45,20 @@ __metadata:
languageName: node
linkType: hard
-"@eslint/eslintrc@npm:^0.4.3":
- version: 0.4.3
- resolution: "@eslint/eslintrc@npm:0.4.3"
+"@eslint/eslintrc@npm:^1.0.4":
+ version: 1.0.4
+ resolution: "@eslint/eslintrc@npm:1.0.4"
dependencies:
ajv: ^6.12.4
- debug: ^4.1.1
- espree: ^7.3.0
+ debug: ^4.3.2
+ espree: ^9.0.0
globals: ^13.9.0
ignore: ^4.0.6
import-fresh: ^3.2.1
- js-yaml: ^3.13.1
+ js-yaml: ^4.1.0
minimatch: ^3.0.4
strip-json-comments: ^3.1.1
- checksum: 03a7704150b868c318aab6a94d87a33d30dc2ec579d27374575014f06237ba1370ae11178db772f985ef680d469dc237e7b16a1c5d8edaaeb8c3733e7a95a6d3
+ checksum: 570f87e216944830b3761889f14cdf1e9bc7dcc2211e941585cfc2768575954e26852605eb441e21c9581472f89ea0e9cfdb8309523e9fe0a57fe9342bda4fe0
languageName: node
linkType: hard
@@ -96,14 +69,14 @@ __metadata:
languageName: node
linkType: hard
-"@humanwhocodes/config-array@npm:^0.5.0":
- version: 0.5.0
- resolution: "@humanwhocodes/config-array@npm:0.5.0"
+"@humanwhocodes/config-array@npm:^0.6.0":
+ version: 0.6.0
+ resolution: "@humanwhocodes/config-array@npm:0.6.0"
dependencies:
"@humanwhocodes/object-schema": ^1.2.0
debug: ^4.1.1
minimatch: ^3.0.4
- checksum: 44ee6a9f05d93dd9d5935a006b17572328ba9caff8002442f601736cbda79c580cc0f5a49ce9eb88fbacc5c3a6b62098357c2e95326cd17bb9f1a6c61d6e95e7
+ checksum: 1025b07514b7bfd10a05e8b6cb5e6520878e9c8836b3dd0569fc07df29a09e428c2df1e0760b1d461da8ed6f81ca83ecb02e24198f80b0a177a2acbf532e267c
languageName: node
linkType: hard
@@ -160,6 +133,13 @@ __metadata:
languageName: node
linkType: hard
+"@notenoughupdates/wolfram-alpha-api@npm:^1.0.0":
+ version: 1.0.1
+ resolution: "@notenoughupdates/wolfram-alpha-api@npm:1.0.1"
+ checksum: 06a3db6054da8bfd3877cd18bd10bd4b332891d298c80545029a8476cdfaecf9b42f775b8cf6b60e723210585612e34d4b910a0beac7dd9cc8c013b85550cd98
+ languageName: node
+ linkType: hard
+
"@npmcli/fs@npm:^1.0.0":
version: 1.0.0
resolution: "@npmcli/fs@npm:1.0.0"
@@ -187,85 +167,85 @@ __metadata:
languageName: node
linkType: hard
-"@sentry/core@npm:6.14.1":
- version: 6.14.1
- resolution: "@sentry/core@npm:6.14.1"
+"@sentry/core@npm:6.14.3":
+ version: 6.14.3
+ resolution: "@sentry/core@npm:6.14.3"
dependencies:
- "@sentry/hub": 6.14.1
- "@sentry/minimal": 6.14.1
- "@sentry/types": 6.14.1
- "@sentry/utils": 6.14.1
+ "@sentry/hub": 6.14.3
+ "@sentry/minimal": 6.14.3
+ "@sentry/types": 6.14.3
+ "@sentry/utils": 6.14.3
tslib: ^1.9.3
- checksum: 858f54b39fce1c4048b91ec4bf004bda1fcd8405d75399da5e2986688fade036f7fb17e02ecf545fa7a3e9b45dd37edc9809e6d10b32e16c3d0a9aa2efe0ff13
+ checksum: f3edb42055a6baf6accfc0e44c8a4811f727d184a85d63f57da2aac3b5bbe43898590be6a2a2ecb2bfb68ea02c26f007ca3aa4d13afd4b0548064aa4065626b3
languageName: node
linkType: hard
-"@sentry/hub@npm:6.14.1":
- version: 6.14.1
- resolution: "@sentry/hub@npm:6.14.1"
+"@sentry/hub@npm:6.14.3":
+ version: 6.14.3
+ resolution: "@sentry/hub@npm:6.14.3"
dependencies:
- "@sentry/types": 6.14.1
- "@sentry/utils": 6.14.1
+ "@sentry/types": 6.14.3
+ "@sentry/utils": 6.14.3
tslib: ^1.9.3
- checksum: 250d27b54342d651c91783734f9ea52e1dd1eb45781b7d03b9ba59b6d2975a03ee66d91668130fa746c04e4a9c54fae7f7f3decd849c560b362fbbadb1cb54a2
+ checksum: b65086a935f38f08518f8862c22d8caa8970ef0a86f57a50dd47ec254e458811f9eede85f48d612213712f102a254ebe87dfa9744e5f602752050e313d99eef3
languageName: node
linkType: hard
-"@sentry/minimal@npm:6.14.1":
- version: 6.14.1
- resolution: "@sentry/minimal@npm:6.14.1"
+"@sentry/minimal@npm:6.14.3":
+ version: 6.14.3
+ resolution: "@sentry/minimal@npm:6.14.3"
dependencies:
- "@sentry/hub": 6.14.1
- "@sentry/types": 6.14.1
+ "@sentry/hub": 6.14.3
+ "@sentry/types": 6.14.3
tslib: ^1.9.3
- checksum: f3408a661a39b52f6f41d7bf62eb791e87748f5d722e26fc9952ccf29e0c677b7fbe2fc5506023fec31dd13377796f127500f25bfdabc70afd9e965c687d8c7e
+ checksum: f8e421a2f16468531b77b89a424ae075a2893260c18da68480b46a6468f34d49ccf50e24b2691d9866dc2b6a2ebeb7a346ce15f7848ed56979da60f8bb64902e
languageName: node
linkType: hard
-"@sentry/node@npm:^6.14.1":
- version: 6.14.1
- resolution: "@sentry/node@npm:6.14.1"
+"@sentry/node@npm:^6.14.3":
+ version: 6.14.3
+ resolution: "@sentry/node@npm:6.14.3"
dependencies:
- "@sentry/core": 6.14.1
- "@sentry/hub": 6.14.1
- "@sentry/tracing": 6.14.1
- "@sentry/types": 6.14.1
- "@sentry/utils": 6.14.1
+ "@sentry/core": 6.14.3
+ "@sentry/hub": 6.14.3
+ "@sentry/tracing": 6.14.3
+ "@sentry/types": 6.14.3
+ "@sentry/utils": 6.14.3
cookie: ^0.4.1
https-proxy-agent: ^5.0.0
lru_map: ^0.3.3
tslib: ^1.9.3
- checksum: d22d570dc9283231b0c1397b345800a7ae0f7e9676e9a949382283fe69690529a77f17af4d2de8e72a3f06d5b4b67a5720f80c13226579502c404e33291dd988
+ checksum: 94254310c1d8cbf58afe3402edfac8959e02cdf70ff152671aaf7e70b33b77bd49c47facaf73ebf015bc887bb71adafde6284a2ff7880b0409fa65de8b49478b
languageName: node
linkType: hard
-"@sentry/tracing@npm:6.14.1, @sentry/tracing@npm:^6.14.1":
- version: 6.14.1
- resolution: "@sentry/tracing@npm:6.14.1"
+"@sentry/tracing@npm:6.14.3, @sentry/tracing@npm:^6.14.3":
+ version: 6.14.3
+ resolution: "@sentry/tracing@npm:6.14.3"
dependencies:
- "@sentry/hub": 6.14.1
- "@sentry/minimal": 6.14.1
- "@sentry/types": 6.14.1
- "@sentry/utils": 6.14.1
+ "@sentry/hub": 6.14.3
+ "@sentry/minimal": 6.14.3
+ "@sentry/types": 6.14.3
+ "@sentry/utils": 6.14.3
tslib: ^1.9.3
- checksum: f31c96337e6697a2466cc2aa6435368bdcdb43203696d7e8d895922d1d5627e065ad608f5d62e85a831a9e779c01fe037dcaa45e7b8daaaf2eb22b9a67211776
+ checksum: b0f161f244651a97a00185e08215c7dfe32687c1fb3b5fe58b59ad7bf8953b090c0e831e0c5d3bf1da1b219e5b5ab1ffcc9b81adc01c09e0abebc344f656c036
languageName: node
linkType: hard
-"@sentry/types@npm:6.14.1":
- version: 6.14.1
- resolution: "@sentry/types@npm:6.14.1"
- checksum: 882324b724cb5783e75615b535c45a51ed8c51320690d15b48322b8f3d2fd147d81411199982a6068b8b83547bd017ba3ff00314526bf9f0b94e5698bd4cfe20
+"@sentry/types@npm:6.14.3":
+ version: 6.14.3
+ resolution: "@sentry/types@npm:6.14.3"
+ checksum: c509c5faed57a66b4f670a9a6504c31b9721c06721240c0e0dd01165a48c79005e677efae3bb666037683be1fe5a48225bd8ec90f1a3e70903d992c608b27c3d
languageName: node
linkType: hard
-"@sentry/utils@npm:6.14.1":
- version: 6.14.1
- resolution: "@sentry/utils@npm:6.14.1"
+"@sentry/utils@npm:6.14.3":
+ version: 6.14.3
+ resolution: "@sentry/utils@npm:6.14.3"
dependencies:
- "@sentry/types": 6.14.1
+ "@sentry/types": 6.14.3
tslib: ^1.9.3
- checksum: 24add29f0e310c35278fca3a014da06998e4bceacfb26dc8fc4d0b1307662ac6d484194074ad000cbfd940220b3ca6134858ec134b8f653296baaad1426b5b37
+ checksum: 29c6ed230b73a8cb387af137ac17789e33d3ab98446bddbbba3e02ec98cc96c5ef9bbe771093ac75fd78f7e1605c9b70a29d542f2e2ad6278deee6521a2e49ab
languageName: node
linkType: hard
@@ -324,13 +304,13 @@ __metadata:
linkType: hard
"@types/express-serve-static-core@npm:^4.17.18":
- version: 4.17.24
- resolution: "@types/express-serve-static-core@npm:4.17.24"
+ version: 4.17.25
+ resolution: "@types/express-serve-static-core@npm:4.17.25"
dependencies:
"@types/node": "*"
"@types/qs": "*"
"@types/range-parser": "*"
- checksum: 2f0b4711261d663bf93df4dbd6f0270e84d1624278e2f3722cf050e2e6be521b6d385bb69bd0eac14abbf1119d4b308a731ec746fb2c3848697658e9e49e5676
+ checksum: a60d44676db470afd413130ca8b464d864eb2c1a882b1037a52c5b612eebb61bcc4289d927cb09456be56c78bebe3cb24ffeaf0fa11bd7f5237a3ed5360abf3a
languageName: node
linkType: hard
@@ -353,7 +333,7 @@ __metadata:
languageName: node
linkType: hard
-"@types/humanize-duration@npm:^3.25.1":
+"@types/humanize-duration@npm:^3.27.0":
version: 3.27.0
resolution: "@types/humanize-duration@npm:3.27.0"
checksum: 2c3dc11efec4ff6ae352d9738955ae952a1336c4123c41736dfe30dc58a5bd42ead3f8ee1827e0da8feb7b70e4e3c2f9367925f9bb236ffcfc05799014058683
@@ -407,10 +387,10 @@ __metadata:
languageName: node
linkType: hard
-"@types/node@npm:*, @types/node@npm:^16.11.6":
- version: 16.11.6
- resolution: "@types/node@npm:16.11.6"
- checksum: 6e19634766ff589d3d2f361c2196b671f8f133cdadc5ad347a621c360d8994b6c4fbccfb2ad9c60c588c593831a96497c9c6b77d2b7e91be723384b94f6368e7
+"@types/node@npm:*, @types/node@npm:^16.11.7":
+ version: 16.11.7
+ resolution: "@types/node@npm:16.11.7"
+ checksum: 2706403e6efc4aa40fdce8f0b5d9884d5600c3c8610aedc7fa5e7e298d30366f7e8b7296028d52898dca3edef4c3e827b03bf20952c4780f13fa4e79864f7a86
languageName: node
linkType: hard
@@ -461,7 +441,7 @@ __metadata:
languageName: node
linkType: hard
-"@types/validator@npm:^13.6.3":
+"@types/validator@npm:^13.6.6":
version: 13.6.6
resolution: "@types/validator@npm:13.6.6"
checksum: cae90ccbb067640bbed2c233b6393b986529fc9b695a04516708354a5df5419cb0f588e5dd4c8a0c6127402d38d060519b9738ab8aab80f70bc92a6b354a43da
@@ -477,12 +457,12 @@ __metadata:
languageName: node
linkType: hard
-"@typescript-eslint/eslint-plugin@npm:^5.2.0":
- version: 5.3.0
- resolution: "@typescript-eslint/eslint-plugin@npm:5.3.0"
+"@typescript-eslint/eslint-plugin@npm:^5.3.1":
+ version: 5.3.1
+ resolution: "@typescript-eslint/eslint-plugin@npm:5.3.1"
dependencies:
- "@typescript-eslint/experimental-utils": 5.3.0
- "@typescript-eslint/scope-manager": 5.3.0
+ "@typescript-eslint/experimental-utils": 5.3.1
+ "@typescript-eslint/scope-manager": 5.3.1
debug: ^4.3.2
functional-red-black-tree: ^1.0.1
ignore: ^5.1.8
@@ -495,66 +475,66 @@ __metadata:
peerDependenciesMeta:
typescript:
optional: true
- checksum: dc053205db698c65905c7821ff7a61641f218b505c7cea690c01ac464d404973e5d71965040d3560da17024569c9a3836053037bea7bd1cfce4e448beaf179be
+ checksum: 084cac897b5f72a7abaea43e29e8a0dd47b1f13904637957e149ad1a8501e777200ae1c7ac13428be7a33490459867eec5848c6d281130f5b064ec52e6b90f6d
languageName: node
linkType: hard
-"@typescript-eslint/experimental-utils@npm:5.3.0":
- version: 5.3.0
- resolution: "@typescript-eslint/experimental-utils@npm:5.3.0"
+"@typescript-eslint/experimental-utils@npm:5.3.1":
+ version: 5.3.1
+ resolution: "@typescript-eslint/experimental-utils@npm:5.3.1"
dependencies:
"@types/json-schema": ^7.0.9
- "@typescript-eslint/scope-manager": 5.3.0
- "@typescript-eslint/types": 5.3.0
- "@typescript-eslint/typescript-estree": 5.3.0
+ "@typescript-eslint/scope-manager": 5.3.1
+ "@typescript-eslint/types": 5.3.1
+ "@typescript-eslint/typescript-estree": 5.3.1
eslint-scope: ^5.1.1
eslint-utils: ^3.0.0
peerDependencies:
eslint: "*"
- checksum: 889d6e78f35ac637b1f31d802ba6c5c30c762a402ade341a8df70f447c39ba8ece0aafd9fbdf6bf8954c957daf69025907e0b9191b9c2e61ea056d2b01a8b3c5
+ checksum: 638829731400d3f654fdfb7ec173fc568f65cc9fbaaacffa8aa369411ba33acf9220bde9981a1226789fe15a1a1738c1840f5f26841bdc6583df5c72a90f01d7
languageName: node
linkType: hard
-"@typescript-eslint/parser@npm:^5.2.0":
- version: 5.3.0
- resolution: "@typescript-eslint/parser@npm:5.3.0"
+"@typescript-eslint/parser@npm:^5.3.1":
+ version: 5.3.1
+ resolution: "@typescript-eslint/parser@npm:5.3.1"
dependencies:
- "@typescript-eslint/scope-manager": 5.3.0
- "@typescript-eslint/types": 5.3.0
- "@typescript-eslint/typescript-estree": 5.3.0
+ "@typescript-eslint/scope-manager": 5.3.1
+ "@typescript-eslint/types": 5.3.1
+ "@typescript-eslint/typescript-estree": 5.3.1
debug: ^4.3.2
peerDependencies:
eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
peerDependenciesMeta:
typescript:
optional: true
- checksum: 7f523a32f4f44b87a1f907ae6206b47f6bfa892211fea0e670939b55aed3c027bc11e087979d0b798b12bc045dd2c7205035449caecc14b0810b38f44942bbb8
+ checksum: 9ca2928ca3400898a16700deb5deb5aeb2e45c9f430e243be78e6aefa8e515edcb0d210e8ad2b195894a228a7d9c9355906cb68b9c7ed6b23642672465e501a3
languageName: node
linkType: hard
-"@typescript-eslint/scope-manager@npm:5.3.0":
- version: 5.3.0
- resolution: "@typescript-eslint/scope-manager@npm:5.3.0"
+"@typescript-eslint/scope-manager@npm:5.3.1":
+ version: 5.3.1
+ resolution: "@typescript-eslint/scope-manager@npm:5.3.1"
dependencies:
- "@typescript-eslint/types": 5.3.0
- "@typescript-eslint/visitor-keys": 5.3.0
- checksum: f2ca9416fccb811682650c2096b839e2af3c71459d98374fe446e4fced59917cb91ae83c351288eb955d00eaba6b77b9ea46272bef4e005fb368b65e8ff22976
+ "@typescript-eslint/types": 5.3.1
+ "@typescript-eslint/visitor-keys": 5.3.1
+ checksum: 336bb99351be878c62c591c408bce24ee08fb3eef76595175263ac906d6153e1b75000696c093b869d904b9a3e80b8d2e550df5f52996c77f702be69c8c4c28d
languageName: node
linkType: hard
-"@typescript-eslint/types@npm:5.3.0":
- version: 5.3.0
- resolution: "@typescript-eslint/types@npm:5.3.0"
- checksum: 23abd7b953ec96d4ea78046b92e6ed4a67a3dfa3bfd4e90eb646769ff5124cd8ff237eb8da8c7b74bc944cbd770ce4bdded48f2595793be65ed55c1b8771e29c
+"@typescript-eslint/types@npm:5.3.1":
+ version: 5.3.1
+ resolution: "@typescript-eslint/types@npm:5.3.1"
+ checksum: ccba0a505b96860b9a29f8cd1cd3c9dc7903fd21274c538ee988a4cf69c24274822e12ade61d05088626e43e3159ef5a9f5c0f4344d2c2223c6b3649cc70efb7
languageName: node
linkType: hard
-"@typescript-eslint/typescript-estree@npm:5.3.0":
- version: 5.3.0
- resolution: "@typescript-eslint/typescript-estree@npm:5.3.0"
+"@typescript-eslint/typescript-estree@npm:5.3.1":
+ version: 5.3.1
+ resolution: "@typescript-eslint/typescript-estree@npm:5.3.1"
dependencies:
- "@typescript-eslint/types": 5.3.0
- "@typescript-eslint/visitor-keys": 5.3.0
+ "@typescript-eslint/types": 5.3.1
+ "@typescript-eslint/visitor-keys": 5.3.1
debug: ^4.3.2
globby: ^11.0.4
is-glob: ^4.0.3
@@ -563,17 +543,17 @@ __metadata:
peerDependenciesMeta:
typescript:
optional: true
- checksum: 94f627ff7ce01bccddc0655d8a7d8818fcee2bbd42b39e4b2190bafd256325dd8f536325bb476fa17d13339004fd8aec9bce7665c757e51974122b76a84a669b
+ checksum: cc29aabda0e2f86783d82455a790deaa0b66b74373ae76709846d29eccce4fe7e942596e9329df39ad1ad44e7360100e9d0372e21ac66a0ab018ca8c10094c43
languageName: node
linkType: hard
-"@typescript-eslint/visitor-keys@npm:5.3.0":
- version: 5.3.0
- resolution: "@typescript-eslint/visitor-keys@npm:5.3.0"
+"@typescript-eslint/visitor-keys@npm:5.3.1":
+ version: 5.3.1
+ resolution: "@typescript-eslint/visitor-keys@npm:5.3.1"
dependencies:
- "@typescript-eslint/types": 5.3.0
+ "@typescript-eslint/types": 5.3.1
eslint-visitor-keys: ^3.0.0
- checksum: 5c2be2c4540da9f7e1186a4f1fcca7411615f327c4476bf07853727c610d5b66990c7b3037b277310d0ebfc2f1548c2ff01ed1c535176ae6171f10a3de968a34
+ checksum: e2a2fb9dfa77d1db685540dd65c7fc8477ad910459cfdfe3600fff4ed27105f5a976cf1cfddc588f9231d74287e722b038ea17ba7b3ccff672642b492222f303
languageName: node
linkType: hard
@@ -593,12 +573,12 @@ __metadata:
languageName: node
linkType: hard
-"acorn@npm:^7.4.0":
- version: 7.4.1
- resolution: "acorn@npm:7.4.1"
+"acorn@npm:^8.5.0":
+ version: 8.5.0
+ resolution: "acorn@npm:8.5.0"
bin:
acorn: bin/acorn
- checksum: 1860f23c2107c910c6177b7b7be71be350db9e1080d814493fae143ae37605189504152d1ba8743ba3178d0b37269ce1ffc42b101547fdc1827078f82671e407
+ checksum: 2e4c1dbed3da327684863debf31d341bf8882c6893c506653872c00977eee45675feb9129255d6c74c88424d2b20d889ca6de5b39776e5e3cccfc756b3ca1da8
languageName: node
linkType: hard
@@ -644,18 +624,6 @@ __metadata:
languageName: node
linkType: hard
-"ajv@npm:^8.0.1":
- version: 8.6.3
- resolution: "ajv@npm:8.6.3"
- dependencies:
- fast-deep-equal: ^3.1.1
- json-schema-traverse: ^1.0.0
- require-from-string: ^2.0.2
- uri-js: ^4.2.2
- checksum: 690ffb9408415fdab43686b3f92037ba0c8362f5d0709a123ba3fb546e6ad81414455f80a2b5cc432ce924afe9864671198f022bc331a19c072d4ede152ec3ca
- languageName: node
- linkType: hard
-
"ansi-colors@npm:^4.1.1":
version: 4.1.1
resolution: "ansi-colors@npm:4.1.1"
@@ -684,16 +652,7 @@ __metadata:
languageName: node
linkType: hard
-"ansi-styles@npm:^3.2.1":
- version: 3.2.1
- resolution: "ansi-styles@npm:3.2.1"
- dependencies:
- color-convert: ^1.9.0
- checksum: d85ade01c10e5dd77b6c89f34ed7531da5830d2cb5882c645f330079975b716438cd7ebb81d0d6e6b4f9c577f19ae41ab55f07f19786b02f9dfd9e0377395665
- languageName: node
- linkType: hard
-
-"ansi-styles@npm:^4.0.0, ansi-styles@npm:^4.1.0":
+"ansi-styles@npm:^4.1.0":
version: 4.3.0
resolution: "ansi-styles@npm:4.3.0"
dependencies:
@@ -743,12 +702,10 @@ __metadata:
languageName: node
linkType: hard
-"argparse@npm:^1.0.7":
- version: 1.0.10
- resolution: "argparse@npm:1.0.10"
- dependencies:
- sprintf-js: ~1.0.2
- checksum: 7ca6e45583a28de7258e39e13d81e925cfa25d7d4aacbf806a382d3c02fcb13403a07fb8aeef949f10a7cfe4a62da0e2e807b348a5980554cc28ee573ef95945
+"argparse@npm:^2.0.1":
+ version: 2.0.1
+ resolution: "argparse@npm:2.0.1"
+ checksum: 83644b56493e89a254bae05702abf3a1101b4fa4d0ca31df1c9985275a5a5bd47b3c27b7fa0b71098d41114d8ca000e6ed90cad764b306f8a503665e4d517ced
languageName: node
linkType: hard
@@ -759,13 +716,6 @@ __metadata:
languageName: node
linkType: hard
-"astral-regex@npm:^2.0.0":
- version: 2.0.0
- resolution: "astral-regex@npm:2.0.0"
- checksum: 876231688c66400473ba505731df37ea436e574dd524520294cc3bbc54ea40334865e01fa0d074d74d036ee874ee7e62f486ea38bc421ee8e6a871c06f011766
- languageName: node
- linkType: hard
-
"asynckit@npm:^0.4.0":
version: 0.4.0
resolution: "asynckit@npm:0.4.0"
@@ -817,34 +767,35 @@ __metadata:
version: 0.0.0-use.local
resolution: "bush-bot@workspace:."
dependencies:
- "@sentry/node": ^6.14.1
- "@sentry/tracing": ^6.14.1
+ "@notenoughupdates/wolfram-alpha-api": ^1.0.0
+ "@sentry/node": ^6.14.3
+ "@sentry/tracing": ^6.14.3
"@types/express": ^4.17.13
- "@types/humanize-duration": ^3.25.1
+ "@types/humanize-duration": ^3.27.0
"@types/lodash": ^4.14.176
- "@types/node": ^16.11.6
+ "@types/node": ^16.11.7
"@types/node-os-utils": ^1.2.0
"@types/numeral": ^2.0.2
"@types/tinycolor2": ^1.4.3
- "@types/validator": ^13.6.3
- "@typescript-eslint/eslint-plugin": ^5.2.0
- "@typescript-eslint/parser": ^5.2.0
+ "@types/validator": ^13.6.6
+ "@typescript-eslint/eslint-plugin": ^5.3.1
+ "@typescript-eslint/parser": ^5.3.1
canvas: ^2.8.0
chalk: ^4.1.2
discord-akairo: "npm:@notenoughupdates/discord-akairo@dev"
discord-api-types: 0.24.0
discord.js: "npm:@notenoughupdates/discord.js@dev"
discord.js-minesweeper: ^1.0.6
- eslint: ^7.32.0
+ eslint: ^8.2.0
eslint-config-prettier: ^8.3.0
events-intercept: ^2.0.0
fuse.js: ^6.4.6
got: ^11.8.2
humanize-duration: ^3.27.0
lodash: ^4.17.21
- mathjs: ^9.5.0
+ mathjs: ^10.0.0
moment: ^2.29.1
- nanoid: ^3.1.28
+ nanoid: ^3.1.30
node-os-utils: ^1.3.5
numeral: ^2.0.6
pg: ^8.7.1
@@ -852,13 +803,12 @@ __metadata:
prettier: ^2.4.1
pretty-bytes: ^5.6.0
rimraf: ^3.0.2
- sequelize: ^6.6.5
+ sequelize: ^6.9.0
simplify-number: ^1.0.0
source-map-support: ^0.5.20
tinycolor2: ^1.4.2
tslib: ^2.3.1
typescript: rc
- wolfram-alpha-api: "npm:@notenoughupdates/wolfram-alpha-api@latest"
languageName: unknown
linkType: soft
@@ -929,17 +879,6 @@ __metadata:
languageName: node
linkType: hard
-"chalk@npm:^2.0.0":
- version: 2.4.2
- resolution: "chalk@npm:2.4.2"
- dependencies:
- ansi-styles: ^3.2.1
- escape-string-regexp: ^1.0.5
- supports-color: ^5.3.0
- checksum: ec3661d38fe77f681200f878edbd9448821924e0f93a9cefc0e26a33b145f1027a2084bf19967160d11e1f03bfe4eaffcabf5493b89098b2782c3fe0b03d80c2
- languageName: node
- linkType: hard
-
"chalk@npm:^4.0.0, chalk@npm:^4.1.2":
version: 4.1.2
resolution: "chalk@npm:4.1.2"
@@ -980,15 +919,6 @@ __metadata:
languageName: node
linkType: hard
-"color-convert@npm:^1.9.0":
- version: 1.9.3
- resolution: "color-convert@npm:1.9.3"
- dependencies:
- color-name: 1.1.3
- checksum: fd7a64a17cde98fb923b1dd05c5f2e6f7aefda1b60d67e8d449f9328b4e53b228a428fd38bfeaeb2db2ff6b6503a776a996150b80cdf224062af08a5c8a3a203
- languageName: node
- linkType: hard
-
"color-convert@npm:^2.0.1":
version: 2.0.1
resolution: "color-convert@npm:2.0.1"
@@ -998,13 +928,6 @@ __metadata:
languageName: node
linkType: hard
-"color-name@npm:1.1.3":
- version: 1.1.3
- resolution: "color-name@npm:1.1.3"
- checksum: 09c5d3e33d2105850153b14466501f2bfb30324a2f76568a408763a3b7433b0e50e5b4ab1947868e65cb101bb7cb75029553f2c333b6d4b8138a73fcc133d69d
- languageName: node
- linkType: hard
-
"color-name@npm:~1.1.4":
version: 1.1.4
resolution: "color-name@npm:1.1.4"
@@ -1076,7 +999,7 @@ __metadata:
languageName: node
linkType: hard
-"debug@npm:4, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2":
+"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2":
version: 4.3.2
resolution: "debug@npm:4.3.2"
dependencies:
@@ -1167,12 +1090,12 @@ __metadata:
linkType: hard
"discord-akairo@npm:@notenoughupdates/discord-akairo@dev":
- version: 9.0.6-dev.1636292283.735e059
- resolution: "@notenoughupdates/discord-akairo@npm:9.0.6-dev.1636292283.735e059"
+ version: 9.0.8-dev.1636663997.73c25d1
+ resolution: "@notenoughupdates/discord-akairo@npm:9.0.8-dev.1636663997.73c25d1"
dependencies:
lodash: ^4.17.21
source-map-support: ^0.5.20
- checksum: f30252f59bc41f29158a42e287df9e759a8a1c0994f259c4bf039cfa375d5bd98caf6ccd165782a83ed055a8715319a7dffa8712e60eff8cbc40d4094d753579
+ checksum: e23420a8cb327514e7ec1d18c56e7260dc886abc4f95a2aad67716fe3aaf551d0d25d166edd78874e14d8eacabcbc8b1eebb878ac6cd77bf1c4f452e89b1e87c
languageName: node
linkType: hard
@@ -1191,8 +1114,8 @@ __metadata:
linkType: hard
"discord.js@npm:@notenoughupdates/discord.js@dev":
- version: 13.4.0-dev.1636291868.d25efe3
- resolution: "@notenoughupdates/discord.js@npm:13.4.0-dev.1636291868.d25efe3"
+ version: 13.4.0-dev.1636632488.a17b9bc
+ resolution: "@notenoughupdates/discord.js@npm:13.4.0-dev.1636632488.a17b9bc"
dependencies:
"@discordjs/builders": ^0.8.1
"@discordjs/collection": ^0.3.2
@@ -1203,7 +1126,7 @@ __metadata:
discord-api-types: ^0.24.0
node-fetch: ^2.6.1
ws: ^8.2.3
- checksum: a2bfb770a8a2810a7a00ec85124bd2a31526c138531470eb0e9c5406f0cc99d3fcfe861de00570d1f0fc75e33e8561fc38745513be5597d4c4efcc9a45582c7c
+ checksum: 39f170909509bbeec875a29e885c6014842c257f8bbdaf5a866324993444c5f211be16676d4ba04168e1442046e5fc378b444bbe991926357c5a67f0a97438e2
languageName: node
linkType: hard
@@ -1287,13 +1210,6 @@ __metadata:
languageName: node
linkType: hard
-"escape-string-regexp@npm:^1.0.5":
- version: 1.0.5
- resolution: "escape-string-regexp@npm:1.0.5"
- checksum: 6092fda75c63b110c706b6a9bfde8a612ad595b628f0bd2147eea1d3406723020810e591effc7db1da91d80a71a737a313567c5abb3813e8d9c71f4aa595b410
- languageName: node
- linkType: hard
-
"escape-string-regexp@npm:^4.0.0":
version: 4.0.0
resolution: "escape-string-regexp@npm:4.0.0"
@@ -1322,12 +1238,13 @@ __metadata:
languageName: node
linkType: hard
-"eslint-utils@npm:^2.1.0":
- version: 2.1.0
- resolution: "eslint-utils@npm:2.1.0"
+"eslint-scope@npm:^6.0.0":
+ version: 6.0.0
+ resolution: "eslint-scope@npm:6.0.0"
dependencies:
- eslint-visitor-keys: ^1.1.0
- checksum: 27500938f348da42100d9e6ad03ae29b3de19ba757ae1a7f4a087bdcf83ac60949bbb54286492ca61fac1f5f3ac8692dd21537ce6214240bf95ad0122f24d71d
+ esrecurse: ^4.3.0
+ estraverse: ^5.2.0
+ checksum: 3f1b3578f288c3820f68ad2aae102300e546be8a98a958f515405dc20cc2fe64fda583d364977628bb14fe3d4f96f37de5e9bc5d6eb26bc310da33ba2a677dc3
languageName: node
linkType: hard
@@ -1342,13 +1259,6 @@ __metadata:
languageName: node
linkType: hard
-"eslint-visitor-keys@npm:^1.1.0, eslint-visitor-keys@npm:^1.3.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"
@@ -1357,42 +1267,41 @@ __metadata:
linkType: hard
"eslint-visitor-keys@npm:^3.0.0":
- version: 3.0.0
- resolution: "eslint-visitor-keys@npm:3.0.0"
- checksum: 352607f367a2e0e2f9f234e40d6d9b34c39399345b8a9f204e1343749ddfae505d8343909cba6c4abc2ca03add4cdc0530af5e98f870ad7183fc2a89458669e5
+ version: 3.1.0
+ resolution: "eslint-visitor-keys@npm:3.1.0"
+ checksum: fd2d613bb315bc549068ca97771d868437fb60c8f13ef8d6d54669773ff53f814b759fa9e57966f15e4c50a5f5e11c6ba47060b8f201f9776311f6c5d5c11b70
languageName: node
linkType: hard
-"eslint@npm:^7.32.0":
- version: 7.32.0
- resolution: "eslint@npm:7.32.0"
+"eslint@npm:^8.2.0":
+ version: 8.2.0
+ resolution: "eslint@npm:8.2.0"
dependencies:
- "@babel/code-frame": 7.12.11
- "@eslint/eslintrc": ^0.4.3
- "@humanwhocodes/config-array": ^0.5.0
+ "@eslint/eslintrc": ^1.0.4
+ "@humanwhocodes/config-array": ^0.6.0
ajv: ^6.10.0
chalk: ^4.0.0
cross-spawn: ^7.0.2
- debug: ^4.0.1
+ debug: ^4.3.2
doctrine: ^3.0.0
enquirer: ^2.3.5
escape-string-regexp: ^4.0.0
- eslint-scope: ^5.1.1
- eslint-utils: ^2.1.0
- eslint-visitor-keys: ^2.0.0
- espree: ^7.3.1
+ eslint-scope: ^6.0.0
+ eslint-utils: ^3.0.0
+ eslint-visitor-keys: ^3.0.0
+ espree: ^9.0.0
esquery: ^1.4.0
esutils: ^2.0.2
fast-deep-equal: ^3.1.3
file-entry-cache: ^6.0.1
functional-red-black-tree: ^1.0.1
- glob-parent: ^5.1.2
+ glob-parent: ^6.0.1
globals: ^13.6.0
ignore: ^4.0.6
import-fresh: ^3.0.0
imurmurhash: ^0.1.4
is-glob: ^4.0.0
- js-yaml: ^3.13.1
+ js-yaml: ^4.1.0
json-stable-stringify-without-jsonify: ^1.0.1
levn: ^0.4.1
lodash.merge: ^4.6.2
@@ -1400,37 +1309,26 @@ __metadata:
natural-compare: ^1.4.0
optionator: ^0.9.1
progress: ^2.0.0
- regexpp: ^3.1.0
+ regexpp: ^3.2.0
semver: ^7.2.1
- strip-ansi: ^6.0.0
+ strip-ansi: ^6.0.1
strip-json-comments: ^3.1.0
- table: ^6.0.9
text-table: ^0.2.0
v8-compile-cache: ^2.0.3
bin:
eslint: bin/eslint.js
- checksum: cc85af9985a3a11085c011f3d27abe8111006d34cc274291b3c4d7bea51a4e2ff6135780249becd919ba7f6d6d1ecc38a6b73dacb6a7be08d38453b344dc8d37
+ checksum: 19f2f4e23bdd1d0f1c99759adb88c0bf01908ce5bd480913ca7b5d3183f4c42d93142ada699b196e228295c074254ad90a3475126784673bd1afeb22e91ceea8
languageName: node
linkType: hard
-"espree@npm:^7.3.0, espree@npm:^7.3.1":
- version: 7.3.1
- resolution: "espree@npm:7.3.1"
+"espree@npm:^9.0.0":
+ version: 9.0.0
+ resolution: "espree@npm:9.0.0"
dependencies:
- acorn: ^7.4.0
+ acorn: ^8.5.0
acorn-jsx: ^5.3.1
- eslint-visitor-keys: ^1.3.0
- checksum: aa9b50dcce883449af2e23bc2b8d9abb77118f96f4cb313935d6b220f77137eaef7724a83c3f6243b96bc0e4ab14766198e60818caad99f9519ae5a336a39b45
- languageName: node
- linkType: hard
-
-"esprima@npm:^4.0.0":
- version: 4.0.1
- resolution: "esprima@npm:4.0.1"
- bin:
- esparse: ./bin/esparse.js
- esvalidate: ./bin/esvalidate.js
- checksum: b45bc805a613dbea2835278c306b91aff6173c8d034223fa81498c77dcbce3b2931bf6006db816f62eacd9fd4ea975dfd85a5b7f3c6402cfd050d4ca3c13a628
+ eslint-visitor-keys: ^3.0.0
+ checksum: f313c642e35587ce62a419f57ceea47937a719b084c7b31f649d2ca15ed92bc2dde58e2ac4fc381a74364b0db0b97d9cdb2a5d1ca0ccd7483bde9b4b04fe23e8
languageName: node
linkType: hard
@@ -1552,9 +1450,9 @@ __metadata:
linkType: hard
"flatted@npm:^3.1.0":
- version: 3.2.2
- resolution: "flatted@npm:3.2.2"
- checksum: 9d5e03fd9309b9103f345cf6d0cef4fa46201baa053b0ca3d57fa489449b0bee687b7355407898f630afbb1a1286d2a6658e7e77dea3b85c3cd6c6ce2894a5c3
+ version: 3.2.4
+ resolution: "flatted@npm:3.2.4"
+ checksum: 7d33846428ab337ec81ef9b8b9103894c1c81f5f67feb32bd4ed106fbc47da60d56edb42efd36c9f1f30a010272aeccd34ec1ffacfe9dfdff19673b1d4df481b
languageName: node
linkType: hard
@@ -1657,6 +1555,15 @@ __metadata:
languageName: node
linkType: hard
+"glob-parent@npm:^6.0.1":
+ version: 6.0.2
+ resolution: "glob-parent@npm:6.0.2"
+ dependencies:
+ is-glob: ^4.0.3
+ checksum: c13ee97978bef4f55106b71e66428eb1512e71a7466ba49025fc2aec59a5bfb0954d5abd58fc5ee6c9b076eef4e1f6d3375c2e964b88466ca390da4419a786a8
+ languageName: node
+ linkType: hard
+
"glob@npm:^7.1.3, glob@npm:^7.1.4":
version: 7.2.0
resolution: "glob@npm:7.2.0"
@@ -1720,13 +1627,6 @@ __metadata:
languageName: node
linkType: hard
-"has-flag@npm:^3.0.0":
- version: 3.0.0
- resolution: "has-flag@npm:3.0.0"
- checksum: 4a15638b454bf086c8148979aae044dd6e39d63904cd452d970374fa6a87623423da485dfb814e7be882e05c096a7ccf1ebd48e7e7501d0208d8384ff4dea73b
- languageName: node
- linkType: hard
-
"has-flag@npm:^4.0.0":
version: 4.0.0
resolution: "has-flag@npm:4.0.0"
@@ -1961,22 +1861,14 @@ __metadata:
languageName: node
linkType: hard
-"js-tokens@npm:^4.0.0":
- version: 4.0.0
- resolution: "js-tokens@npm:4.0.0"
- checksum: 8a95213a5a77deb6cbe94d86340e8d9ace2b93bc367790b260101d2f36a2eaf4e4e22d9fa9cf459b38af3a32fb4190e638024cf82ec95ef708680e405ea7cc78
- languageName: node
- linkType: hard
-
-"js-yaml@npm:^3.13.1":
- version: 3.14.1
- resolution: "js-yaml@npm:3.14.1"
+"js-yaml@npm:^4.1.0":
+ version: 4.1.0
+ resolution: "js-yaml@npm:4.1.0"
dependencies:
- argparse: ^1.0.7
- esprima: ^4.0.0
+ argparse: ^2.0.1
bin:
js-yaml: bin/js-yaml.js
- checksum: bef146085f472d44dee30ec34e5cf36bf89164f5d585435a3d3da89e52622dff0b188a580e4ad091c3341889e14cb88cac6e4deb16dc5b1e9623bb0601fc255c
+ checksum: c7830dfd456c3ef2c6e355cc5a92e6700ceafa1d14bba54497b34a99f0376cecbb3e9ac14d3e5849b426d5a5140709a66237a8c991c675431271c4ce5504151a
languageName: node
linkType: hard
@@ -1994,13 +1886,6 @@ __metadata:
languageName: node
linkType: hard
-"json-schema-traverse@npm:^1.0.0":
- version: 1.0.0
- resolution: "json-schema-traverse@npm:1.0.0"
- checksum: 02f2f466cdb0362558b2f1fd5e15cce82ef55d60cd7f8fa828cf35ba74330f8d767fcae5c5c2adb7851fa811766c694b9405810879bc4e1ddd78a7c0e03658ad
- languageName: node
- linkType: hard
-
"json-stable-stringify-without-jsonify@npm:^1.0.1":
version: 1.0.1
resolution: "json-stable-stringify-without-jsonify@npm:1.0.1"
@@ -2041,13 +1926,6 @@ __metadata:
languageName: node
linkType: hard
-"lodash.truncate@npm:^4.4.2":
- version: 4.4.2
- resolution: "lodash.truncate@npm:4.4.2"
- checksum: b463d8a382cfb5f0e71c504dcb6f807a7bd379ff1ea216669aa42c52fc28c54e404bfbd96791aa09e6df0de2c1d7b8f1b7f4b1a61f324d38fe98bc535aeee4f5
- languageName: node
- linkType: hard
-
"lodash@npm:^4.17.20, lodash@npm:^4.17.21":
version: 4.17.21
resolution: "lodash@npm:4.17.21"
@@ -2111,11 +1989,11 @@ __metadata:
languageName: node
linkType: hard
-"mathjs@npm:^9.5.0":
- version: 9.5.2
- resolution: "mathjs@npm:9.5.2"
+"mathjs@npm:^10.0.0":
+ version: 10.0.0
+ resolution: "mathjs@npm:10.0.0"
dependencies:
- "@babel/runtime": ^7.15.4
+ "@babel/runtime": ^7.16.0
complex.js: ^2.0.15
decimal.js: ^10.3.1
escape-latex: ^1.2.0
@@ -2126,7 +2004,7 @@ __metadata:
typed-function: ^2.0.0
bin:
mathjs: bin/cli.js
- checksum: 239e6920d425552478f5aee7e5d36e52c35f11faafea975419def1ab89c971e76e4a3f075f43d3410f20b53af7c0bfd63888ea404150b571ae14fb0b328bfc7d
+ checksum: 86f4f45804bd799182d5fe54c93a8cc88f1a03a3ab73a9851bc520981310423ec379421b0fb79e50c0a0c22c64cbcf1dcac0636eeaa1b65577366a1c55f27da8
languageName: node
linkType: hard
@@ -2147,19 +2025,19 @@ __metadata:
languageName: node
linkType: hard
-"mime-db@npm:1.50.0":
- version: 1.50.0
- resolution: "mime-db@npm:1.50.0"
- checksum: 95fcc19c3664ae72391c8a7e4015dde7fb6817c98c951493ca3a1d48050feb8ee08810a372ce7d9e16310042d26e5bda168916f600583a9a583655eeea8ff5f5
+"mime-db@npm:1.51.0":
+ version: 1.51.0
+ resolution: "mime-db@npm:1.51.0"
+ checksum: 613b1ac9d6e725cc24444600b124a7f1ce6c60b1baa654f39a3e260d0995a6dffc5693190217e271af7e2a5612dae19f2a73f3e316707d797a7391165f7ef423
languageName: node
linkType: hard
"mime-types@npm:^2.1.12":
- version: 2.1.33
- resolution: "mime-types@npm:2.1.33"
+ version: 2.1.34
+ resolution: "mime-types@npm:2.1.34"
dependencies:
- mime-db: 1.50.0
- checksum: 05f2a0b3f169fbc51d79bdc7674ceb379dd07dbeadb0143059a7def865224686ee9f9051aeb340e98b6c11dbc06794ce0122181db4312cb1ad054fd90b0d510e
+ mime-db: 1.51.0
+ checksum: 67013de9e9d6799bde6d669d18785b7e18bcd212e710d3e04a4727f92f67a8ad4e74aee24be28b685adb794944814bde649119b58ee3282ffdbee58f9278d9f3
languageName: node
linkType: hard
@@ -2273,11 +2151,11 @@ __metadata:
linkType: hard
"moment-timezone@npm:^0.5.31":
- version: 0.5.33
- resolution: "moment-timezone@npm:0.5.33"
+ version: 0.5.34
+ resolution: "moment-timezone@npm:0.5.34"
dependencies:
moment: ">= 2.9.0"
- checksum: dea6043b4a21aedf2e64d545cdfc795a11e0739edb06f4eb10570503118cb1fe4ab57e012a5f3594bd1cdd2a3c617f42836fb6e4faff33eb25a1fe3cc239c9bf
+ checksum: 12a1d3d52e4ba509cf1fa36bbda59d898a08fa80ab35f6c358747e93aec1f07e617cec647eaf2e8acf5f9132e581d4704d34a9edffa9a80c5cd04bf23b277595
languageName: node
linkType: hard
@@ -2311,7 +2189,7 @@ __metadata:
languageName: node
linkType: hard
-"nanoid@npm:^3.1.28":
+"nanoid@npm:^3.1.30":
version: 3.1.30
resolution: "nanoid@npm:3.1.30"
bin:
@@ -2759,20 +2637,13 @@ __metadata:
languageName: node
linkType: hard
-"regexpp@npm:^3.1.0, regexpp@npm:^3.2.0":
+"regexpp@npm:^3.2.0":
version: 3.2.0
resolution: "regexpp@npm:3.2.0"
checksum: a78dc5c7158ad9ddcfe01aa9144f46e192ddbfa7b263895a70a5c6c73edd9ce85faf7c0430e59ac38839e1734e275b9c3de5c57ee3ab6edc0e0b1bdebefccef8
languageName: node
linkType: hard
-"require-from-string@npm:^2.0.2":
- version: 2.0.2
- resolution: "require-from-string@npm:2.0.2"
- checksum: a03ef6895445f33a4015300c426699bc66b2b044ba7b670aa238610381b56d3f07c686251740d575e22f4c87531ba662d06937508f0f3c0f1ddc04db3130560b
- languageName: node
- linkType: hard
-
"resolve-alpn@npm:^1.0.0":
version: 1.2.1
resolution: "resolve-alpn@npm:1.2.1"
@@ -2894,7 +2765,7 @@ __metadata:
languageName: node
linkType: hard
-"sequelize@npm:^6.6.5":
+"sequelize@npm:^6.9.0":
version: 6.9.0
resolution: "sequelize@npm:6.9.0"
dependencies:
@@ -2990,17 +2861,6 @@ __metadata:
languageName: node
linkType: hard
-"slice-ansi@npm:^4.0.0":
- version: 4.0.0
- resolution: "slice-ansi@npm:4.0.0"
- dependencies:
- ansi-styles: ^4.0.0
- astral-regex: ^2.0.0
- is-fullwidth-code-point: ^3.0.0
- checksum: 4a82d7f085b0e1b070e004941ada3c40d3818563ac44766cca4ceadd2080427d337554f9f99a13aaeb3b4a94d9964d9466c807b3d7b7541d1ec37ee32d308756
- languageName: node
- linkType: hard
-
"smart-buffer@npm:^4.1.0":
version: 4.2.0
resolution: "smart-buffer@npm:4.2.0"
@@ -3055,13 +2915,6 @@ __metadata:
languageName: node
linkType: hard
-"sprintf-js@npm:~1.0.2":
- version: 1.0.3
- resolution: "sprintf-js@npm:1.0.3"
- checksum: 19d79aec211f09b99ec3099b5b2ae2f6e9cdefe50bc91ac4c69144b6d3928a640bb6ae5b3def70c2e85a2c3d9f5ec2719921e3a59d3ca3ef4b2fd1a4656a0df3
- languageName: node
- linkType: hard
-
"ssri@npm:^8.0.0, ssri@npm:^8.0.1":
version: 8.0.1
resolution: "ssri@npm:8.0.1"
@@ -3092,7 +2945,7 @@ __metadata:
languageName: node
linkType: hard
-"string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.2.3":
+"string-width@npm:^1.0.2 || 2 || 3 || 4":
version: 4.2.3
resolution: "string-width@npm:4.2.3"
dependencies:
@@ -3139,7 +2992,7 @@ __metadata:
languageName: node
linkType: hard
-"strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1":
+"strip-ansi@npm:^6.0.1":
version: 6.0.1
resolution: "strip-ansi@npm:6.0.1"
dependencies:
@@ -3155,15 +3008,6 @@ __metadata:
languageName: node
linkType: hard
-"supports-color@npm:^5.3.0":
- version: 5.5.0
- resolution: "supports-color@npm:5.5.0"
- dependencies:
- has-flag: ^3.0.0
- checksum: 95f6f4ba5afdf92f495b5a912d4abee8dcba766ae719b975c56c084f5004845f6f5a5f7769f52d53f40e21952a6d87411bafe34af4a01e65f9926002e38e1dac
- languageName: node
- linkType: hard
-
"supports-color@npm:^7.1.0":
version: 7.2.0
resolution: "supports-color@npm:7.2.0"
@@ -3173,19 +3017,6 @@ __metadata:
languageName: node
linkType: hard
-"table@npm:^6.0.9":
- version: 6.7.3
- resolution: "table@npm:6.7.3"
- dependencies:
- ajv: ^8.0.1
- lodash.truncate: ^4.4.2
- slice-ansi: ^4.0.0
- string-width: ^4.2.3
- strip-ansi: ^6.0.1
- checksum: 61d732f51108222d158eca2a91bfaae41c14e0cba6eb04c702ec5a1b136219d4925940d5c4d9aff5720bc4e2385dcbe2ed52dcf37bbbd8b2be48c01c1cf2ed1d
- 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"
@@ -3443,13 +3274,6 @@ __metadata:
languageName: node
linkType: hard
-"wolfram-alpha-api@npm:@notenoughupdates/wolfram-alpha-api@latest":
- version: 1.0.0
- resolution: "@notenoughupdates/wolfram-alpha-api@npm:1.0.0"
- checksum: b2dda5c86171fa6e48622b9715d5b9b70ca4d678116a3455e975a10d350e148a9b9a36f4fbebf9c7a61f2bdfd8b04a9bd2f7e1aa0aef82b828a8d2b2879edcec
- languageName: node
- linkType: hard
-
"word-wrap@npm:^1.2.3":
version: 1.2.3
resolution: "word-wrap@npm:1.2.3"