dan/Shasha
1
0
Fork 0
mirror of https://github.com/danbulant/Shasha synced 2026-06-24 17:12:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

--m flag improvement

Browse source
This commit is contained in:
Neko-Life 2021-08-06 00:21:12 +07:00
parent 3592cf5953
commit 3f604cdc8b
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cmds/fun/say.js
View file

@ -15,20 +15,21 @@ module.exports = class say extends commando.Command {
} }
async run(msg, args) { async run(msg, args) {
const REPLACE = args.match(/(?<!\\)--m +[^\s\n]+( +\d{17,19})?/g); const REPLACE = args.match(/(?<!\\)--m +[^\s\n]+( +\d{17,19})?/g);
if (REPLACE.length) if (REPLACE?.length)
for (const RE of REPLACE) { for (const RE of REPLACE) {
const tar = RE.split(/ +/); const tar = RE.split(/ +/);
const tarMes = await getChannelMessage(msg, tar[1], tar[2]); 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 = '​'; if (!args) args = '​';
args = emoteMessage(this.client, 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')) { if (msg.member?.hasPermission('MENTION_EVERYONE')) {
sendThis.disableMentions = "none"; 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")) { 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); tryDelete(msg);
} }