diff --git a/src/errorListeners/CoreCommandError.ts b/src/errorListeners/CoreCommandError.ts index 8fade9f8f..7865acc0f 100644 --- a/src/errorListeners/CoreCommandError.ts +++ b/src/errorListeners/CoreCommandError.ts @@ -7,7 +7,7 @@ export class CoreEvent extends Listener { super(context, { event: Events.CommandError }); } - public run(error: Error, context: CommandErrorPayload) { + public run(error: unknown, context: CommandErrorPayload) { const { name, location } = context.piece; this.container.logger.error(`Encountered error on command "${name}" at path "${location.full}"`, error); } diff --git a/src/lib/parsers/Result.ts b/src/lib/parsers/Result.ts index 334110d59..c728d94b1 100644 --- a/src/lib/parsers/Result.ts +++ b/src/lib/parsers/Result.ts @@ -75,7 +75,7 @@ export function isErr(x: Result): x is Err { * @typeparam T The result's type. * @typeparam E The error's type. */ -export function from(cb: (...args: unknown[]) => T): Result { +export function from(cb: (...args: unknown[]) => T): Result { try { return ok(cb()); } catch (error) { @@ -88,7 +88,7 @@ export function from(cb: (...args: unknown[]) => T): Result * @typeparam T The result's type. * @typeparam E The error's type. */ -export async function fromAsync(promiseOrCb: Awaitable | ((...args: unknown[]) => Awaitable)): Promise> { +export async function fromAsync(promiseOrCb: Awaitable | ((...args: unknown[]) => Awaitable)): Promise> { try { return ok(await (isFunction(promiseOrCb) ? promiseOrCb() : promiseOrCb)); } catch (error) { diff --git a/src/lib/types/Events.ts b/src/lib/types/Events.ts index 9f01f1214..f53c7663f 100644 --- a/src/lib/types/Events.ts +++ b/src/lib/types/Events.ts @@ -137,7 +137,7 @@ declare module 'discord.js' { [Events.PieceUnload]: [store: Store, piece: Piece]; [Events.PiecePostLoad]: [store: Store, piece: Piece]; [Events.MentionPrefixOnly]: [message: Message]; - [Events.ListenerError]: [error: Error, payload: ListenerErrorPayload]; + [Events.ListenerError]: [error: unknown, payload: ListenerErrorPayload]; [Events.PreMessageParsed]: [message: Message]; [Events.PrefixedMessage]: [message: Message, prefix: string | RegExp]; [Events.UnknownCommandName]: [payload: UnknownCommandNamePayload]; @@ -147,9 +147,9 @@ declare module 'discord.js' { [Events.CommandAccepted]: [payload: CommandAcceptedPayload]; [Events.CommandRun]: [message: Message, command: Command, payload: CommandRunPayload]; [Events.CommandSuccess]: [payload: CommandSuccessPayload]; - [Events.CommandError]: [error: Error, payload: CommandErrorPayload]; + [Events.CommandError]: [error: unknown, payload: CommandErrorPayload]; [Events.CommandFinish]: [message: Message, command: Command, payload: CommandFinishPayload]; - [Events.CommandTypingError]: [error: Error, payload: CommandTypingErrorPayload]; + [Events.CommandTypingError]: [error: unknown, payload: CommandTypingErrorPayload]; [Events.PluginLoaded]: [hook: PluginHook, name: string | undefined]; [Events.NonPrefixedMessage]: [message: Message]; // #endregion Sapphire load cycle events diff --git a/src/listeners/command-handler/CoreCommandTyping.ts b/src/listeners/command-handler/CoreCommandTyping.ts index b5d058b29..dd2d68e9d 100644 --- a/src/listeners/command-handler/CoreCommandTyping.ts +++ b/src/listeners/command-handler/CoreCommandTyping.ts @@ -16,7 +16,7 @@ export class CoreListener extends Listener { try { await message.channel.sendTyping(); } catch (error) { - message.client.emit(Events.CommandTypingError, error as Error, { ...payload, command, message }); + message.client.emit(Events.CommandTypingError, error, { ...payload, command, message }); } } }