role and everyone ping prevents

3 years ago · e6793e5df2
parent 22532982c3
commit e6793e5df2
2 changed files with 4 additions and 2 deletions
--- a/commands/social/afk.js
+++ b/commands/social/afk.js
@ -27,7 +27,8 @@ module.exports = {
        } else {tu.statusclearmode = 'auto';}
        if (!args.length) {return message.channel.send(`Syntax: \`${prefix}afk [clearMode] <reason>\``);}
        let reason = args.join(" ");
-        if (reason.length > 150) {return message.reply("That status a bit long; keep it under 150 characters.");}
+        if (reason.length > 150) {return message.channel.send("That status a bit long; keep it under 150 characters.");}
+        if (reason.match(/<@&\d+>|@everyone/gm)) {return message.channel.send("I won't ping any roles or @ everyone!");}
        tu.statustype = 'afk';
        tu.statusmsg = reason.trim();
        tu.statussetat = new Date();
--- a/commands/social/dnd.js
+++ b/commands/social/dnd.js
@ -27,7 +27,8 @@ module.exports = {
        } else {tu.statusclearmode = 'manual';}
        if (!args.length) {return message.channel.send(`Syntax: \`${prefix}afk [clearMode] <reason>\``);}
        let reason = args.join(" ");
-        if (reason.length > 150) {return message.reply("That status a bit long; keep it under 150 characters.");}
+        if (reason.length > 150) {return message.channel.send("That status a bit long; keep it under 150 characters.");}
+        if (reason.match(/<@&\d+>|@everyone/gm)) {return message.channel.send("I won't ping any roles or @ everyone!");}
        tu.statustype = 'dnd';
        tu.statusmsg = reason.trim();
        tu.statussetat = new Date();