-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2007-2008 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2007 Dennis Friis <peavey@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"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-
-static const char* dummy = "ON";
-/* $ModDesc: Provides aliases of commands. */
+#include "inspircd.h"
+#include "modules/cap.h"
+#include "modules/names.h"
-class ModuleUHNames : public Module
+class ModuleUHNames
+ : public Module
+ , public Names::EventListener
{
- CUList nl;
- public:
-
- ModuleUHNames(InspIRCd* Me)
- : Module(Me)
- {
- }
+ private:
+ Cap::Capability cap;
- void Implements(char* List)
- {
- List[I_OnSyncUserMetaData] = List[I_OnPreCommand] = List[I_OnUserList] = List[I_On005Numeric] = 1;
- }
-
- virtual ~ModuleUHNames()
- {
- }
-
- void OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
- {
- if ((displayable) && (extname == "UHNAMES"))
- proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, "Enabled");
- }
-
- virtual Version GetVersion()
+ public:
+ ModuleUHNames()
+ : Names::EventListener(this)
+ , cap(this, "userhost-in-names")
{
- return Version(1,1,0,1,VF_VENDOR,API_VERSION);
}
- virtual void On005Numeric(std::string &output)
+ Version GetVersion() CXX11_OVERRIDE
{
- output.append(" UHNAMES");
+ return Version("Provides the UHNAMES (CAP userhost-in-names) capability", VF_VENDOR);
}
- Priority Prioritize()
+ void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
{
- return (Priority)ServerInstance->PriorityBefore("m_namesx.so");
+ // The legacy PROTOCTL system is a wrapper around the cap.
+ dynamic_reference_nocheck<Cap::Manager> capmanager(this, "capmanager");
+ if (capmanager)
+ tokens["UHNAMES"];
}
- virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+ ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE
{
- irc::string c = command.c_str();
/* We don't actually create a proper command handler class for PROTOCTL,
* because other modules might want to have PROTOCTL hooks too.
* Therefore, we just hook its as an unvalidated command therefore we
* can capture it even if it doesnt exist! :-)
*/
- if (c == "PROTOCTL")
+ if (command == "PROTOCTL")
{
- if ((pcnt) && (!strcasecmp(parameters[0],"UHNAMES")))
+ if ((parameters.size()) && (!strcasecmp(parameters[0].c_str(),"UHNAMES")))
{
- user->Extend("UHNAMES",dummy);
- return 1;
+ cap.set(user, true);
+ return MOD_RES_DENY;
}
}
- return 0;
+ return MOD_RES_PASSTHRU;
}
- /* IMPORTANT: This must be prioritized above NAMESX! */
- virtual int OnUserList(userrec* user, chanrec* Ptr, CUList* &ulist)
+ ModResult OnNamesListItem(LocalUser* issuer, Membership* memb, std::string& prefixes, std::string& nick) CXX11_OVERRIDE
{
- if (user->GetExt("UHNAMES"))
- {
- if (!ulist)
- ulist = Ptr->GetUsers();
-
- for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
- i->second = i->first->GetFullHost();
- }
- return 0;
- }
-};
-
+ if (cap.get(issuer))
+ nick = memb->user->GetFullHost();
-class ModuleUHNamesFactory : public ModuleFactory
-{
- public:
- ModuleUHNamesFactory()
- {
- }
-
- ~ModuleUHNamesFactory()
- {
- }
-
- virtual Module * CreateModule(InspIRCd* Me)
- {
- return new ModuleUHNames(Me);
+ return MOD_RES_PASSTHRU;
}
};
-
-extern "C" DllExport void * init_module( void )
-{
- return new ModuleUHNamesFactory;
-}
-
+MODULE_INIT(ModuleUHNames)