X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_restrictmsg.cpp;h=b018bc6ea27cccbe47ffceafafb15163f3f2a762;hb=7ba36f5348a6cca1c0da820c60ae17063f3cdad5;hp=a419a94231169149292d2ca067a142f51ee3dfef;hpb=9fc9227cf51585dd2e44c2fcd0014c8da8f8739f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_restrictmsg.cpp b/src/modules/m_restrictmsg.cpp
index a419a9423..b018bc6ea 100644
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -1,98 +1,78 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *   Copyright (C) 2015 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013, 2015, 2017, 2019-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   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 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 <stdio.h>
-#include <string>
-#include <vector>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
-/* $ModDesc: Forbids users from messaging each other. Users may still message opers and opers may message other opers. */
+#include "inspircd.h"
+#include "modules/ctctags.h"
 
-
-class ModuleRestrictMsg : public Module
+class ModuleRestrictMsg
+	: public Module
+	, public CTCTags::EventListener
 {
-	Server *Srv;
- public:
- 
-	ModuleRestrictMsg()
+ private:
+	ModResult HandleMessage(User* user, const MessageTarget& target)
 	{
-		Srv = new Server;
-	}
-
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text)
-	{
-		if (target_type == TYPE_USER)
+		if ((target.type == MessageTarget::TYPE_USER) && (IS_LOCAL(user)))
 		{
-			userrec* u = (userrec*)dest;
-			if ((strchr(u->modes,'o')) || (strchr(user->modes,'o')))
-			{
-				// message allowed if:
-				// (1) the sender is opered
-				// (2) the recipient is opered
-				// (3) both are opered
-				// anything else, blocked.
-				return 0;
-			}
-			WriteServ(user->fd,"531 %s %s :You are not permitted to send private messages to this user",user->nick,u->nick);
-			return 1;
+			User* u = target.Get<User>();
+
+			// message allowed if:
+			// (1) the sender is opered
+			// (2) the recipient is opered
+			// (3) the recipient is on a ulined server
+			// anything else, blocked.
+			if (u->IsOper() || user->IsOper() || u->server->IsULine())
+				return MOD_RES_PASSTHRU;
+
+			user->WriteNumeric(Numerics::CannotSendTo(u, "You cannot send messages to this user."));
+			return MOD_RES_DENY;
 		}
+
 		// however, we must allow channel messages...
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text)
+ public:
+	ModuleRestrictMsg()
+		: CTCTags::EventListener(this)
 	{
-		return this->OnUserPreMessage(user,dest,target_type,text);
 	}
 
-	virtual ~ModuleRestrictMsg()
+	ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
 	{
-		delete Srv;
+		return HandleMessage(user, target);
 	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,0,0);
-	}
-};
 
-
-class ModuleRestrictMsgFactory : public ModuleFactory
-{
- public:
-	ModuleRestrictMsgFactory()
+	ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) CXX11_OVERRIDE
 	{
+		return HandleMessage(user, target);
 	}
-	
-	~ModuleRestrictMsgFactory()
-	{
-	}
-	
-	virtual Module * CreateModule()
+
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return new ModuleRestrictMsg;
+		return Version("Prevents users who are not server operators from messaging each other.", VF_VENDOR);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleRestrictMsgFactory;
-}
-
+MODULE_INIT(ModuleRestrictMsg)