1 files changed, 18 insertions, 48 deletions

diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 672a48f8d..a796495a8 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -20,83 +20,53 @@
 
 
 #include "inspircd.h"
-
-/* $ModDesc: Provides support for channel mode +N & extban +b N: which prevents nick changes on channel */
-
-class NoNicks : public SimpleChannelModeHandler
-{
- public:
-	NoNicks(Module* Creator) : SimpleChannelModeHandler(Creator, "nonick", 'N') { }
-};
+#include "modules/exemption.h"
 
 class ModuleNoNickChange : public Module
 {
-	NoNicks nn;
-	bool override;
+	CheckExemption::EventProvider exemptionprov;
+	SimpleChannelModeHandler nn;
  public:
-	ModuleNoNickChange() : nn(this)
+	ModuleNoNickChange()
+		: exemptionprov(this)
+		, nn(this, "nonick", 'N')
 	{
 	}
 
-	void init()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		OnRehash(NULL);
-		ServerInstance->Modules->AddService(nn);
-		Implementation eventlist[] = { I_OnUserPreNick, I_On005Numeric, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+		return Version("Provides channel mode +N and extban 'N' which prevents nick changes on the channel", VF_VENDOR);
 	}
 
-	virtual ~ModuleNoNickChange()
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
+		tokens["EXTBAN"].push_back('N');
 	}
 
-	virtual Version GetVersion()
-	{
-		return Version("Provides support for channel mode +N & extban +b N: which prevents nick changes on channel", VF_VENDOR);
-	}
-
-
-	virtual void On005Numeric(std::string &output)
+	ModResult OnUserPreNick(LocalUser* user, const std::string& newnick) CXX11_OVERRIDE
 	{
-		ServerInstance->AddExtBanChar('N');
-	}
-
-	virtual ModResult OnUserPreNick(User* user, const std::string &newnick)
-	{
-		if (!IS_LOCAL(user))
-			return MOD_RES_PASSTHRU;
-
-		// Allow forced nick changes.
-		if (ServerInstance->NICKForced.get(user))
-			return MOD_RES_PASSTHRU;
-
-		for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
+		for (User::ChanList::iterator i = user->chans.begin(); i != user->chans.end(); i++)
 		{
-			Channel* curr = *i;
+			Channel* curr = (*i)->chan;
 
-			ModResult res = ServerInstance->OnCheckExemption(user,curr,"nonick");
+			ModResult res = CheckExemption::Call(exemptionprov, user, curr, "nonick");
 
 			if (res == MOD_RES_ALLOW)
 				continue;
 
-			if (override && IS_OPER(user))
+			if (user->HasPrivPermission("channels/ignore-nonicks"))
 				continue;
 
-			if (!curr->GetExtBanStatus(user, 'N').check(!curr->IsModeSet('N')))
+			if (!curr->GetExtBanStatus(user, 'N').check(!curr->IsModeSet(nn)))
 			{
-				user->WriteNumeric(ERR_CANTCHANGENICK, "%s :Can't change nickname while on %s (+N is set)",
-					user->nick.c_str(), curr->name.c_str());
+				user->WriteNumeric(ERR_CANTCHANGENICK, InspIRCd::Format("Cannot change nickname while on %s (+N is set)",
+					curr->name.c_str()));
 				return MOD_RES_DENY;
 			}
 		}
 
 		return MOD_RES_PASSTHRU;
 	}
-
-	virtual void OnRehash(User* user)
-	{
-		override = ServerInstance->Config->ConfValue("nonicks")->getBool("operoverride", false);
-	}
 };
 
 MODULE_INIT(ModuleNoNickChange)