From 22e3be26db422866327128547dd902e113d74bc0 Mon Sep 17 00:00:00 2001
From: Caleb Fontenot <foley2431@gmail.com>
Date: Tue, 4 Apr 2023 12:59:58 -0500
Subject: [PATCH] Refactor exemption checking

---
 main.ts | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/main.ts b/main.ts
index 01e6dd4..145acb7 100644
--- a/main.ts
+++ b/main.ts
@@ -131,17 +131,8 @@ 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('🇬');
-						return;
-					}
-					return;
-				}
+			if (checkIfExempt(message)) {
+				return;
 			}
 			matchDetected = true;
 			abbrsUsed++;
@@ -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")) {