X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_commonchans.cpp;h=23a1472c2ac2f387046a4f7d9717e04f13df5d6a;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=4cef930293f8cd29c21132ae9b99020b562bdba9;hpb=b2ac8cc0a6405946a388b80df3be21bc276a61f3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_commonchans.cpp b/src/modules/m_commonchans.cpp
index 4cef93029..23a1472c2 100644
--- a/src/modules/m_commonchans.cpp
+++ b/src/modules/m_commonchans.cpp
@@ -1,7 +1,11 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2007 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2013, 2017, 2019-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 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
@@ -18,34 +22,52 @@
 
 
 #include "inspircd.h"
+#include "modules/ctctags.h"
 
-class ModulePrivacyMode : public Module
+class ModuleCommonChans
+	: public CTCTags::EventListener
+	, public Module
 {
-	SimpleUserModeHandler pm;
+ private:
+	SimpleUserModeHandler mode;
+
+	ModResult HandleMessage(User* user, const MessageTarget& target)
+	{
+		if (target.type != MessageTarget::TYPE_USER)
+			return MOD_RES_PASSTHRU;
+
+		User* targuser = target.Get<User>();
+		if (!targuser->IsModeSet(mode) || user->SharesChannelWith(targuser))
+			return MOD_RES_PASSTHRU;
+
+		if (user->HasPrivPermission("users/ignore-commonchans") || user->server->IsULine())
+			return MOD_RES_PASSTHRU;
+
+		user->WriteNumeric(Numerics::CannotSendTo(targuser, "messages", &mode));
+		return MOD_RES_DENY;
+	}
+
  public:
-	ModulePrivacyMode()
-		: pm(this, "deaf_commonchan", 'c')
+	ModuleCommonChans()
+		: CTCTags::EventListener(this)
+		, mode(this, "deaf_commonchan", 'c')
 	{
 	}
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Adds user mode +c, which if set, users must be on a common channel with you to private message you", VF_VENDOR);
+		return Version("Adds user mode c (deaf_commonchan) which requires users to have a common channel before they can privately message each other.", VF_VENDOR);
 	}
 
 	ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
 	{
-		if (target.type == MessageTarget::TYPE_USER)
-		{
-			User* t = target.Get<User>();
-			if (!user->IsOper() && (t->IsModeSet(pm)) && (!user->server->IsULine()) && !user->SharesChannelWith(t))
-			{
-				user->WriteNumeric(ERR_CANTSENDTOUSER, t->nick, "You are not permitted to send private messages to this user (+c set)");
-				return MOD_RES_DENY;
-			}
-		}
-		return MOD_RES_PASSTHRU;
+		return HandleMessage(user, target);
+	}
+
+	ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) CXX11_OVERRIDE
+	{
+		return HandleMessage(user, target);
 	}
 };
 
-MODULE_INIT(ModulePrivacyMode)
+MODULE_INIT(ModuleCommonChans)