X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_namesx.cpp;h=82d311773c2b52ba0d7ce14b50140e65efe868dd;hb=ccd4c11ea1a43d079eaae9708482ef4a9148796c;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..82d311773 100644 --- a/src/modules/m_namesx.cpp +++ b/src/modules/m_namesx.cpp @@ -1,122 +1,130 @@ -/* +------------------------------------+ - * | 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) 2009 Daniel De Graaf + * Copyright (C) 2006, 2008 Craig Edwards + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2007 Robin Burchell * - * 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. */ +/* $ModDesc: Provides the NAMESX (CAP multi-prefix) capability. */ class ModuleNamesX : public Module { public: - - ModuleNamesX(InspIRCd* Me) - : Module(Me) + GenericCap cap; + ModuleNamesX() : cap(this, "multi-prefix") { - Implementation eventlist[] = { I_OnSyncUserMetaData, I_OnPreCommand, I_OnNamesListItem, I_On005Numeric, I_OnEvent }; - ServerInstance->Modules->Attach(eventlist, this, 5); } - - virtual ~ModuleNamesX() + void init() { + Implementation eventlist[] = { I_OnPreCommand, I_OnNamesListItem, I_On005Numeric, I_OnEvent, I_OnSendWhoLine }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); } - void OnSyncUserMetaData(User* user, Module* proto,void* opaque, const std::string &extname, bool displayable) + + ~ModuleNamesX() { - if ((displayable) && (extname == "NAMESX")) - proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, "Enabled"); } - virtual Version GetVersion() + Version GetVersion() { - return Version(1,1,0,1,VF_VENDOR,API_VERSION); + return Version("Provides the NAMESX (CAP multi-prefix) capability.",VF_VENDOR); } - virtual void On005Numeric(std::string &output) + void On005Numeric(std::string &output) { output.append(" 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, std::vector ¶meters, LocalUser *user, bool validated, const std::string &original_line) { - 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.size()) && (!strcasecmp(parameters[0].c_str(),"NAMESX"))) { - user->Extend("NAMESX",dummy); - return 1; + cap.ext.set(user, 1); + 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) + void OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick) { - if (!issuer->GetExt("NAMESX")) + if (!cap.ext.get(issuer)) return; /* Some module hid this from being displayed, dont bother */ if (nick.empty()) return; - prefixes = channel->GetAllPrefixChars(user); + prefixes = memb->chan->GetAllPrefixChars(memb->user); } - virtual void OnEvent(Event *ev) + void OnSendWhoLine(User* source, const std::vector& params, User* user, std::string& line) { - if (ev->GetEventID() == "cap_req") - { - CapData *data = (CapData *) ev->GetData(); + if (!cap.ext.get(source)) + return; - 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); - } - } + // 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; - if (ev->GetEventID() == "cap_ls") - { - CapData *data = (CapData *) ev->GetData(); - data->wanted.push_back("multi-prefix"); - } + // 352 21DAAAAAB #chan ident localhost insp21.test 21DAAAAAB H@ :0 a + // a b pos + std::string::size_type a = 4 + source->nick.length() + 1; + std::string::size_type b = line.find(' ', a); + if (b == std::string::npos) + return; - if (ev->GetEventID() == "cap_list") - { - CapData *data = (CapData *) ev->GetData(); + // Try to find this channel + std::string channame = line.substr(a, b-a); + Channel* chan = ServerInstance->FindChan(channame); + if (!chan) + return; - if (data->user->GetExt("NAMESX")) - data->wanted.push_back("multi-prefix"); - } + // Don't do anything if the user has only one prefix + std::string prefixes = chan->GetAllPrefixChars(user); + if (prefixes.length() <= 1) + return; - if (ev->GetEventID() == "cap_clear") - { - CapData *data = (CapData *) ev->GetData(); - data->ack.push_back("-multi-prefix"); - data->user->Shrink("NAMESX"); - } + line.erase(pos, 1); + line.insert(pos, prefixes); + } + + void OnEvent(Event& ev) + { + cap.HandleEvent(ev); } };