/*
* 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-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) 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"
+#include "modules/whois.h"
-class ModuleNamesX : public Module
+class ModuleNamesX
+ : public Module
+ , public Names::EventListener
+ , public Who::EventListener
+ , public Whois::LineEventListener
{
+ private:
Cap::Capability cap;
+
public:
- ModuleNamesX() : cap(this, "multi-prefix")
+ ModuleNamesX()
+ : Names::EventListener(this)
+ , Who::EventListener(this)
+ , Whois::LineEventListener(this)
+ , cap(this, "multi-prefix")
{
}
Version GetVersion() CXX11_OVERRIDE
{
- return Version("Provides the NAMESX (CAP multi-prefix) capability.",VF_VENDOR);
+ return Version("Provides the IRCv3 multi-prefix client 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, std::vector<std::string> ¶meters, 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.
*/
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;
}
- void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, std::string& line) CXX11_OVERRIDE
+ ModResult OnWhoLine(const Who::Request& request, LocalUser* source, User* user, Membership* memb, Numeric::Numeric& numeric) CXX11_OVERRIDE
{
if ((!memb) || (!cap.get(source)))
- return;
-
- // Channel names can contain ":", and ":" as a 'start-of-token' delimiter is
- // only ever valid after whitespace, so... find the actual delimiter first!
- // Thanks to FxChiP for pointing this out.
- std::string::size_type pos = line.find(" :");
- if (pos == std::string::npos || pos == 0)
- return;
- pos--;
- // Don't do anything if the user has no prefixes
- if ((line[pos] == 'H') || (line[pos] == 'G') || (line[pos] == '*'))
- return;
-
- // 352 21DAAAAAB #chan ident localhost insp21.test 21DAAAAAB H@ :0 a
- // pos
+ 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;
+ return MOD_RES_PASSTHRU;
+
+ size_t flag_index;
+ if (!request.GetFieldIndex('f', flag_index))
+ return MOD_RES_PASSTHRU;
+
+ // #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;
+ }
+
+ ModResult OnWhoisLine(Whois::Context& whois, Numeric::Numeric& numeric) CXX11_OVERRIDE
+ {
+ if (numeric.GetNumeric() != RPL_WHOISCHANNELS || !cap.get(whois.GetSource()))
+ return MOD_RES_PASSTHRU;
+
+ // :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)
+ {
+ // The entry is malformed or the user has no privs.
+ newchannels << channel << ' ';
+ continue;
+ }
+
+ Channel* chan = ServerInstance->FindChan(channel.substr(hashpos));
+ if (!chan)
+ {
+ // Should never happen.
+ newchannels << channel << ' ';
+ continue;
+ }
- line.erase(pos, 1);
- line.insert(pos, prefixes);
+ Membership* memb = chan->GetUser(whois.GetTarget());
+ if (!memb)
+ {
+ // Should never happen.
+ newchannels << channel << ' ';
+ continue;
+ }
+
+ newchannels << memb->GetAllPrefixChars() << chan->name << ' ';
+ }
+
+ numeric.GetParams().back() = newchannels.str();
+ return MOD_RES_PASSTHRU;
}
};
projects / user / henk / code / inspircd.git / blobdiff