Merge branch 'main' into main

sern-handler · Nov 6, 2023 · 3709057 · 3709057
2 parents 196e963 + 8ef4ee8
commit 3709057
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [3.1.1](https://github.com/sern-handler/handler/compare/v3.1.0...v3.1.1) (2023-11-06)
+
+
+### Bug Fixes
+
+* queuing events ([fd39858](https://github.com/sern-handler/handler/commit/fd39858636d3038abb6d91021b65c99c488a3d6e))
+* queuing events ([#332](https://github.com/sern-handler/handler/issues/332)) @Benzo-Fury ([#333](https://github.com/sern-handler/handler/issues/333)) ([fd39858](https://github.com/sern-handler/handler/commit/fd39858636d3038abb6d91021b65c99c488a3d6e))
+
 ## [3.1.0](https://github.com/sern-handler/handler/compare/v3.0.2...v3.1.0) (2023-09-04)
 
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@sern/handler",
     "packageManager": "[email protected]",
-    "version": "3.1.0",
+    "version": "3.1.1",
     "description": "A complete, customizable, typesafe, & reactive framework for discord bots.",
     "main": "./dist/index.js",
     "module": "./dist/index.mjs",

diff --git 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
@@ -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)),
     );
 }