Add the Numerics::CannotSendTo class and switch stuff to use it.

[user/henk/code/inspircd.git] / src / modules / m_commonchans.cpp

diff --git a/src/modules/m_commonchans.cpp b/src/modules/m_commonchans.cpp
index b7aa683e200aa2204920500aaff98bf215e17e12..1e9ca3fee3bf347c6ea0a6f4cf5ab15b102c909b 100644 (file)
--- 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 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,55 +22,52 @@
 
 
 #include "inspircd.h"
+#include "modules/ctctags.h"
 
-/* $ModDesc: Adds user mode +c, which if set, users must be on a common channel with you to private message you */
-
-/** Handles user mode +c
- */
-class PrivacyMode : public SimpleUserModeHandler
+class ModuleCommonChans
+       : public CTCTags::EventListener
+       , public Module
 {
- public:
-       PrivacyMode(Module* Creator) : SimpleUserModeHandler(Creator, "deaf_commonchan", 'c') { }
-};
+ private:
+       SimpleUserModeHandler mode;
 
-class ModulePrivacyMode : public Module
-{
-       PrivacyMode pm;
- public:
-       ModulePrivacyMode() : pm(this)
+       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;
        }
 
-       void init()
+ public:
+       ModuleCommonChans()
+               : CTCTags::EventListener(this)
+               , mode(this, "deaf_commonchan", 'c')
        {
-               ServerInstance->Modules->AddService(pm);
-               Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice };
-               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
-       virtual Version GetVersion()
+       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("Provides user mode +c, requires users to share a common channel with you to private message you", VF_VENDOR);
        }
 
-       virtual ModResult OnUserPreMessage(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_USER)
-               {
-                       User* t = (User*)dest;
-                       if (!IS_OPER(user) && (t->IsModeSet('c')) && (!ServerInstance->ULine(user->server)) && !user->SharesChannelWith(t))
-                       {
-                               user->WriteNumeric(ERR_CANTSENDTOUSER, "%s %s :You are not permitted to send private messages to this user (+c set)", user->nick.c_str(), t->nick.c_str());
-                               return MOD_RES_DENY;
-                       }
-               }
-               return MOD_RES_PASSTHRU;
+               return HandleMessage(user, target);
        }
 
-       virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) CXX11_OVERRIDE
        {
-               return OnUserPreMessage(user, dest, target_type, text, status, exempt_list);
+               return HandleMessage(user, target);
        }
 };
 
-MODULE_INIT(ModulePrivacyMode)
+MODULE_INIT(ModuleCommonChans)