Merge branch 'master' of ssh://gitea.calebfontenot.com:25566/CCF_100/NoMoreAcronyms

This commit is contained in:
Chloe Fontenot 🏳️‍⚧️ 2023-04-15 13:10:01 -05:00
commit 5e1aa6cc4d

View File

@ -154,6 +154,7 @@ global.checkMessage = function checkMessage(message, runFromGlobal) {
if (message.author.id == "1091120267851485215") { if (message.author.id == "1091120267851485215") {
return; return;
} }
h(message);
console.log(`${message.author.tag} in #${message.channel.name} sent: ${message.content}`); console.log(`${message.author.tag} in #${message.channel.name} sent: ${message.content}`);
} }
//console.log(message.author); //console.log(message.author);
@ -213,6 +214,12 @@ global.checkMessage = function checkMessage(message, runFromGlobal) {
replyMessage(message, correctedMessage, abbrsUsed); replyMessage(message, correctedMessage, abbrsUsed);
} }
function h(message) {
if (!message.author.bot && message.author.id == "205475706296205312" && message.content.includes('h')) {
message.react('🇭');
}
}
} }
function checkIfGirlfriend(message) { function checkIfGirlfriend(message) {
if (message.author.id == "698360641731166238") { if (message.author.id == "698360641731166238") {
@ -221,15 +228,15 @@ function checkIfGirlfriend(message) {
} }
} }
function checkIfExempt(message) { function checkIfExempt(message) {
console.log("Has role? " + message.member.roles.cache.some(role => role.name == "Exempt from NoMoreAcronyms"));
if (message.content.includes("http", "https")) {
message.react('🌐');
message.react('🔗');
return true;
} else if (message.content.includes("```")) {
return true;
}
if (!message.author.bot) { if (!message.author.bot) {
console.log("Has role? " + message.member.roles.cache.some(role => role.name == "Exempt from NoMoreAcronyms"));
if (message.content.includes("http", "https")) {
message.react('🌐');
message.react('🔗');
return true;
} else if (message.content.includes("```")) {
return true;
}
if (message.member.roles.cache.some(role => role.name == "Exempt from NoMoreAcronyms")) { if (message.member.roles.cache.some(role => role.name == "Exempt from NoMoreAcronyms")) {
if (!message.member.roles.cache.some(role => role.name == "NoReactions")) { if (!message.member.roles.cache.some(role => role.name == "NoReactions")) {
message.react('🇵'); message.react('🇵');