Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"extends": "@sapphire",
"rules": {
"@typescript-eslint/unbound-method": "off"
},
"overrides": [
{
"files": ["*.mjs"],
Expand Down
382 changes: 191 additions & 191 deletions .yarn/releases/yarn-4.11.0.cjs → .yarn/releases/yarn-4.12.0.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ plugins:
- path: .yarn/plugins/@yarnpkg/plugin-git-hooks.cjs
spec: 'https://raw.githubusercontent.com/trufflehq/yarn-plugin-git-hooks/main/bundles/%40yarnpkg/plugin-git-hooks.js'

yarnPath: .yarn/releases/yarn-4.11.0.cjs
yarnPath: .yarn/releases/yarn-4.12.0.cjs
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,31 +26,31 @@
"@sapphire/pieces": "^4.4.1",
"@sapphire/prettier-config": "^2.0.0",
"@sapphire/stopwatch": "^1.5.4",
"@sapphire/ts-config": "^5.0.1",
"@sapphire/ts-config": "^5.0.3",
"@sapphire/utilities": "^3.18.2",
"@types/node": "^24.10.1",
"@types/ws": "^8.18.1",
"@typescript-eslint/eslint-plugin": "^7.18.0",
"@typescript-eslint/parser": "^7.18.0",
"@vitest/coverage-v8": "^4.0.9",
"@vitest/coverage-v8": "^4.0.14",
"concurrently": "^9.2.1",
"cz-conventional-changelog": "^3.3.0",
"discord-api-types": "^0.38.4",
"discord.js": "^14.24.2",
"discord-api-types": "^0.38.34",
"discord.js": "^14.25.1",
"esbuild-plugin-file-path-extensions": "^2.1.4",
"esbuild-plugin-version-injector": "^1.2.1",
"eslint": "^8.57.1",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-prettier": "^5.5.4",
"lint-staged": "^16.2.6",
"prettier": "^3.6.2",
"rimraf": "^6.1.0",
"lint-staged": "^16.2.7",
"prettier": "^3.7.1",
"rimraf": "^6.1.2",
"tsup": "^8.5.1",
"tsx": "^4.20.6",
"turbo": "^2.6.1",
"typescript": "~5.4.5",
"vite": "^7.2.2",
"vitest": "^4.0.9"
"typescript": "~5.9.3",
"vite": "^7.2.4",
"vitest": "^4.0.14"
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -79,5 +79,5 @@
"minimist": "^1.2.8"
},
"prettier": "@sapphire/prettier-config",
"packageManager": "yarn@4.11.0"
"packageManager": "yarn@4.12.0"
}
6 changes: 3 additions & 3 deletions packages/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"@types/ws": "^8.18.1",
"@vladfrangu/async_event_emitter": "2.4.7",
"cookie-es": "^1.2.2",
"tldts": "^7.0.17",
"tldts": "^7.0.19",
"undici": "^7.16.0"
},
"repository": {
Expand Down Expand Up @@ -91,8 +91,8 @@
"concurrently": "^9.2.1",
"tsup": "^8.5.1",
"tsx": "^4.20.6",
"typedoc": "^0.26.11",
"typedoc": "^0.28.14",
"typedoc-json-parser": "^10.2.0",
"typescript": "~5.4.5"
"typescript": "~5.9.3"
}
}
4 changes: 2 additions & 2 deletions packages/editable-commands/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@
"concurrently": "^9.2.1",
"tsup": "^8.5.1",
"tsx": "^4.20.6",
"typedoc": "^0.26.11",
"typedoc": "^0.28.14",
"typedoc-json-parser": "^10.2.0",
"typescript": "~5.4.5"
"typescript": "~5.9.3"
}
}
2 changes: 1 addition & 1 deletion packages/editable-commands/src/register.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export class EditableCommandsPlugin extends Plugin {
/**
* @since 1.0.0
*/
public static [postInitialization](this: SapphireClient): void {
public static override [postInitialization](this: SapphireClient): void {
loadListeners();
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/hmr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@
"concurrently": "^9.2.1",
"tsup": "^8.5.1",
"tsx": "^4.20.6",
"typedoc": "^0.26.11",
"typedoc": "^0.28.14",
"typedoc-json-parser": "^10.2.0",
"typescript": "~5.4.5"
"typescript": "~5.9.3"
}
}
2 changes: 1 addition & 1 deletion packages/hmr/src/register.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export class HmrPlugin extends Plugin {
/**
* @since 1.0.0
*/
public static [postLogin](this: SapphireClient): void {
public static override [postLogin](this: SapphireClient): void {
start(this.options.hmr);
}
}
Expand Down
6 changes: 3 additions & 3 deletions packages/i18next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"@sapphire/utilities": "^3.18.2",
"@skyra/i18next-backend": "^2.0.6",
"chokidar": "^4.0.3",
"i18next": "^25.6.2"
"i18next": "^25.6.3"
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -91,8 +91,8 @@
"concurrently": "^9.2.1",
"tsup": "^8.5.1",
"tsx": "^4.20.6",
"typedoc": "^0.26.11",
"typedoc": "^0.28.14",
"typedoc-json-parser": "^10.2.0",
"typescript": "~5.4.5"
"typescript": "~5.9.3"
}
}
6 changes: 3 additions & 3 deletions packages/i18next/src/register.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ import type { ClientOptions } from 'discord.js';
import { InternationalizationHandler } from './index';

