X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_restrictmsg.cpp;h=36d9e2a78f019043dcb579b9ea5ae7a8733bd1be;hb=HEAD;hp=e4dbb1d434502a6785065aeccde4164556e3efad;hpb=7a67685bcb863b0d4199715e86697fee423596c2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_restrictmsg.cpp b/src/modules/m_restrictmsg.cpp
index e4dbb1d43..36d9e2a78 100644
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -1,9 +1,13 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   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) 2007 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2005 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2005-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
@@ -20,32 +24,28 @@
 
 
 #include "inspircd.h"
+#include "modules/ctctags.h"
 
-/* $ModDesc: Forbids users from messaging each other. Users may still message opers and opers may message other opers. */
-
-class ModuleRestrictMsg : public Module
+class ModuleRestrictMsg
+	: public Module
+	, public CTCTags::EventListener
 {
- public:
-	void init() CXX11_OVERRIDE
-	{
-		ServerInstance->Modules->Attach(I_OnUserPreMessage, this);
-	}
-
-	ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
+ private:
+	ModResult HandleMessage(User* user, const MessageTarget& target)
 	{
-		if ((target_type == TYPE_USER) && (IS_LOCAL(user)))
+		if ((target.type == MessageTarget::TYPE_USER) && (IS_LOCAL(user)))
 		{
-			User* u = (User*)dest;
+			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())
-			{
+			if (u->IsOper() || user->IsOper() || u->server->IsULine())
 				return MOD_RES_PASSTHRU;
-			}
-			user->WriteNumeric(ERR_CANTSENDTOUSER, "%s %s :You are not permitted to send private messages to this user",user->nick.c_str(),u->nick.c_str());
+
+			user->WriteNumeric(Numerics::CannotSendTo(u, "You cannot send messages to this user."));
 			return MOD_RES_DENY;
 		}
 
@@ -53,9 +53,25 @@ class ModuleRestrictMsg : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
+ public:
+	ModuleRestrictMsg()
+		: CTCTags::EventListener(this)
+	{
+	}
+
+	ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
+	{
+		return HandleMessage(user, target);
+	}
+
+	ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) CXX11_OVERRIDE
+	{
+		return HandleMessage(user, target);
+	}
+
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Forbids users from messaging each other. Users may still message opers and opers may message other opers.",VF_VENDOR);
+		return Version("Prevents users who are not server operators from messaging each other.", VF_VENDOR);
 	}
 };