X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonicks.cpp;h=c6de17e891e962e5ad3967daddb49c17d0254f33;hb=c46f8a368c42f64284244f3d2dfc022a383294fa;hp=63815f2bf7ef329675082187470e1ff14cbac773;hpb=46c97a8db770d637cf8e11fa8b178a32c60cdada;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 63815f2bf..c6de17e89 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -20,6 +20,7 @@
 
 
 #include "inspircd.h"
+#include "modules/exemption.h"
 
 class NoNicks : public SimpleChannelModeHandler
 {
@@ -29,10 +30,13 @@ class NoNicks : public SimpleChannelModeHandler
 
 class ModuleNoNickChange : public Module
 {
+	CheckExemption::EventProvider exemptionprov;
 	NoNicks nn;
 	bool override;
  public:
-	ModuleNoNickChange() : nn(this)
+	ModuleNoNickChange()
+		: exemptionprov(this)
+		, nn(this)
 	{
 	}
 
@@ -52,7 +56,8 @@ class ModuleNoNickChange : public Module
 		{
 			Channel* curr = (*i)->chan;
 
-			ModResult res = ServerInstance->OnCheckExemption(user,curr,"nonick");
+			ModResult res;
+			FIRST_MOD_RESULT_CUSTOM(exemptionprov, CheckExemption::EventListener, OnCheckExemption, res, (user, curr, "nonick"));
 
 			if (res == MOD_RES_ALLOW)
 				continue;
@@ -62,8 +67,8 @@ class ModuleNoNickChange : public Module
 
 			if (!curr->GetExtBanStatus(user, 'N').check(!curr->IsModeSet(nn)))
 			{
-				user->WriteNumeric(ERR_CANTCHANGENICK, ":Can't change nickname while on %s (+N is set)",
-					curr->name.c_str());
+				user->WriteNumeric(ERR_CANTCHANGENICK, InspIRCd::Format("Can't change nickname while on %s (+N is set)",
+					curr->name.c_str()));
 				return MOD_RES_DENY;
 			}
 		}