X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonotice.cpp;h=730b0271693dffc199aa36e352816816d3f21df1;hb=e59cb85871f75b7603c63c6cd274d57536cf6794;hp=fab52ca2e1426f5cea8a0b8266516364e850e456;hpb=91df762e93212958db487d8517addba1a63a4ddd;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index fab52ca2e..730b02716 100644
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -1,65 +1,58 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   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 program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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 "inspircd.h"
-
-/* $ModDesc: Provides support for unreal-style channel mode +T */
 
-class NoNotice : public SimpleChannelModeHandler
-{
- public:
-	NoNotice(InspIRCd* Instance, Module* Creator) : SimpleChannelModeHandler(Instance, Creator, 'T') { }
-};
+#include "inspircd.h"
+#include "modules/exemption.h"
 
 class ModuleNoNotice : public Module
 {
-	NoNotice nt;
+	CheckExemption::EventProvider exemptionprov;
+	SimpleChannelModeHandler nt;
  public:
 
-	ModuleNoNotice(InspIRCd* Me)
-		: Module(Me), nt(Me, this)
+	ModuleNoNotice()
+		: exemptionprov(this)
+		, nt(this, "nonotice", 'T')
 	{
-		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 On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
-		ServerInstance->AddExtBanChar('T');
+		tokens["EXTBAN"].push_back('T');
 	}
 
-	virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
 	{
-		if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
+		ModResult res;
+		if ((details.type == MSG_NOTICE) && (target.type == MessageTarget::TYPE_CHANNEL) && (IS_LOCAL(user)))
 		{
-			Channel* c = (Channel*)dest;
-			if (!c->GetExtBanStatus(user, 'T').check(!c->IsModeSet('T')))
+			Channel* c = target.Get<Channel>();
+			if (!c->GetExtBanStatus(user, 'T').check(!c->IsModeSet(nt)))
 			{
-				if (ServerInstance->ULine(user->server))
-				{
-					// ulines are exempt.
+				res = CheckExemption::Call(exemptionprov, user, c, "nonotice");
+				if (res == MOD_RES_ALLOW)
 					return MOD_RES_PASSTHRU;
-				}
-				else if (CHANOPS_EXEMPT(ServerInstance, 'T') && c->GetPrefixValue(user) == OP_VALUE)
-				{
-					// channel ops are exempt if set in conf.
-					return MOD_RES_PASSTHRU;
-				}
 				else
 				{
-					user->WriteNumeric(ERR_CANNOTSENDTOCHAN, "%s %s :Can't send NOTICE to channel (+T set)",user->nick.c_str(), c->name.c_str());
+					user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, "Can't send NOTICE to channel (+T is set)");
 					return MOD_RES_DENY;
 				}
 			}
@@ -67,14 +60,9 @@ class ModuleNoNotice : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	virtual ~ModuleNoNotice()
-	{
-		ServerInstance->Modes->DelMode(&nt);
-	}
-
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides channel mode +T to block notices to the channel", VF_VENDOR);
 	}
 };