diff --git a/src/helpers/messageHelper.js b/src/helpers/messageHelper.js index 839d440..3a56ae4 100644 --- a/src/helpers/messageHelper.js +++ b/src/helpers/messageHelper.js @@ -44,10 +44,16 @@ msgh.parseProxyTags = async function (authorId, attachment, content){ const proxyMessage = {} members.filter(member => member.proxy).forEach(member => { const splitProxy = member.proxy.split("text"); + console.log(splitProxy); if(content.startsWith(splitProxy[0]) && content.endsWith(splitProxy[1])) { - if (content.length <= member.proxy.length && !attachment) throw new Error(enums.err.NO_MESSAGE_SENT_WITH_PROXY); + console.log(content); proxyMessage.proxy = member.proxy; - proxyMessage.message = content.slice(member.proxy.length).trim(); + const removePrefix = new RegExp("^" + splitProxy[0]); + const removeSuffix = new RegExp(splitProxy[1] + "$"); + proxyMessage.message = content.replace(removePrefix, "").replace(removeSuffix, ""); + console.log(proxyMessage); + if (proxyMessage.message.length <= splitProxy[0].length + splitProxy[1].length && !attachment) throw new Error(enums.err.NO_MESSAGE_SENT_WITH_PROXY); + } }) return proxyMessage;