From fd39858636d3038abb6d91021b65c99c488a3d6e Mon Sep 17 00:00:00 2001
From: Neo <80315475+Benzo-Fury@users.noreply.github.com>
Date: Mon, 6 Nov 2023 13:23:27 +1000
Subject: [PATCH] fix: queuing events (#332) @Benzo-Fury (#333)

fix: queuing events

Co-authored-by: Jacob Nguyen <76754747+jacoobes@users.noreply.github.com>
---
 src/handlers/interaction-event.ts | 4 ++--
 src/handlers/message-event.ts     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/handlers/interaction-event.ts b/src/handlers/interaction-event.ts
index 0c385af..2e150da 100644
--- a/src/handlers/interaction-event.ts
+++ b/src/handlers/interaction-event.ts
@@ -1,5 +1,5 @@
 import { Interaction } from 'discord.js';
-import { concatMap, merge } from 'rxjs';
+import { mergeMap, merge } from 'rxjs';
 import { SernEmitter } from '../core';
 import {
     isAutocomplete,
@@ -28,6 +28,6 @@ export function interactionHandler([emitter, , , modules, client]: DependencyLis
             filterTap(e => emitter.emit('warning', SernEmitter.warning(e))),
             makeModuleExecutor(module => 
                 emitter.emit('module.activate', SernEmitter.failure(module, SernError.PluginFailure))),
-            concatMap(payload => executeModule(emitter, payload)),
+            mergeMap(payload => executeModule(emitter, payload)),
     );
 }
diff --git a/src/handlers/message-event.ts b/src/handlers/message-event.ts
index 01d7fe0..aa7a05b 100644
--- a/src/handlers/message-event.ts
+++ b/src/handlers/message-event.ts
@@ -1,4 +1,4 @@
-import { concatMap, EMPTY } from 'rxjs';
+import { mergeMap, EMPTY } from 'rxjs';
 import type { Message } from 'discord.js';
 import { SernEmitter } from '../core';
 import { sharedEventStream, SernError, filterTap } from '../core/_internal';
@@ -42,6 +42,6 @@ export function messageHandler(
         makeModuleExecutor(module => {
             emitter.emit('module.activate', SernEmitter.failure(module, SernError.PluginFailure));
         }),
-        concatMap(payload => executeModule(emitter, payload)),
+        mergeMap(payload => executeModule(emitter, payload)),
     );
 }