X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonotice.cpp;h=cf8da5f5532bbdc05aec9db6dc9b5eb368a9aef7;hb=e950f568d0f571e9475aa38177486468714de4d3;hp=4aa51ef48bad4c1d093af84ca9df06055c6fe40e;hpb=44f42a13de52c8025942ddab42f51feb36821782;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index 4aa51ef48..cf8da5f55 100644
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -21,8 +21,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for unreal-style channel mode +T */
-
 class NoNotice : public SimpleChannelModeHandler
 {
  public:
@@ -37,30 +35,26 @@ class ModuleNoNotice : public Module
 	ModuleNoNotice()
 		: nt(this)
 	{
-		if (!ServerInstance->Modes->AddMode(&nt))
-			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnUserPreNotice, I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
-	virtual void On005Numeric(std::string &output)
+	void init() CXX11_OVERRIDE
 	{
-		ServerInstance->AddExtBanChar('T');
+		ServerInstance->Modules->AddService(nt);
 	}
 
-	virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
+	{
+		tokens["EXTBAN"].push_back('T');
+	}
+
+	ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
 	{
 		ModResult res;
-		if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
+		if ((msgtype == MSG_NOTICE) && (target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
 		{
 			Channel* c = (Channel*)dest;
-			if (!c->GetExtBanStatus(user, 'T').check(!c->IsModeSet('T')))
+			if (!c->GetExtBanStatus(user, 'T').check(!c->IsModeSet(nt)))
 			{
-				if (ServerInstance->ULine(user->server))
-				{
-					// ulines are exempt.
-					return MOD_RES_PASSTHRU;
-				}
 				res = ServerInstance->OnCheckExemption(user,c,"nonotice");
 				if (res == MOD_RES_ALLOW)
 					return MOD_RES_PASSTHRU;
@@ -74,13 +68,9 @@ class ModuleNoNotice : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	virtual ~ModuleNoNotice()
-	{
-	}
-
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for unreal-style channel mode +T", VF_VENDOR);
+		return Version("Provides channel mode +T to block notices to the channel", VF_VENDOR);
 	}
 };