Some more text fixes and improvements (#1618).

[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 02125c2ae019ff364028f03cc53ee2779aa5916a..f3c206a4492bf17c4b6015f990820e59d91b04ef 100644 (file)
--- a/src/modules/m_commonchans.cpp
+++ b/src/modules/m_commonchans.cpp
@@ -1,6 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2019 Peter Powell <petpow@saberuk.com>
  *   Copyright (C) 2007 Craig Edwards <craigedwards@brainbox.cc>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -18,47 +19,52 @@
 
 
 #include "inspircd.h"
+#include "modules/ctctags.h"
 
-/** 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(ERR_CANTSENDTOUSER, targuser->nick, "You are not permitted to send private messages to this user (+c is set)");
+               return MOD_RES_DENY;
        }
 
-       void init() CXX11_OVERRIDE
+ public:
+       ModuleCommonChans()
+               : CTCTags::EventListener(this)
+               , mode(this, "deaf_commonchan", 'c')
        {
-               ServerInstance->Modules->AddService(pm);
-               ServerInstance->Modules->Attach(I_OnUserPreMessage, this);
        }
 
        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);
+       }
+
+       ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
+       {
+               return HandleMessage(user, target);
        }
 
-       ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
+       ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) CXX11_OVERRIDE
        {
-               if (target_type == TYPE_USER)
-               {
-                       User* t = (User*)dest;
-                       if (!user->IsOper() && (t->IsModeSet(pm)) && (!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);
        }
 };
 
-MODULE_INIT(ModulePrivacyMode)
+MODULE_INIT(ModuleCommonChans)