CCF_100
/
NoMoreAcronyms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor exemption checking

master
Chloe Fontenot 🏳️‍⚧️ 2023-04-04 12:59:58 +07:00
parent d498d663e2
commit 22e3be26db
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
main.ts
Unescape Escape View File

@ -131,18 +131,9 @@ function checkMessage(message) {
//console.log("Corrected Message: " + correctedMessage);
if (abbreviationKey.target_phrases[matchMessageArray[i]] !== undefined) {
console.log("Has role? " + message.member.roles.cache.some(role => role.name == "Exempt from NoMoreAcronyms"));
if (!message.author.bot) {
if (message.member.roles.cache.some(role => role.name == "Exempt from NoMoreAcronyms")) {
if (!message.member.roles.cache.some(role => role.name == "NoReactions")) {
message.react('🇵');
message.react('🇴');
message.react('🇬');
if (checkIfExempt(message)) {
return;
}
return;
}
}
matchDetected = true;
abbrsUsed++;
//Return key
@ -157,7 +148,7 @@ function checkMessage(message) {
console.log("rebuildMessageArray: " + rebuildMessageArray);
} else {
message.reply("Detected abbreviation, but regex matching broke. Caleb is working on this...");
break;
return;
}
//https://gitea.calebfontenot.com/CCF_100/NoMoreAcronyms/issues/1
arrayRotate(rebuildMessageArray, true, 1);
@ -179,6 +170,22 @@ function checkMessage(message) {
}
}
function checkIfExempt(message) {
console.log("Has role? " + message.member.roles.cache.some(role => role.name == "Exempt from NoMoreAcronyms"));
if (!message.author.bot) {
if (message.member.roles.cache.some(role => role.name == "Exempt from NoMoreAcronyms")) {
if (!message.member.roles.cache.some(role => role.name == "NoReactions")) {
message.react('🇵');
message.react('🇴');
message.react('🇬');
return true;
}
return true;
}
}
return false;
}
function checkInsult(message) {
if (!message.author.bot) {
if (!message.member.roles.cache.some(role => role.name == "Exempt from NoMoreAcronyms")) {