Fix the cloaking module on C++98 compilers.

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

diff --git a/src/modules/m_uhnames.cpp b/src/modules/m_uhnames.cpp
index ce9c517f49149dbb3c81ac135561f8ce4b4e8d2e..790a9acbcb8b5012716c54bb53bbbc5309496a7e 100644 (file)
--- a/src/modules/m_uhnames.cpp
+++ b/src/modules/m_uhnames.cpp
@@ -1,9 +1,13 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2013, 2018-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012, 2014-2015 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2007 Dennis Friis <peavey@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
@@ -21,27 +25,36 @@
 
 #include "inspircd.h"
 #include "modules/cap.h"
+#include "modules/names.h"
 
-class ModuleUHNames : public Module
+class ModuleUHNames
+       : public Module
+       , public Names::EventListener
 {
+ private:
        Cap::Capability cap;
 
  public:
-       ModuleUHNames() : cap(this, "userhost-in-names")
+       ModuleUHNames()
+               : Names::EventListener(this)
+               , cap(this, "userhost-in-names")
        {
        }
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides the UHNAMES facility.",VF_VENDOR);
+               return Version("Provides the IRCv3 userhost-in-names client capability.", VF_VENDOR);
        }
 
        void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
-               tokens["UHNAMES"];
+               // The legacy PROTOCTL system is a wrapper around the cap.
+               dynamic_reference_nocheck<Cap::Manager> capmanager(this, "capmanager");
+               if (capmanager)
+                       tokens["UHNAMES"];
        }
 
-       ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE
+       ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE
        {
                /* We don't actually create a proper command handler class for PROTOCTL,
                 * because other modules might want to have PROTOCTL hooks too.
@@ -50,7 +63,7 @@ class ModuleUHNames : public Module
                 */
                if (command == "PROTOCTL")
                {
-                       if ((parameters.size()) && (!strcasecmp(parameters[0].c_str(),"UHNAMES")))
+                       if (!parameters.empty() && irc::equals(parameters[0], "UHNAMES"))
                        {
                                cap.set(user, true);
                                return MOD_RES_DENY;
@@ -59,7 +72,7 @@ class ModuleUHNames : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       ModResult OnNamesListItem(User* issuer, Membership* memb, std::string& prefixes, std::string& nick) CXX11_OVERRIDE
+       ModResult OnNamesListItem(LocalUser* issuer, Membership* memb, std::string& prefixes, std::string& nick) CXX11_OVERRIDE
        {
                if (cap.get(issuer))
                        nick = memb->user->GetFullHost();