X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonotice.cpp;h=2793a52fa1f0f01f139c9c91311b2bd84fdc3cc2;hb=6f4aee365b5af9a9c6f733be8dbfc3365d15a866;hp=52ddb537dbe60958ea861514407bb143787a1fd7;hpb=638381c529a2f19c699718234d689e54ad459c97;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index 52ddb537d..2793a52fa 100644
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -1,102 +1,78 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/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) 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 */
+#include "inspircd.h"
+#include "modules/exemption.h"
 
-class NoNotice : public ModeHandler
+class ModuleNoNotice : public Module
 {
+	CheckExemption::EventProvider exemptionprov;
+	SimpleChannelModeHandler nt;
  public:
-	NoNotice(InspIRCd* Instance) : ModeHandler(Instance, 'T', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
+	ModuleNoNotice()
+		: exemptionprov(this)
+		, nt(this, "nonotice", 'T')
 	{
-		if (adding)
-		{
-			if (!channel->IsModeSet('T'))
-			{
-				channel->SetMode('T',true);
-				return MODEACTION_ALLOW;
-			}
-		}
-		else
-		{
-			if (channel->IsModeSet('T'))
-			{
-				channel->SetMode('T',false);
-				return MODEACTION_ALLOW;
-			}
-		}
-
-		return MODEACTION_DENY;
 	}
-};
 
-class ModuleNoNotice : public Module
-{
-	
-	NoNotice* nt;
- public:
- 
-	ModuleNoNotice(InspIRCd* Me)
-		: Module(Me)
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
-		
-		nt = new NoNotice(ServerInstance);
-		if (!ServerInstance->Modes->AddMode(nt))
-			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnUserPreNotice };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
+		tokens["EXTBAN"].push_back('T');
 	}
 
-	
-	virtual int 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)))
+		if ((details.type == MSG_NOTICE) && (target.type == MessageTarget::TYPE_CHANNEL) && (IS_LOCAL(user)))
 		{
-			Channel* c = (Channel*)dest;
-			if (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 0;
-				}
-				else if (CHANOPS_EXEMPT(ServerInstance, 'T') && c->GetStatus(user) == STATUS_OP)
-				{
-					// channel ops are exempt if set in conf.
-					return 0;
-				}
-				else
-				{
-					user->WriteNumeric(404, "%s %s :Can't send NOTICE to channel (+T set)",user->nick, c->name);
-					return 1;
-				}
+				user->WriteNumeric(Numerics::CannotSendTo(c, "notices", 'T', "nonotice"));
+				return MOD_RES_DENY;
 			}
 		}
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual ~ModuleNoNotice()
-	{
-		ServerInstance->Modes->DelMode(nt);
-		delete nt;
-	}
-	
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Adds channel mode T (nonotice) which allows channels to block messages sent with the /NOTICE command.", VF_VENDOR);
 	}
 };