From 8f70960079badcfa5563a4af8ee8f054c6d5533c Mon Sep 17 00:00:00 2001
From: Aster Fialla <asterfialla@gmail.com>
Date: Sun, 15 Feb 2026 16:48:22 -0500
Subject: [PATCH] removed some overzealous error handling

---
 src/helpers/memberHelper.js  | 3 ---
 src/helpers/messageHelper.js | 3 ++-
 src/helpers/webhookHelper.js | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/helpers/memberHelper.js b/src/helpers/memberHelper.js
index 561823b..2977fd5 100644
--- a/src/helpers/memberHelper.js
+++ b/src/helpers/memberHelper.js
@@ -414,9 +414,6 @@ mh.getMembersByAuthor = async function(authorId) {
  * @throws {Error} When an empty proxy was provided, or no proxy exists.
  */
 mh.checkIfProxyExists = async function(authorId, proxy) {
-    const trimmedProxy = proxy ? proxy.trim() : null;
-
-    if (trimmedProxy == null) throw new RangeError(`Proxy ${enums.err.NO_VALUE}`);
     const splitProxy = proxy.trim().split("text");
     if(splitProxy.length < 2) throw new Error(enums.err.NO_TEXT_FOR_PROXY);
     if(!splitProxy[0] && !splitProxy[1]) throw new Error(enums.err.NO_PROXY_WRAPPER);
diff --git a/src/helpers/messageHelper.js b/src/helpers/messageHelper.js
index d4e86c9..e96e05f 100644
--- a/src/helpers/messageHelper.js
+++ b/src/helpers/messageHelper.js
@@ -55,7 +55,8 @@ msgh.parseProxyTags = async function (authorId, attachment, content){
             const removePrefix = new RegExp("^" + splitProxy[0]);
             const removeSuffix = new RegExp(splitProxy[1] + "$");
             proxyMessage.message = content.replace(removePrefix, "").replace(removeSuffix, "");
-            if (proxyMessage.message.length <= splitProxy[0].length + splitProxy[1].length && !attachment) throw new Error(enums.err.NO_MESSAGE_SENT_WITH_PROXY);
+
+            if (proxyMessage.message.length === 0 && !attachment) throw new Error(enums.err.NO_MESSAGE_SENT_WITH_PROXY);
         }
     })
     return proxyMessage;
diff --git a/src/helpers/webhookHelper.js b/src/helpers/webhookHelper.js
index c44ad43..c6f66cf 100644
--- a/src/helpers/webhookHelper.js
+++ b/src/helpers/webhookHelper.js
@@ -17,7 +17,7 @@ const name = 'PluralFlux Proxy Webhook';
 wh.sendMessageAsMember = async function(client, message, content) {
     const proxyMatch = await messageHelper.parseProxyTags(message.author.id, message.attachments[0] ?? null, content).catch(e =>{throw e});
     // If the message doesn't match a proxy, just return.
-    if (!proxyMatch.proxy) {
+    if (!proxyMatch || !proxyMatch.proxy) {
         return;
     }
     // If the message does match a proxy but is in a guild server