X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonotice.cpp;h=77b0c9aa3f1a5ce68540763c3389a0633bc6a239;hb=3d0d64933da3d37866fadfa042e34a1125315db6;hp=23c529bfccd60b5254f1c49d9bfd1e0a291ed4b2;hpb=5587692487cd8311fc983267730ec9bb53b2ef0e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index 23c529bfc..77b0c9aa3 100644
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -1,77 +1,69 @@
-#include <stdio.h>
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2004, 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
-/* $ModDesc: Provides support for unreal-style channel mode +T */
+#include "inspircd.h"
+#include "modules/exemption.h"
 
 class ModuleNoNotice : public Module
 {
-	Server *Srv;
+	CheckExemption::EventProvider exemptionprov;
+	SimpleChannelModeHandler nt;
  public:
- 
+
 	ModuleNoNotice()
+		: exemptionprov(this)
+		, nt(this, "nonotice", 'T')
+	{
+	}
+
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
-		Srv = new Server;
-		Srv->AddExtendedMode('T',MT_CHANNEL,false,0,0);
+		tokens["EXTBAN"].push_back('T');
 	}
-	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string text)
+
+	ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
 	{
-		if (target_type == TYPE_CHANNEL)
+		ModResult res;
+		if ((details.type == MSG_NOTICE) && (target.type == MessageTarget::TYPE_CHANNEL) && (IS_LOCAL(user)))
 		{
-			chanrec* c = (chanrec*)dest;
-			if (c->IsCustomModeSet('T'))
+			Channel* c = target.Get<Channel>();
+			if (!c->GetExtBanStatus(user, 'T').check(!c->IsModeSet(nt)))
 			{
-				if ((Srv->ChanMode(user,c) == "@") || (Srv->ChanMode(user,c) == "%"))
-				{
-					// ops and halfops can still /NOTICE the channel
-					return 0;
-				}
+				res = CheckExemption::Call(exemptionprov, user, c, "nonotice");
+				if (res == MOD_RES_ALLOW)
+					return MOD_RES_PASSTHRU;
 				else
 				{
-					WriteServ(user->fd,"404 %s %s :Can't send NOTICE to channel (+T set)",user->nick, c->name);
-					return 1;
+					user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, "Can't send NOTICE to channel (+T set)");
+					return MOD_RES_DENY;
 				}
 			}
 		}
-		return 0;
-	}
-	
-	virtual ~ModuleNoNotice()
-	{
-		delete Srv;
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,0);
+		return MOD_RES_PASSTHRU;
 	}
-};
-
 
-class ModuleNoNoticeFactory : public ModuleFactory
-{
- public:
-	ModuleNoNoticeFactory()
-	{
-	}
-	
-	~ModuleNoNoticeFactory()
+	Version GetVersion() CXX11_OVERRIDE
 	{
+		return Version("Provides channel mode +T to block notices to the channel", VF_VENDOR);
 	}
-	
-	virtual Module * CreateModule()
-	{
-		return new ModuleNoNotice;
-	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleNoNoticeFactory;
-}
-
+MODULE_INIT(ModuleNoNotice)