/*
* InspIRCd -- Internet Relay Chat Daemon
*
- * Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- * Copyright (C) 2006, 2008 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ * Copyright (C) 2013, 2018-2020 Sadie Powell <sadie@witchery.services>
+ * Copyright (C) 2012-2016 Attila Molnar <attilamolnar@hush.com>
+ * Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
* Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- * Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2006, 2008 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
#include "inspircd.h"
#include "modules/cap.h"
+#include "modules/names.h"
#include "modules/who.h"
class ModuleNamesX
: public Module
+ , public Names::EventListener
, public Who::EventListener
{
private:
public:
ModuleNamesX()
- : Who::EventListener(this)
+ : Names::EventListener(this)
+ , Who::EventListener(this)
, cap(this, "multi-prefix")
{
}
Version GetVersion() CXX11_OVERRIDE
{
- return Version("Provides the NAMESX (CAP multi-prefix) capability.",VF_VENDOR);
+ return Version("Provides the NAMESX (CAP multi-prefix) capability", VF_VENDOR);
}
void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
{
- tokens["NAMESX"];
+ // The legacy PROTOCTL system is a wrapper around the cap.
+ dynamic_reference_nocheck<Cap::Manager> capmanager(this, "capmanager");
+ if (capmanager)
+ tokens["NAMESX"];
}
ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE
*/
if (command == "PROTOCTL")
{
- if ((parameters.size()) && (!strcasecmp(parameters[0].c_str(),"NAMESX")))
+ if (!parameters.empty() && irc::equals(parameters[0], "NAMESX"))
{
cap.set(user, true);
return MOD_RES_DENY;
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))
prefixes = memb->GetAllPrefixChars();
return MOD_RES_PASSTHRU;
size_t flag_index;
- if (!request.GetFlagIndex('f', flag_index))
+ if (!request.GetFieldIndex('f', flag_index))
return MOD_RES_PASSTHRU;
// #chan ident localhost insp22.test nick H@ :0 Attila