From 9c6610133d5abb767830c319baff9a3ebd63477b Mon Sep 17 00:00:00 2001 From: RedsTom Date: Mon, 15 Jun 2026 17:11:26 +0200 Subject: [PATCH] fix(listener-loader): crash when no arg has .guild property - Add optional chaining to prevent crash in guildId resolution - Add fallback for message.guild/message.guildId (handles messageReactionAdd/Remove events where the reaction object doesn't have a direct .guild property) - Remove incorrect arg.roles check (GuildMember.id is user ID, not guild ID) - Fix missing .guildId accessor on the guildId fallback --- src/core/loaders/listener-loader.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/core/loaders/listener-loader.ts b/src/core/loaders/listener-loader.ts index e799e90..8788356 100644 --- a/src/core/loaders/listener-loader.ts +++ b/src/core/loaders/listener-loader.ts @@ -45,9 +45,10 @@ export function loadModuleEvents(client: Client, module: Module) { client.on(listener.eventType, (...args) => { const guildId = - args.find((arg) => !!arg.roles)?.id || - args.find((arg) => !!arg?.guild).guild?.id || - args.find((arg) => !!arg?.guildId); + args.find((arg) => !!arg?.guild)?.guild?.id || + args.find((arg) => !!arg?.guildId)?.guildId || + args.find((arg) => !!arg?.message?.guild)?.message?.guildId || + args.find((arg) => !!arg?.message?.guildId)?.message?.guildId; if (guildId) { moduleService