export class I18nextPlugin extends Plugin {
public static [preGenericsInitialization](this: SapphireClient, options: ClientOptions): void {
public static override [preGenericsInitialization](this: SapphireClient, options: ClientOptions): void {
container.i18n = new InternationalizationHandler(options.i18n);
}

public static async [preLogin](this: SapphireClient): Promise<void> {
public static override async [preLogin](this: SapphireClient): Promise<void> {
await container.i18n.init();
}

public static [postLogin](this: SapphireClient): void {
public static override [postLogin](this: SapphireClient): void {
if (this.options.i18n?.hmr?.enabled) {
container.logger.info('[i18next-Plugin]: HMR enabled. Watching for languages changes.');

Expand Down
4 changes: 2 additions & 2 deletions packages/logger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@
"concurrently": "^9.2.1",
"tsup": "^8.5.1",
"tsx": "^4.20.6",
"typedoc": "^0.26.11",
"typedoc": "^0.28.14",
"typedoc-json-parser": "^10.2.0",
"typescript": "~5.4.5"
"typescript": "~5.9.3"
}
}
2 changes: 1 addition & 1 deletion packages/logger/src/register.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export class LoggerPlugin extends Plugin {
/**
* @since 1.0.0
*/
public static [preGenericsInitialization](this: SapphireClient, options: ClientOptions): void {
public static override [preGenericsInitialization](this: SapphireClient, options: ClientOptions): void {
options.logger ??= {};
options.logger.instance ??= new Logger(options.logger);
}
Expand Down
4 changes: 2 additions & 2 deletions packages/pattern-commands/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@
"concurrently": "^9.2.1",
"tsup": "^8.5.1",
"tsx": "^4.20.6",
"typedoc": "^0.26.11",
"typedoc": "^0.28.14",
"typedoc-json-parser": "^10.2.0",
"typescript": "~5.4.5"
"typescript": "~5.9.3"
}
}
2 changes: 1 addition & 1 deletion packages/pattern-commands/src/register.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export class PatternCommandPlugin extends Plugin {
/**
* @since 1.0.0
*/
public static [postInitialization](this: SapphireClient, _options: ClientOptions): void {
public static override [postInitialization](this: SapphireClient, _options: ClientOptions): void {
this.stores.register(new PatternCommandStore());
loadListeners();
}
Expand Down
6 changes: 3 additions & 3 deletions packages/scheduled-tasks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,17 @@
"dependencies": {
"@sapphire/stopwatch": "^1.5.4",
"@sapphire/utilities": "^3.18.2",
"bullmq": "5.63.2"
"bullmq": "5.65.0"
},
"devDependencies": {
"@favware/cliff-jumper": "^6.0.0",
"@favware/rollup-type-bundler": "^4.0.0",
"concurrently": "^9.2.1",
"tsup": "^8.5.1",
"tsx": "^4.20.6",
"typedoc": "^0.26.11",
"typedoc": "^0.28.14",
"typedoc-json-parser": "^10.2.0",
"typescript": "~5.4.5"
"typescript": "~5.9.3"
},
"repository": {
"type": "git",
Expand Down
6 changes: 3 additions & 3 deletions packages/scheduled-tasks/src/register.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ export class ScheduledTasksPlugin extends Plugin {
/**
* @since 1.0.0
*/
public static [preGenericsInitialization](this: SapphireClient, options: ClientOptions): void {
public static override [preGenericsInitialization](this: SapphireClient, options: ClientOptions): void {
container.tasks = new ScheduledTaskHandler(options.tasks);
}

/**
* @since 1.0.0
*/
public static [postInitialization](this: SapphireClient, options: ClientOptions): void {
public static override [postInitialization](this: SapphireClient, options: ClientOptions): void {
this.stores.register(new ScheduledTaskStore());

if (options.loadScheduledTaskErrorListeners !== false) {
Expand All @@ -31,7 +31,7 @@ export class ScheduledTasksPlugin extends Plugin {
/**
* @since 1.0.0
*/
public static [postLogin](this: SapphireClient): void {
public static override [postLogin](this: SapphireClient): void {
void container.tasks.createRepeated();
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/subcommands/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@
"concurrently": "^9.2.1",
"tsup": "^8.5.1",
"tsx": "^4.20.6",
"typedoc": "^0.26.11",
"typedoc": "^0.28.14",
"typedoc-json-parser": "^10.2.0",
"typescript": "~5.4.5"
"typescript": "~5.9.3"
}
}
3 changes: 1 addition & 2 deletions packages/subcommands/src/lib/types/Events.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ export interface IMessageSubcommandPayload {
}

export interface MessageSubcommandDeniedPayload
extends Omit<MessageCommandDeniedPayload, 'parameters' | 'command'>,
MessageSubcommandAcceptedPayload {
extends Omit<MessageCommandDeniedPayload, 'parameters' | 'command'>, MessageSubcommandAcceptedPayload {
parameters?: string;
}

Expand Down
3 changes: 2 additions & 1 deletion packages/subcommands/src/lib/types/SubcommandMappings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ interface SubcommandMappingBase {
* Describes how a subcommand method maps to the actual implementation of that subcommand.
*/
export interface SubcommandMappingMethod
extends SubcommandMappingBase,
extends
SubcommandMappingBase,
Pick<
Command.Options,
| 'preconditions'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export class PluginPrecondition extends AllFlowsPrecondition {
case BucketScope.Channel:
return `${message.channelId}.${subcommandIdentifier}`;
case BucketScope.Guild:
return `${message.guildId}.${subcommandIdentifier}` ?? `${message.channelId}.${subcommandIdentifier}`;
return message.guildId ? `${message.guildId}.${subcommandIdentifier}` : `${message.channelId}.${subcommandIdentifier}`;
default:
return `${message.author.id}.${subcommandIdentifier}`;
}
Expand All @@ -115,7 +115,7 @@ export class PluginPrecondition extends AllFlowsPrecondition {
case BucketScope.Channel:
return `${interaction.channelId}.${subcommandIdentifier}`;
case BucketScope.Guild:
return `${interaction.guildId}.${subcommandIdentifier}` ?? `${interaction.channelId}.${subcommandIdentifier}`;
return interaction.guildId ? `${interaction.guildId}.${subcommandIdentifier}` : `${interaction.channelId}.${subcommandIdentifier}`;
default:
return `${interaction.user.id}.${subcommandIdentifier}`;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/subcommands/src/register.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export class SubcommandsPlugin extends Plugin {
/**
* @since 3.1.2
*/
public static [postInitialization](this: SapphireClient, options: ClientOptions): void {
public static override [postInitialization](this: SapphireClient, options: ClientOptions): void {
loadPreconditions();

if (options.loadSubcommandErrorListeners !== false) {
Expand Down
4 changes: 2 additions & 2 deletions packages/utilities-store/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@
"concurrently": "^9.2.1",
"tsup": "^8.5.1",
"tsx": "^4.20.6",
"typedoc": "^0.26.11",
"typedoc": "^0.28.14",
"typedoc-json-parser": "^10.2.0",
"typescript": "~5.4.5"
"typescript": "~5.9.3"
}
}
4 changes: 2 additions & 2 deletions packages/utilities-store/src/register.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ export class UtilitiesPlugin extends Plugin {
/**
* @since 1.0.0
*/
public static [preInitialization](this: SapphireClient): void {
public static override [preInitialization](this: SapphireClient): void {
this.utilities = new Utilities();
this.stores.register(this.utilities.store);
}

/**
* @since 1.0.0
*/
public static [postLogin](this: SapphireClient): void {
public static override [postLogin](this: SapphireClient): void {
const pieces = this.utilities.store;

for (const [name, piece] of pieces.entries()) {
Expand Down
Loading