-/* +------------------------------------+
- * | 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) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ * Copyright (C) 2013, 2018-2021 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) 2006, 2008 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"
-#include "m_cap.h"
-
-static const char* dummy = "ON";
-
-/* $ModDesc: Provides aliases of commands. */
-class ModuleNamesX : public Module
+#include "inspircd.h"
+#include "modules/cap.h"
+#include "modules/names.h"
+#include "modules/who.h"
+#include "modules/whois.h"
+
+class ModuleNamesX
+ : public Module
+ , public Names::EventListener
+ , public Who::EventListener
+ , public Whois::LineEventListener
{
- public:
-
- ModuleNamesX(InspIRCd* Me)
- : Module(Me)
- {
- Implementation eventlist[] = { I_OnSyncUserMetaData, I_OnPreCommand, I_OnNamesListItem, I_On005Numeric, I_OnEvent };
- ServerInstance->Modules->Attach(eventlist, this, 5);
- }
+ private:
+ Cap::Capability cap;
-
- virtual ~ModuleNamesX()
- {
- }
-
- void OnSyncUserMetaData(User* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
+ public:
+ ModuleNamesX()
+ : Names::EventListener(this)
+ , Who::EventListener(this)
+ , Whois::LineEventListener(this)
+ , cap(this, "multi-prefix")
{
- if ((displayable) && (extname == "NAMESX"))
- proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, "Enabled");
}
- virtual Version GetVersion()
+ Version GetVersion() CXX11_OVERRIDE
{
- return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+ return Version("Provides the IRCv3 multi-prefix client capability.", VF_VENDOR);
}
- virtual void On005Numeric(std::string &output)
+ void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
{
- output.append(" NAMESX");
+ // The legacy PROTOCTL system is a wrapper around the cap.
+ dynamic_reference_nocheck<Cap::Manager> capmanager(this, "capmanager");
+ if (capmanager)
+ tokens["NAMESX"];
}
- virtual int OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, User *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],"NAMESX")))
+ if (!parameters.empty() && irc::equals(parameters[0], "NAMESX"))
{
- user->Extend("NAMESX",dummy);
- return 1;
+ cap.set(user, true);
+ return MOD_RES_DENY;
}
}
- return 0;
+ return MOD_RES_PASSTHRU;
+ }
+
+ 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;
}
- virtual void OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick)
+ ModResult OnWhoLine(const Who::Request& request, LocalUser* source, User* user, Membership* memb, Numeric::Numeric& numeric) CXX11_OVERRIDE
{
- if (!issuer->GetExt("NAMESX"))
- return;
+ if ((!memb) || (!cap.get(source)))
+ return MOD_RES_PASSTHRU;
+
+ // Don't do anything if the user has only one prefix
+ std::string prefixes = memb->GetAllPrefixChars();
+ if (prefixes.length() <= 1)
+ return MOD_RES_PASSTHRU;
- /* Some module hid this from being displayed, dont bother */
- if (nick.empty())
- return;
+ size_t flag_index;
+ if (!request.GetFieldIndex('f', flag_index))
+ return MOD_RES_PASSTHRU;
- prefixes = channel->GetAllPrefixChars(user);
+ // #chan ident localhost insp22.test nick H@ :0 Attila
+ if (numeric.GetParams().size() <= flag_index)
+ return MOD_RES_PASSTHRU;
+
+ numeric.GetParams()[flag_index].append(prefixes, 1, std::string::npos);
+ return MOD_RES_PASSTHRU;
}
- virtual void OnEvent(Event *ev)
+ ModResult OnWhoisLine(Whois::Context& whois, Numeric::Numeric& numeric) CXX11_OVERRIDE
{
- if (ev->GetEventID() == "cap_req")
- {
- CapData *data = (CapData *) ev->GetData();
+ if (numeric.GetNumeric() != RPL_WHOISCHANNELS || !cap.get(whois.GetSource()))
+ return MOD_RES_PASSTHRU;
- std::vector<std::string>::iterator it;
- if ((it = std::find(data->wanted.begin(), data->wanted.end(), "multi-prefix")) != data->wanted.end())
+ // :testnet.inspircd.org 319 test Sadie :#test ~#inspircd
+ if (numeric.GetParams().size() < 2 || numeric.GetParams().back().empty())
+ return MOD_RES_PASSTHRU;
+
+ std::stringstream newchannels;
+ irc::spacesepstream channelstream(numeric.GetParams().back());
+ for (std::string channel; channelstream.GetToken(channel); )
+ {
+ size_t hashpos = channel.find('#');
+ if (!hashpos || hashpos == std::string::npos)
{
- // we can handle this, so ACK it, and remove it from the wanted list
- data->ack.push_back(*it);
- data->wanted.erase(it);
- data->user->Extend("NAMESX",dummy);
+ // The entry is malformed or the user has no privs.
+ newchannels << channel << ' ';
+ continue;
}
- }
- if (ev->GetEventID() == "cap_ls")
- {
- CapData *data = (CapData *) ev->GetData();
- data->wanted.push_back("multi-prefix");
- }
+ Channel* chan = ServerInstance->FindChan(channel.substr(hashpos));
+ if (!chan)
+ {
+ // Should never happen.
+ newchannels << channel << ' ';
+ continue;
+ }
- if (ev->GetEventID() == "cap_list")
- {
- CapData *data = (CapData *) ev->GetData();
+ Membership* memb = chan->GetUser(whois.GetTarget());
+ if (!memb)
+ {
+ // Should never happen.
+ newchannels << channel << ' ';
+ continue;
+ }
- if (data->user->GetExt("NAMESX"))
- data->wanted.push_back("multi-prefix");
+ newchannels << memb->GetAllPrefixChars() << chan->name << ' ';
}
- if (ev->GetEventID() == "cap_clear")
- {
- CapData *data = (CapData *) ev->GetData();
- data->ack.push_back("-multi-prefix");
- data->user->Shrink("NAMESX");
- }
+ numeric.GetParams().back() = newchannels.str();
+ return MOD_RES_PASSTHRU;
}
};
projects / user / henk / code / inspircd.git / blobdiff