ham/ghbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use correct argument when reporting invalid group

Browse Source
This commit is contained in:
greenham
2021-08-10 20:03:31 -07:00
parent 01cc04f0b2
commit ca00e52377
1 changed files with 43 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
discord.js
View File

@@ -185,7 +185,9 @@ function init(config) {
let validRoles = guildConfig.allowedRolesForRequest.split("|"); let validRoles = guildConfig.allowedRolesForRequest.split("|");
if (msg.content === guildConfig.prefix + "role") { if (msg.content === guildConfig.prefix + "role") {
return msg.reply(`Useage: ${guildConfig.prefix}role {add|remove} {${guildConfig.allowedRolesForRequest}}`); return msg.reply(
`Useage: ${guildConfig.prefix}role {add|remove} {${guildConfig.allowedRolesForRequest}}`
);
} }
// parse+validate action+role (use original case from message because roles are case-sensitive) // parse+validate action+role (use original case from message because roles are case-sensitive)
@@ -193,7 +195,9 @@ function init(config) {
/role\s(add|remove)\s([a-z0-9\-]+)/i /role\s(add|remove)\s([a-z0-9\-]+)/i
); );
if (!roleName) { if (!roleName) {
return msg.reply(`Useage: ${guildConfig.prefix}role {add|remove} {${guildConfig.allowedRolesForRequest}}`); return msg.reply(
`Useage: ${guildConfig.prefix}role {add|remove} {${guildConfig.allowedRolesForRequest}}`
);
} else { } else {
let tester = new RegExp(guildConfig.allowedRolesForRequest, "i"); let tester = new RegExp(guildConfig.allowedRolesForRequest, "i");
if (tester.test(roleName[2])) { if (tester.test(roleName[2])) {
@@ -209,31 +213,55 @@ function init(config) {
// add/remove the role and react to the message with the results // add/remove the role and react to the message with the results
if (roleName[1] === "add") { if (roleName[1] === "add") {
msg.member.roles.add(role, "User requested") msg.member.roles
.add(role, "User requested")
.then((requestingMember) => { .then((requestingMember) => {
msg.react('👍').then(() => {console.log('Reaction sent')}).catch(console.error); msg
.react("👍")
.then(() => {
console.log("Reaction sent");
}) })
.catch(err => { .catch(console.error);
})
.catch((err) => {
console.error(`Error during role addition: ${err}`); console.error(`Error during role addition: ${err}`);
msg.react('⚠').then(() => {console.log('Reaction sent')}).catch(console.error); msg
.react("⚠")
.then(() => {
console.log("Reaction sent");
})
.catch(console.error);
}); });
} else if (roleName[1] === "remove") { } else if (roleName[1] === "remove") {
msg.member.roles.remove(role, "User requested") msg.member.roles
.remove(role, "User requested")
.then((requestingMember) => { .then((requestingMember) => {
msg.react('👍').then(() => {console.log('Reaction sent')}).catch(console.error); msg
.react("👍")
.then(() => {
console.log("Reaction sent");
}) })
.catch(err => { .catch(console.error);
})
.catch((err) => {
console.error(`Error during role addition: ${err}`); console.error(`Error during role addition: ${err}`);
msg.react('⚠').then(() => {console.log('Reaction sent')}).catch(console.error); msg
.react("⚠")
.then(() => {
console.log("Reaction sent");
})
.catch(console.error);
}); });
} else { } else {
msg.reply(`You must use add/remove after the role command! *e.g. ${guildConfig.prefix}role add ${validRoles[0]}*`); msg.reply(
`You must use add/remove after the role command! *e.g. ${guildConfig.prefix}role add ${validRoles[0]}*`
);
} }
} else { } else {
msg.reply( msg.reply(
`${ `**${
roleName[1] roleName[2]
} is not a valid role name! The roles allowed for request are: ${validRoles.join( }** is not a valid role name! The roles allowed for request are: ${validRoles.join(
"," ","
)}` )}`
); );