From 3f604cdc8bd844fb72eff351b743746b42c4becd Mon Sep 17 00:00:00 2001
From: Neko-Life <nekolife123579@gmail.com>
Date: Fri, 6 Aug 2021 00:21:12 +0700
Subject: [PATCH] `--m` flag improvement

---
 cmds/fun/say.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/cmds/fun/say.js b/cmds/fun/say.js
index f66ba24..7498410 100644
--- a/cmds/fun/say.js
+++ b/cmds/fun/say.js
@@ -15,20 +15,21 @@ module.exports = class say extends commando.Command {
     }
     async run(msg, args) {
         const REPLACE = args.match(/(?<!\\)--m +[^\s\n]+( +\d{17,19})?/g);
-        if (REPLACE.length)
+        if (REPLACE?.length)
             for (const RE of REPLACE) {
                 const tar = RE.split(/ +/);
                 const tarMes = await getChannelMessage(msg, tar[1], tar[2]);
-                args = args.replace(RE, tarMes.content);
+                const reg = new RegExp(RE + "(\\s(?=\\W))?");
+                args = args.replace(reg, tarMes.content);
             };
 
         if (!args) args = '​';
         args = emoteMessage(this.client, args);
-        const sendThis = { content: args, disableMentions: "all" };
+        const sendThis = { content: args, disableMentions: "all", split: true };
         if (msg.member?.hasPermission('MENTION_EVERYONE')) {
             sendThis.disableMentions = "none";
         }
-        const sent = await trySend(this.client, msg, { content: sendThis, split: true });
+        const sent = await trySend(this.client, msg, sendThis);
         if (args != '​' && msg.guild && !(new RegExp("^<@\!?" + msg.client.user.id + ">\s")).test(msg.content) && msg.member.hasPermission("MANAGE_MESSAGES") && msg.guild.member(this.client.user).hasPermission("MANAGE_MESSAGES")) {
             tryDelete(msg);
         }