X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_namesx.cpp;h=c906322bf529967fba09f4413bc0e0fef0b8afb3;hb=0b63ccd0b5cb26883d6becb196fb98e4f95d0397;hp=fa012564c8c486f77d051be9000427b470555286;hpb=3f546994609ed717a63222cb16c5359a09ebff35;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp index fa012564c..c906322bf 100644 --- a/src/modules/m_namesx.cpp +++ b/src/modules/m_namesx.cpp @@ -1,127 +1,99 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2007 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 "users.h" -#include "channels.h" -#include "modules.h" - -static const char* dummy = "ON"; -/* $ModDesc: Provides aliases of commands. */ +#include "inspircd.h" +#include "modules/cap.h" class ModuleNamesX : public Module { + Cap::Capability cap; public: - - ModuleNamesX(InspIRCd* Me) - : Module(Me) - { - } - - void Implements(char* List) - { - List[I_OnSyncUserMetaData] = List[I_OnPreCommand] = List[I_OnUserList] = List[I_On005Numeric] = 1; - } - - virtual ~ModuleNamesX() - { - } - - void OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname, bool displayable) + ModuleNamesX() : 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 NAMESX (CAP multi-prefix) capability.",VF_VENDOR); } - virtual void On005Numeric(std::string &output) + void On005Numeric(std::map& tokens) CXX11_OVERRIDE { - output.append(" NAMESX"); + tokens["NAMESX"]; } - virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *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) 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.size()) && (!strcasecmp(parameters[0].c_str(),"NAMESX"))) { - user->Extend("NAMESX",dummy); - return 1; + cap.set(user, true); + return MOD_RES_DENY; } } - return 0; + return MOD_RES_PASSTHRU; } - virtual int OnUserList(userrec* user, chanrec* Ptr, CUList* &ulist) + ModResult OnNamesListItem(User* issuer, Membership* memb, std::string& prefixes, std::string& nick) CXX11_OVERRIDE { - if (user->GetExt("NAMESX")) - { - char list[MAXBUF]; - size_t dlen, curlen; - dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, Ptr->name); - int numusers = 0; - char* ptr = list + dlen; - - if (!ulist) - ulist = Ptr->GetUsers(); + if (cap.get(issuer)) + prefixes = memb->GetAllPrefixChars(); - bool has_user = Ptr->HasUser(user); - for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) - { - if ((!has_user) && (i->first->IsModeSet('i'))) - continue; - - if (i->first->Visibility && !i->first->Visibility->VisibleTo(user)) - continue; + return MOD_RES_PASSTHRU; + } - size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", Ptr->GetAllPrefixChars(i->first), i->second.c_str()); - /* OnUserList can change this - reset it back to normal */ - i->second = i->first->nick; - curlen += ptrlen; - ptr += ptrlen; - numusers++; - if (curlen > (480-NICKMAX)) - { - /* list overflowed into multiple numerics */ - user->WriteServ(std::string(list)); - /* reset our lengths */ - dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, Ptr->name); - ptr = list + dlen; - ptrlen = 0; - numusers = 0; - } - } - /* if whats left in the list isnt empty, send it */ - if (numusers) - { - user->WriteServ(std::string(list)); - } - user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, Ptr->name); - return 1; - } - return 0; - } + void OnSendWhoLine(User* source, const std::vector& params, User* user, Membership* memb, std::string& line) 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 + + // Don't do anything if the user has only one prefix + std::string prefixes = memb->GetAllPrefixChars(); + if (prefixes.length() <= 1) + return; + + line.erase(pos, 1); + line.insert(pos, prefixes); + } }; -MODULE_INIT(ModuleNamesX); +MODULE_INIT(ModuleNamesX)