Skip to content

Commit 4203379

Browse files
committed
Move some handlers to attempt to fix 3806349
1 parent dd9bb8a commit 4203379

1 file changed

Lines changed: 21 additions & 23 deletions

File tree

src/app.ts

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,27 @@ login().then(
160160
process.exit(1);
161161
}
162162

163+
log.info("Registering main event handlers...");
164+
165+
client.on("messageCreate", m => messageCommandHandler(m, botContext));
166+
client.on("messageCreate", m => deleteThreadMessagesHandler(m, botContext));
167+
client.on("guildMemberAdd", m => guildMemberHandler.added(botContext, m));
168+
client.on("guildMemberRemove", m => guildMemberHandler.removed(botContext, m));
169+
client.on("interactionCreate", i => handleInteractionEvent(i, botContext));
170+
client.on("voiceStateUpdate", (old, next) =>
171+
voiceStateService.checkVoiceUpdate(old, next, botContext),
172+
);
173+
client.on("messageDelete", async message => {
174+
if (!message.inGuild()) {
175+
return;
176+
}
177+
178+
await messageDeleteHandler(message, botContext).catch(err => {
179+
log.error(err, `[messageDelete] Error for ${message.id}`);
180+
sentry.captureException(err);
181+
});
182+
});
183+
163184
log.info("Bot successfully started");
164185

165186
if (args.values["dry-run"]) {
@@ -181,31 +202,12 @@ login().then(
181202
},
182203
);
183204

184-
client.on("interactionCreate", interaction => handleInteractionEvent(interaction, botContext));
185-
186205
client.on("guildCreate", guild =>
187206
log.info(`New guild joined: ${guild.name} (id: ${guild.id}) with ${guild.memberCount} members`),
188207
);
189208

190209
client.on("guildDelete", guild => log.info(`Deleted from guild: ${guild.name} (id: ${guild.id}).`));
191210

192-
client.on("guildMemberAdd", async m => await guildMemberHandler.added(botContext, m));
193-
client.on("guildMemberRemove", async m => await guildMemberHandler.removed(botContext, m));
194-
195-
client.on("messageCreate", m => messageCommandHandler(m, botContext));
196-
client.on("messageCreate", m => deleteThreadMessagesHandler(m, botContext));
197-
198-
client.on("messageDelete", async message => {
199-
if (!message.inGuild()) {
200-
return;
201-
}
202-
203-
await messageDeleteHandler(message, botContext).catch(err => {
204-
log.error(err, `[messageDelete] Error for ${message.id}`);
205-
sentry.captureException(err);
206-
});
207-
});
208-
209211
client.on("error", e => log.error(e, "Discord Client Error"));
210212
client.on("warn", w => log.warn(`Discord Client Warning: "${w}"`));
211213
client.on("rateLimit", d => log.error(d, "Discord client rate limit reached"));
@@ -235,10 +237,6 @@ client.on("messageReactionRemove", async (event, user) => {
235237
}
236238
});
237239

238-
client.on("voiceStateUpdate", (old, next) =>
239-
voiceStateService.checkVoiceUpdate(old, next, botContext),
240-
);
241-
242240
client.on("presenceUpdate", async (oldPresence, newPresence) => {
243241
try {
244242
await handlePresenceUpdate(botContext, oldPresence, newPresence);

0 commit comments

Comments
 (0)