X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonotice.cpp;h=fe04f3204142ddcad4d4d554848fa7330215155a;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=fe1e0a46d33690162dc7c2da61ab08379e52135b;hpb=f8ccaed31d68661d16eae1a412b337af09de111b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index fe1e0a46d..fe04f3204 100644
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -1,78 +1,78 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
+ *   Copyright (C) 2013, 2017, 2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012 Shawn Smith <ShawnSmith0828@gmail.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2004, 2006, 2010 Craig Edwards <brain@inspircd.org>
  *
- * 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(Module* Creator) : SimpleChannelModeHandler(Creator, "nonotice", 'T') { }
-};
+#include "inspircd.h"
+#include "modules/exemption.h"
 
 class ModuleNoNotice : public Module
 {
-	NoNotice nt;
+	CheckExemption::EventProvider exemptionprov;
+	SimpleChannelModeHandler nt;
  public:
 
 	ModuleNoNotice()
-		: nt(this)
+		: 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
 	{
-		ModResult res;
-		if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
+		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>();
+
+			ModResult res = CheckExemption::Call(exemptionprov, user, c, "nonotice");
+			if (res == MOD_RES_ALLOW)
+				return MOD_RES_PASSTHRU;
+
+			if (c->IsModeSet(nt))
+			{
+				user->WriteNumeric(Numerics::CannotSendTo(c, "notices", &nt));
+				return MOD_RES_DENY;
+			}
+
+			if (c->GetExtBanStatus(user, 'T') == MOD_RES_DENY)
 			{
-				if (ServerInstance->ULine(user->server))
-				{
-					// ulines are exempt.
-					return MOD_RES_PASSTHRU;
-				}
-				FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (user,c,"nonotice"));
-				if (res == MOD_RES_ALLOW)
-					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());
-					return MOD_RES_DENY;
-				}
+				user->WriteNumeric(Numerics::CannotSendTo(c, "notices", 'T', "nonotice"));
+				return MOD_RES_DENY;
 			}
 		}
 		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("Adds channel mode T (nonotice) which allows channels to block messages sent with the /NOTICE command.", VF_VENDOR);
 	}
 };