Some more text fixes and improvements (#1618).

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

diff --git a/src/modules/m_restrictmsg.cpp b/src/modules/m_restrictmsg.cpp
index 279775d480570621bb58a9f3464c390271a0d0b7..75d3d905c8954211598180db6a3d3935f2a6554d 100644 (file)
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -20,15 +20,18 @@
 
 
 #include "inspircd.h"
+#include "modules/ctctags.h"
 
-class ModuleRestrictMsg : public Module
+class ModuleRestrictMsg
+       : public Module
+       , public CTCTags::EventListener
 {
- public:
-       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
@@ -39,7 +42,7 @@ class ModuleRestrictMsg : public Module
                        {
                                return MOD_RES_PASSTHRU;
                        }
-                       user->WriteNumeric(ERR_CANTSENDTOUSER, "%s :You are not permitted to send private messages to this user", u->nick.c_str());
+                       user->WriteNumeric(ERR_CANTSENDTOUSER, u->nick, "You are not permitted to send private messages to this user");
                        return MOD_RES_DENY;
                }
 
@@ -47,9 +50,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("Forbids users from messaging each other, but users may still message opers and opers may message other opers", VF_VENDOR);
        }
 };