Move CheckExemption::Call to CheckExemption::EventProvider.

Now FirstResult not a macro there's no need for this to be a free
function.

14 files changed, 17 insertions, 17 deletions

diff --git a/src/modules/m_account.cpp b/src/modules/m_account.cpp
index 9db381d28..b33d98c14 100644
--- a/src/modules/m_account.cpp
+++ b/src/modules/m_account.cpp
@@ -239,7 +239,7 @@ public:
 				if (!targetchan->IsModeSet(regmoderatedmode) || account)
 					return MOD_RES_PASSTHRU;
 
-				if (CheckExemption::Call(exemptionprov, user, targetchan, "regmoderated") == MOD_RES_ALLOW)
+				if (exemptionprov.Check(user, targetchan, "regmoderated") == MOD_RES_ALLOW)
 					return MOD_RES_PASSTHRU;
 
 				// User is messaging a +M channel and is not registered or exempt.
diff --git a/src/modules/m_anticaps.cpp b/src/modules/m_anticaps.cpp
index 874ae07d3..fad0421fc 100644
--- a/src/modules/m_anticaps.cpp
+++ b/src/modules/m_anticaps.cpp
@@ -222,7 +222,7 @@ public:
 
 		// If the user is exempt from anticaps then we don't need
 		// to do anything else.
-		ModResult result = CheckExemption::Call(exemptionprov, user, channel, "anticaps");
+		ModResult result = exemptionprov.Check(user, channel, "anticaps");
 		if (result == MOD_RES_ALLOW)
 			return MOD_RES_PASSTHRU;
 
diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp
index 35ce62b1e..95cbb82eb 100644
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -103,7 +103,7 @@ public:
 		if (!memb->chan->IsModeSet(&aum))
 			return true;
 
-		ModResult res = CheckExemption::Call(exemptionprov, memb->user, memb->chan, "auditorium-vis");
+		ModResult res = exemptionprov.Check(memb->user, memb->chan, "auditorium-vis");
 		return res.check(OpsVisible && memb->GetRank() >= OP_VALUE);
 	}
 
@@ -119,7 +119,7 @@ public:
 			return true;
 
 		// Can you see the list by permission?
-		ModResult res = CheckExemption::Call(exemptionprov, issuer, memb->chan, "auditorium-see");
+		ModResult res = exemptionprov.Check(issuer, memb->chan, "auditorium-see");
 		return res.check(OpsCanSee && memb->chan->GetPrefixValue(issuer) >= OP_VALUE);
 	}
 
diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index d04e87902..34faf2b7e 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -55,7 +55,7 @@ public:
 		{
 			Channel* c = target.Get<Channel>();
 
-			ModResult res = CheckExemption::Call(exemptionprov, user, c, "blockcolor");
+			ModResult res = exemptionprov.Check(user, c, "blockcolor");
 			if (res == MOD_RES_ALLOW)
 				return MOD_RES_PASSTHRU;
 
diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index a3eab65c5..dfa8ba0ca 100644
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -78,7 +78,7 @@ class ModuleChanFilter final
 		if (user->HasPrivPermission("channels/ignore-chanfilter"))
 			return nullptr; // The source is an exempt server operator.
 
-		if (CheckExemption::Call(exemptionprov, user, chan, "filter") == MOD_RES_ALLOW)
+		if (exemptionprov.Check(user, chan, "filter") == MOD_RES_ALLOW)
 			return nullptr; // The source matches an exemptchanops entry.
 
 		ListModeBase::ModeList* list = cf.GetList(chan);
diff --git a/src/modules/m_delaymsg.cpp b/src/modules/m_delaymsg.cpp
index 97c2f22e0..5aa734b1f 100644
--- a/src/modules/m_delaymsg.cpp
+++ b/src/modules/m_delaymsg.cpp
@@ -136,7 +136,7 @@ ModResult ModuleDelayMsg::HandleMessage(User* user, const MessageTarget& target,
 
 	if ((ts + len) > ServerInstance->Time())
 	{
-		ModResult res = CheckExemption::Call(exemptionprov, user, channel, "delaymsg");
+		ModResult res = exemptionprov.Check(user, channel, "delaymsg");
 		if (res == MOD_RES_ALLOW)
 			return MOD_RES_PASSTHRU;
 
diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index 76e59b1b8..6dcb50420 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -153,7 +153,7 @@ public:
 		if ((!IS_LOCAL(user)) || !dest->IsModeSet(mf))
 			return MOD_RES_PASSTHRU;
 
-		ModResult res = CheckExemption::Call(exemptionprov, user, dest, "flood");
+		ModResult res = exemptionprov.Check(user, dest, "flood");
 		if (res == MOD_RES_ALLOW)
 			return MOD_RES_PASSTHRU;
 
diff --git a/src/modules/m_nickflood.cpp b/src/modules/m_nickflood.cpp
index c830b5b8e..d92ea9589 100644
--- a/src/modules/m_nickflood.cpp
+++ b/src/modules/m_nickflood.cpp
@@ -152,7 +152,7 @@ public:
 			nickfloodsettings* f = nf.ext.Get(memb->chan);
 			if (f)
 			{
-				ModResult res = CheckExemption::Call(exemptionprov, user, memb->chan, "nickflood");
+				ModResult res = exemptionprov.Check(user, memb->chan, "nickflood");
 				if (res == MOD_RES_ALLOW)
 					continue;
 
@@ -190,7 +190,7 @@ public:
 			nickfloodsettings* f = nf.ext.Get(memb->chan);
 			if (f)
 			{
-				ModResult res = CheckExemption::Call(exemptionprov, user, memb->chan, "nickflood");
+				ModResult res = exemptionprov.Check(user, memb->chan, "nickflood");
 				if (res == MOD_RES_ALLOW)
 					return;
 
diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index 42cdac6a1..767f75bb4 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -72,7 +72,7 @@ public:
 						details.exemptions.insert(u);
 				}
 
-				ModResult res = CheckExemption::Call(exemptionprov, user, c, "noctcp");
+				ModResult res = exemptionprov.Check(user, c, "noctcp");
 				if (res == MOD_RES_ALLOW)
 					return MOD_RES_PASSTHRU;
 
diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 6064c883c..9c4165497 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -49,7 +49,7 @@ public:
 	{
 		for (const auto* memb : user->chans)
 		{
-			ModResult res = CheckExemption::Call(exemptionprov, user, memb->chan, "nonick");
+			ModResult res = exemptionprov.Check(user, memb->chan, "nonick");
 			if (res == MOD_RES_ALLOW)
 				continue;
 
diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index cb722d74c..c52a6e57a 100644
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -53,7 +53,7 @@ public:
 		{
 			Channel* c = target.Get<Channel>();
 
-			ModResult res = CheckExemption::Call(exemptionprov, user, c, "nonotice");
+			ModResult res = exemptionprov.Check(user, c, "nonotice");
 			if (res == MOD_RES_ALLOW)
 				return MOD_RES_PASSTHRU;
 
diff --git a/src/modules/m_opmoderated.cpp b/src/modules/m_opmoderated.cpp
index dc809fa47..2ef9774c3 100644
--- a/src/modules/m_opmoderated.cpp
+++ b/src/modules/m_opmoderated.cpp
@@ -50,7 +50,7 @@ private:
 			return MOD_RES_PASSTHRU;
 
 		// Check for channel members who are exempted by a module.
-		if (CheckExemption::Call(exemptionprov, user, chan, "opmoderated") == MOD_RES_ALLOW)
+		if (exemptionprov.Check(user, chan, "opmoderated") == MOD_RES_ALLOW)
 			return MOD_RES_PASSTHRU;
 
 		if (!extban.GetStatus(user, chan).check(!chan->IsModeSet(mode)))
diff --git a/src/modules/m_repeat.cpp b/src/modules/m_repeat.cpp
index 7e0317a62..218bc54af 100644
--- a/src/modules/m_repeat.cpp
+++ b/src/modules/m_repeat.cpp
@@ -392,7 +392,7 @@ public:
 		if (!memb)
 			return MOD_RES_PASSTHRU;
 
-		ModResult res = CheckExemption::Call(exemptionprov, user, chan, "repeat");
+		ModResult res = exemptionprov.Check(user, chan, "repeat");
 		if (res == MOD_RES_ALLOW)
 			return MOD_RES_PASSTHRU;
 
diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp
index 3ae975419..fcfd789eb 100644
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -66,7 +66,7 @@ public:
 			case MessageTarget::TYPE_CHANNEL:
 			{
 				Channel* t = target.Get<Channel>();
-				ModResult res = CheckExemption::Call(exemptionprov, user, t, "stripcolor");
+				ModResult res = exemptionprov.Check(user, t, "stripcolor");
 
 				if (res == MOD_RES_ALLOW)
 					return MOD_RES_PASSTHRU;
@@ -96,7 +96,7 @@ public:
 
 		if (extban.GetStatus(user, channel).check(!user->IsModeSet(csc)))
 		{
-			ModResult res = CheckExemption::Call(exemptionprov, user, channel, "stripcolor");
+			ModResult res = exemptionprov.Check(user, channel, "stripcolor");
 
 			if (res != MOD_RES_ALLOW)
 				InspIRCd::StripColor(partmessage);