Merge pull request #172 from Skript-MC/v2

🔖 2.1.5
Skript-MC · Sep 1, 2021 · 4baff83 · 4baff83
2 parents fb66b68 + 163908c
commit 4baff83
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 50 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "swan",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "Bot discord de Skript-MC.",
   "main": "./src/main.ts",
   "scripts": {

diff --git a/src/commands/fun/idea.ts b/src/commands/fun/idea.ts
@@ -30,6 +30,11 @@ class IdeaCommand extends Command {
 
     const randomIdea = ideas.random(1)[0];
 
+    if (!randomIdea) {
+      await message.channel.send(config.messages.noIdeaFound);
+      return;
+    }
+
     const embed = new MessageEmbed()
       .setColor(settings.colors.default)
       .setAuthor(

diff --git a/src/listeners/client/error.ts b/src/listeners/client/error.ts
@@ -11,13 +11,9 @@ class ClientErrorListener extends Listener {
   }
 
   public exec(error: Error): void {
+    captureException(error);
     Logger.error('Oops, something went wrong with the Swan Client!');
-    if (process.env.NODE_ENV === 'production') {
-      captureException(error);
-      throw new Error(error.stack);
-    } else {
-      Logger.error(error.stack);
-    }
+    Logger.error(error.stack);
   }
 }
 

diff --git a/src/listeners/commandHandler/error.ts b/src/listeners/commandHandler/error.ts
@@ -15,17 +15,12 @@ class CommandHandlerErrorListener extends Listener {
   }
 
   public async exec(error: Error, message: Message, command: Command): Promise<void> {
+    captureException(error);
     await message.channel.send(messages.global.oops).catch(noop);
     Logger.error('Oops, something went wrong with a command!');
     Logger.detail(`Command: ${command}`);
     Logger.detail(`Message: ${message.url}`);
-
-    if (process.env.NODE_ENV === 'production') {
-      captureException(error);
-      throw new Error(error.stack);
-    } else {
-      Logger.error(error.stack);
-    }
+    Logger.error(error.stack);
   }
 }
 

diff --git a/src/listeners/inhibitorHandler/error.ts b/src/listeners/inhibitorHandler/error.ts
@@ -12,14 +12,10 @@ class InhibitorHandlerErrorListener extends Listener {
   }
 
   public exec(error: Error, inhibitor: Inhibitor): void {
+    captureException(error);
     Logger.error('Oops, something went wrong with an inhibitor!');
     Logger.detail(`Inhibitor: ${inhibitor.id}`);
-    if (process.env.NODE_ENV === 'production') {
-      captureException(error);
-      throw new Error(error.stack);
-    } else {
-      Logger.error(error.stack);
-    }
+    Logger.error(error.stack);
   }
 }
 

diff --git a/src/listeners/listenerHandler/error.ts b/src/listeners/listenerHandler/error.ts
@@ -11,14 +11,10 @@ class ListenerHandlerErrorListener extends Listener {
   }
 
   public exec(error: Error, listener: Listener): void {
+    captureException(error);
     Logger.error('Oops, something went wrong with a listener!');
     Logger.detail(`Listener: ${listener.id}`);
-    if (process.env.NODE_ENV === 'production') {
-      captureException(error);
-      throw new Error(error.stack);
-    } else {
-      Logger.error(error.stack);
-    }
+    Logger.error(error.stack);
   }
 }
 

diff --git a/src/listeners/mongodb/error.ts b/src/listeners/mongodb/error.ts
@@ -11,14 +11,10 @@ class MongodbErrorListener extends Listener {
   }
 
   public exec(error: Error): void {
+    captureException(error);
     Logger.error('Oops, something went wrong with MongoDB!');
     Logger.detail('Please make sure MongoDB is running.');
-    if (process.env.NODE_ENV === 'production') {
-      captureException(error);
-      throw new Error(error.stack);
-    } else {
-      Logger.error(error.stack);
-    }
+    Logger.error(error.stack);
   }
 }
 

diff --git a/src/listeners/process/uncaughtException.ts b/src/listeners/process/uncaughtException.ts
@@ -1,4 +1,4 @@
-import { captureException } from '@sentry/node';
+import { captureException, flush } from '@sentry/node';
 import { Listener } from 'discord-akairo';
 import Logger from '@/app/structures/Logger';
 
@@ -10,11 +10,13 @@ class UncaughtExceptionListener extends Listener {
     });
   }
 
-  public exec(error: Error): void {
+  public async exec(error: Error): Promise<void> {
+    captureException(error);
     Logger.error('Oops, something went wrong with Swan! (uncaughtException)');
     if (process.env.NODE_ENV === 'production') {
-      captureException(error);
-      throw new Error(error.stack);
+      await flush(5000);
+      // eslint-disable-next-line node/no-process-exit
+      process.exit(1);
     } else {
       Logger.error(error.stack);
       Logger.warn('An uncaughtException just occurred. Swan is now in an undefined state. Continuing using it might lead to unforeseen and unpredictable issues.');

diff --git a/src/listeners/process/unhandledRejection.ts b/src/listeners/process/unhandledRejection.ts
@@ -11,13 +11,9 @@ class UnhandledRejectionListener extends Listener {
   }
 
   public exec(error: Error): void {
+    captureException(error);
     Logger.error('Oops, something went wrong with Swan! (unhandledRejection)');
-    if (process.env.NODE_ENV === 'production') {
-      captureException(error);
-      throw new Error(error.stack);
-    } else {
-      Logger.error(error.stack);
-    }
+    Logger.error(error.stack);
   }
 }
 

diff --git a/src/listeners/taskHandler/error.ts b/src/listeners/taskHandler/error.ts
@@ -12,15 +12,11 @@ class TaskHandlerErrorListener extends Listener {
   }
 
   public exec(error: Error, task: Task): void {
+    captureException(error);
     Logger.error('Oops, something went wrong with a task!');
     Logger.detail(`Task: ${task}`);
     Logger.detail(`Cron: ${task.cron}`);
-    if (process.env.NODE_ENV === 'production') {
-      captureException(error);
-      throw new Error(error.stack);
-    } else {
-      Logger.error(error.stack);
-    }
+    Logger.error(error.stack);
   }
 }