X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_namesx.cpp;h=4f93da21ac16f4e341f0eb400bff98520155a76c;hb=0a6b1e1a7de92e078a98f0b955d2624e5b85e4c1;hp=3ce1b00eb10c5fc80a60a6adcb75d8b05e582b69;hpb=9855300460b2e695b44646897811cc3f28428fa0;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp index 3ce1b00eb..4f93da21a 100644 --- a/src/modules/m_namesx.cpp +++ b/src/modules/m_namesx.cpp @@ -1,122 +1,108 @@ -/* +------------------------------------+ - * | 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 + * Copyright (C) 2013, 2018-2020 Sadie Powell + * Copyright (C) 2012-2016 Attila Molnar + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006, 2008 Craig Edwards * - * 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 . */ -#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" + +class ModuleNamesX + : public Module + , public Names::EventListener + , public Who::EventListener { - public: - - ModuleNamesX(InspIRCd* Me) - : Module(Me) - { - Implementation eventlist[] = { I_OnSyncUserMetaData, I_OnPreCommand, I_OnNamesListItem, I_On005Numeric, I_OnEvent }; - ServerInstance->Modules->Attach(eventlist, this, 5); - } - - - virtual ~ModuleNamesX() - { - } + private: + Cap::Capability cap; - void OnSyncUserMetaData(User* user, Module* proto,void* opaque, const std::string &extname, bool displayable) + public: + ModuleNamesX() + : Names::EventListener(this) + , Who::EventListener(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& tokens) CXX11_OVERRIDE { - output.append(" NAMESX"); + // The legacy PROTOCTL system is a wrapper around the cap. + dynamic_reference_nocheck 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; } - virtual void OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick) + ModResult OnNamesListItem(LocalUser* issuer, Membership* memb, std::string& prefixes, std::string& nick) CXX11_OVERRIDE { - if (!issuer->GetExt("NAMESX")) - return; + if (cap.get(issuer)) + prefixes = memb->GetAllPrefixChars(); - /* Some module hid this from being displayed, dont bother */ - if (nick.empty()) - return; - - prefixes = channel->GetAllPrefixChars(user); + return MOD_RES_PASSTHRU; } - virtual void OnEvent(Event *ev) + ModResult OnWhoLine(const Who::Request& request, LocalUser* source, User* user, Membership* memb, Numeric::Numeric& numeric) CXX11_OVERRIDE { - if (ev->GetEventID() == "cap_req") - { - CapData *data = (CapData *) ev->GetData(); - - std::vector::iterator it; - if ((it = std::find(data->wanted.begin(), data->wanted.end(), "multi-prefix")) != data->wanted.end()) - { - // 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); - } - } + if ((!memb) || (!cap.get(source))) + return MOD_RES_PASSTHRU; - if (ev->GetEventID() == "cap_ls") - { - CapData *data = (CapData *) ev->GetData(); - data->wanted.push_back("multi-prefix"); - } + // Don't do anything if the user has only one prefix + std::string prefixes = memb->GetAllPrefixChars(); + if (prefixes.length() <= 1) + return MOD_RES_PASSTHRU; - if (ev->GetEventID() == "cap_list") - { - CapData *data = (CapData *) ev->GetData(); + size_t flag_index; + if (!request.GetFieldIndex('f', flag_index)) + return MOD_RES_PASSTHRU; - if (data->user->GetExt("NAMESX")) - data->wanted.push_back("multi-prefix"); - } + // #chan ident localhost insp22.test nick H@ :0 Attila + if (numeric.GetParams().size() <= flag_index) + return MOD_RES_PASSTHRU; - if (ev->GetEventID() == "cap_clear") - { - CapData *data = (CapData *) ev->GetData(); - data->ack.push_back("-multi-prefix"); - data->user->Shrink("NAMESX"); - } + numeric.GetParams()[flag_index].append(prefixes, 1, std::string::npos); + return MOD_RES_PASSTHRU; } };