Fix crash if messages sent before init complete.

MitchTalmadge · Jul 5, 2020 · 8e2b858 · 8e2b858
1 parent c582358
commit 8e2b858
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/src/guild-context.ts b/src/guild-context.ts
@@ -38,6 +38,8 @@ export class GuildContext {
 
   public verifiedRoleId: string;
 
+  private initComplete = false;
+
   constructor(
     public guild: Discord.Guild,
     public guildConfig: GuildConfig,
@@ -70,9 +72,11 @@ export class GuildContext {
     this.guildLog("Performing startup checks...");
     await HealthAssuranceService.identifyAndFixHealthIssues(this);
 
+    this.guildLog("Initializing controllers...");
     this.initControllers();
 
     this.guildLog("Initialization complete.");
+    this.initComplete = true;
   }
 
   private initControllers(): void {
@@ -84,6 +88,11 @@ export class GuildContext {
   }
 
   public onMessageReceived(message: Discord.Message): void {
+    if(!this.initComplete) {
+      this.guildLog(`Message ID ${message.id} from ${DiscordUtils.describeUserForLogs(message.author)} dropped because init is not complete.`);
+      return;
+    }
+
     // Channel Controllers
     if (message.channel instanceof Discord.TextChannel) {
       if (message.channel.id === this.guildConfig.courseSelectionChannelId) {

diff --git a/src/main.ts b/src/main.ts
@@ -109,7 +109,11 @@ export class StudyBot {
       return;
     }
 
-    this.guildContexts[message.guild.id].onMessageReceived(<Discord.Message>message);
+    try {
+      this.guildContexts[message.guild.id].onMessageReceived(<Discord.Message>message);
+    } catch(err) {
+      console.error(`Failed to send message ID ${message.id} to guild ID ${message.guild.id} for processing:`, err);
+    }
   }
 
   private static onMemberJoin(member: Discord.GuildMember | Discord.PartialGuildMember): void {
@@ -120,7 +124,11 @@ export class StudyBot {
 
     const guildContext = this.guildContexts[member.guild.id];
     guildContext.guildLog(`Member ${DiscordUtils.describeUserForLogs(member.user)} joined the guild.`);
-    this.guildContexts[member.guild.id].onMemberJoin(<Discord.GuildMember>member);
+    try {
+      this.guildContexts[member.guild.id].onMemberJoin(<Discord.GuildMember>member);
+    } catch(err) {
+      console.error(`Failed to send member ID ${member.id} join event to guild ID ${member.guild.id} for processing:`, err);
+    }
   }  
 
   private static onMemberLeave(member: Discord.GuildMember | Discord.PartialGuildMember): void {
@@ -131,7 +139,11 @@ export class StudyBot {
 
     const guildContext = this.guildContexts[member.guild.id];
     guildContext.guildLog(`Member ${DiscordUtils.describeUserForLogs(member.user)} left the guild.`);
-    this.guildContexts[member.guild.id].onMemberLeave(<Discord.GuildMember>member);
+    try {
+      this.guildContexts[member.guild.id].onMemberLeave(<Discord.GuildMember>member);
+    } catch(err) {
+      console.error(`Failed to send member ID ${member.id} leave event to guild ID ${member.guild.id} for processing:`, err);
+    }
   }  
 }