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 d8c54d30ab920f07b8e832550daa06b8b25fab18..75d3d905c8954211598180db6a3d3935f2a6554d 100644 (file)
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -1,107 +1,75 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *   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>
  *
- * ---------------------------------------------------
+ * 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
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-using namespace std;
 
-#include <stdio.h>
-#include <string>
-#include <vector>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
 #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
 {
-       Server *Srv;
- public:
- 
-       ModuleRestrictMsg(InspIRCd* Me)
-               : Module::Module(Me)
+ private:
+       ModResult HandleMessage(User* user, const MessageTarget& target)
        {
-               
-       }
-
-       void Implements(char* List)
-       {
-               List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
-       }
-
-       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
-       {
-               if (target_type == TYPE_USER)
+               if ((target.type == MessageTarget::TYPE_USER) && (IS_LOCAL(user)))
                {
-                       userrec* u = (userrec*)dest;
-                       if (*u->oper || *user->oper)
+                       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() || u->server->IsULine())
                        {
-                               // message allowed if:
-                               // (1) the sender is opered
-                               // (2) the recipient is opered
-                               // (3) both are opered
-                               // anything else, blocked.
-                               return 0;
+                               return MOD_RES_PASSTHRU;
                        }
-                       user->WriteServ("531 %s %s :You are not permitted to send private messages to this user",user->nick,u->nick);
-                       return 1;
+                       user->WriteNumeric(ERR_CANTSENDTOUSER, u->nick, "You are not permitted to send private messages to this user");
+                       return MOD_RES_DENY;
                }
+
                // however, we must allow channel messages...
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
+ public:
+       ModuleRestrictMsg()
+               : CTCTags::EventListener(this)
        {
-               return this->OnUserPreMessage(user,dest,target_type,text,status);
        }
 
-       virtual ~ModuleRestrictMsg()
-       {
-       }
-       
-       virtual Version GetVersion()
+       ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
        {
-               return Version(1,0,0,1,VF_VENDOR);
+               return HandleMessage(user, target);
        }
-};
 
-
-class ModuleRestrictMsgFactory : public ModuleFactory
-{
- public:
-       ModuleRestrictMsgFactory()
+       ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) CXX11_OVERRIDE
        {
+               return HandleMessage(user, target);
        }
-       
-       ~ModuleRestrictMsgFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
+
+       Version GetVersion() CXX11_OVERRIDE
        {
-               return new ModuleRestrictMsg(Me);
+               return Version("Forbids users from messaging each other, but users may still message opers and opers may message other opers", VF_VENDOR);
        }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleRestrictMsgFactory;
-}
-
+MODULE_INIT(ModuleRestrictMsg)