Fix the cloaking module on C++98 compilers.

[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 fd885cd5814f05e2d08a43d9044b39e9435f86d8..36d9e2a78f019043dcb579b9ea5ae7a8733bd1be 100644 (file)
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -1,69 +1,77 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2015 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013, 2015, 2017, 2019-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2005-2006, 2010 Craig Edwards <brain@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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/>.
  */
 
-#include "inspircd.h"
-
-/* $ModDesc: Forbids users from messaging each other. Users may still message opers and opers may message other opers. */
 
+#include "inspircd.h"
+#include "modules/ctctags.h"
 
-class ModuleRestrictMsg : public Module
+class ModuleRestrictMsg
+       : public Module
+       , public CTCTags::EventListener
 {
-       
- public:
- 
-       ModuleRestrictMsg(InspIRCd* Me)
-               : Module(Me)
+ private:
+       ModResult HandleMessage(User* user, const MessageTarget& target)
        {
-               
-               Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
-       }
-
-
-       virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
-       {
-               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
                        // (2) the recipient is opered
+                       // (3) the recipient is on a ulined server
                        // anything else, blocked.
-                       if (IS_OPER(u) || IS_OPER(user))
-                       {
-                               return 0;
-                       }
-                       user->WriteNumeric(531, "%s %s :You are not permitted to send private messages to this user",user->nick,u->nick);
-                       return 1;
+                       if (u->IsOper() || user->IsOper() || u->server->IsULine())
+                               return MOD_RES_PASSTHRU;
+
+                       user->WriteNumeric(Numerics::CannotSendTo(u, "You cannot send messages to this user."));
+                       return MOD_RES_DENY;
                }
 
                // however, we must allow channel messages...
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+ public:
+       ModuleRestrictMsg()
+               : CTCTags::EventListener(this)
        {
-               return this->OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
        }
 
-       virtual ~ModuleRestrictMsg()
+       ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
        {
+               return HandleMessage(user, target);
        }
-       
-       virtual Version GetVersion()
+
+       ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) CXX11_OVERRIDE
+       {
+               return HandleMessage(user, target);
+       }
+
+       Version GetVersion() CXX11_OVERRIDE
        {
-               return Version(1,2,0,1,VF_VENDOR,API_VERSION);
+               return Version("Prevents users who are not server operators from messaging each other.", VF_VENDOR);
        }
 };