diff --git a/lib/discord/src/common/utils.ts b/lib/discord/src/common/utils.ts index 98e1a59..7e2b0af 100644 --- a/lib/discord/src/common/utils.ts +++ b/lib/discord/src/common/utils.ts @@ -11,6 +11,9 @@ const [, _createClassModuleId] = lookupModule(byName('_createClass')) const [, _classCallCheckModuleId] = lookupModule(byName('_classCallCheck')) // ../discord_common/js/shared/utils/TypedEventEmitter.tsx +/** + * Do not use the `error` event, as the module will handle it specially for some reason. + */ export let TypedEventEmitter: typeof DiscordModules.Utils.TypedEventEmitter = proxify(() => { const [module] = lookupModule( diff --git a/lib/plugins/src/_internal.ts b/lib/plugins/src/_internal.ts index e74c0a8..d5b523c 100644 --- a/lib/plugins/src/_internal.ts +++ b/lib/plugins/src/_internal.ts @@ -30,7 +30,7 @@ export const pEmitter = new TypedEventEmitter<{ start: [InternalPlugin, PluginApi] started: [InternalPlugin] stopped: [InternalPlugin] - error: [InternalPlugin, unknown] + errored: [InternalPlugin, unknown] }>() export const pList = new Map() @@ -88,7 +88,7 @@ function handlePluginError(e: unknown, plugin: InternalPlugin) { 2, ) - pEmitter.emit('error', plugin, e) + pEmitter.emit('errored', plugin, e) if (!(iflags & InternalPluginFlags.Essential)) return plugin.disable() } diff --git a/src/plugins/init/developer-settings/react-devtools.ts b/src/plugins/init/developer-settings/react-devtools.ts index ac59c74..5f1293c 100644 --- a/src/plugins/init/developer-settings/react-devtools.ts +++ b/src/plugins/init/developer-settings/react-devtools.ts @@ -21,7 +21,7 @@ export const RDTContext: { const events = new TypedEventEmitter<{ connect: [] disconnect: [] - error: [unknown] + errored: [unknown] }>() const CircleXIcon = lookupGeneratedIconComponent( @@ -47,7 +47,7 @@ export function connect() { ws.addEventListener('error', e => { cleanup() - events.emit('error', e) + events.emit('errored', e) const err = (e as { message: string }).message ?? getErrorStack(e) api.logger.error('React DevTools error:', err)