From 1bf6c8c1f2109ef06ae874ce9c9e5273cbfaf2a6 Mon Sep 17 00:00:00 2001
From: Aster Fialla <asterfialla@gmail.com>
Date: Wed, 18 Feb 2026 00:25:23 -0500
Subject: [PATCH] think i fixed weird error with webhook sending error when a
 user has no members

---
 src/helpers/webhookHelper.js | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/helpers/webhookHelper.js b/src/helpers/webhookHelper.js
index dd78184..077404f 100644
--- a/src/helpers/webhookHelper.js
+++ b/src/helpers/webhookHelper.js
@@ -16,18 +16,14 @@ wh.sendMessageAsMember = async function(client, message) {
     const attachmentUrl = message.attachments.size > 0 ? message.attachments.first().url : null;
     const proxyMatch = await messageHelper.parseProxyTags(message.author.id, message.content, attachmentUrl).catch(e =>{throw e});
     // If the message doesn't match a proxy, just return.
-    if (!proxyMatch.member) {
+    if (!proxyMatch || !proxyMatch.member) {
         return;
     }
     // If the message does match a proxy but is not in a guild server (ex: in the Bot's DMs
     if (!message.guildId) {
         throw new Error(enums.err.NOT_IN_SERVER);
     }
-
-    if (proxyMatch.message === enums.misc.ATTACHMENT_SENT_BY) {
-        return await message.reply(`${enums.misc.ATTACHMENT_SENT_BY} ${proxyMatch.member.displayname}`)
-    }
-    await replaceMessage(client, message, proxyMatch.message, proxyMatch.member).catch(e =>{throw e});
+    await wh.replaceMessage(client, message, proxyMatch.message, proxyMatch.member).catch(e =>{throw e});
 }
 
 /**
@@ -38,10 +34,10 @@ wh.sendMessageAsMember = async function(client, message) {
  * @param {model} member - A member object from the database.
  * @throws {Error} When there's no message to send.
  */
-async function replaceMessage(client, message, text, member) {
+wh.replaceMessage = async function(client, message, text, member) {
     if (text.length > 0 || message.attachments.size > 0) {
         const channel = client.channels.get(message.channelId);
-        const webhook = await getOrCreateWebhook(client, channel).catch((e) =>{throw e});
+        const webhook = await wh.getOrCreateWebhook(client, channel).catch((e) =>{throw e});
         const username = member.displayname ?? member.name;
         await webhook.send({content: text, username: username, avatar_url: member.propic});
         await message.delete();
@@ -59,10 +55,10 @@ async function replaceMessage(client, message, text, member) {
  * @returns {Webhook} A webhook object.
  * @throws {Error} When no webhooks are allowed in the channel.
  */
-async function getOrCreateWebhook(client, channel) {
+wh.getOrCreateWebhook = async function(client, channel) {
     // If channel doesn't allow webhooks
     if (!channel?.createWebhook) throw new Error(enums.err.NO_WEBHOOKS_ALLOWED);
-    let webhook = await getWebhook(client, channel).catch((e) =>{throw e});
+    let webhook = await wh.getWebhook(client, channel).catch((e) =>{throw e});
     if (!webhook) {
         webhook = await channel.createWebhook({name: name});
     }
@@ -76,7 +72,7 @@ async function getOrCreateWebhook(client, channel) {
  * @param {Channel} channel - The channel the message was sent in.
  * @returns {Webhook} A webhook object.
  */
-async function getWebhook(client, channel) {
+wh.getWebhook = async function(client, channel) {
     const channelWebhooks = await channel?.fetchWebhooks() ?? [];
     if (channelWebhooks.length === 0) {
         return;