wew, try catch like it's 1984

matrix-org · Nov 8, 2018 · 4907f08 · 4907f08
1 parent 49f7941
commit 4907f08
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/src/bot.ts b/src/bot.ts
@@ -112,29 +112,35 @@ export class DiscordBot {
           await Bluebird.delay(this.config.limits.discordSendDelay);
           this.discordMessageQueue[msg.channel.id] = (async () => {
               await (this.discordMessageQueue[msg.channel.id] || Promise.resolve());
-              await (this.DeleteDiscordMessage(msg).catch(
-                  (err) => log.error("Caught while handing 'messageDelete'", err),
-              ));
+              try {
+                  await this.DeleteDiscordMessage(msg);
+              } catch (err) {
+                  log.error("Caught while handing 'messageDelete'", err);
+              }
           })();
       });
       client.on("messageUpdate", async (oldMessage: Discord.Message, newMessage: Discord.Message) => {
           // tslint:disable-next-line:await-promise
           await Bluebird.delay(this.config.limits.discordSendDelay);
           this.discordMessageQueue[newMessage.channel.id] = (async () => {
               await (this.discordMessageQueue[newMessage.channel.id] || Promise.resolve());
-              await (this.OnMessageUpdate(oldMessage, newMessage).catch(
-                  (err) => log.error("Caught while handing 'messageUpdate'", err),
-              ));
+              try {
+                  await this.OnMessageUpdate(oldMessage, newMessage);
+              } catch (err) {
+                  log.error("Caught while handing 'messageUpdate'", err);
+              }
           })();
       });
       client.on("message", async (msg: Discord.Message) => {
         // tslint:disable-next-line:await-promise
         await Bluebird.delay(this.config.limits.discordSendDelay);
         this.discordMessageQueue[msg.channel.id] = (async () => {
             await (this.discordMessageQueue[msg.channel.id] || Promise.resolve());
-            await (this.OnMessage(msg).catch(
-                (err) => log.error("Caught while handing 'message'", err),
-            ));
+            try {
+                await this.OnMessage(msg);
+            } catch (err) {
+                log.error("Caught while handing 'message'", err);
+            }
         })();
       });
       const jsLog = new Log("discord.js");