X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_swhois.cpp;h=742781747f4e091de5e9848da2ac8b80095ee52c;hb=68211809ee3111bdc9609fbd46dc3c875fbb5ea6;hp=ef5c5c35f14c9c6bddd1ddacabd774dc1e049118;hpb=dd36852a52e8541306b76c5b88bce8ab9b36654c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp index ef5c5c35f..742781747 100644 --- a/src/modules/m_swhois.cpp +++ b/src/modules/m_swhois.cpp @@ -1,73 +1,72 @@ -/* +------------------------------------+ - * | 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) 2008 Pippijn van Steenhoven + * Copyright (C) 2007 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006-2007 John Brooks + * Copyright (C) 2005-2006 Craig Edwards + * Copyright (C) 2006 Oliver Lupton * - * 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" -/* $ModDesc: Provides the SWHOIS command which allows setting of arbitary WHOIS lines */ +/* $ModDesc: Provides the SWHOIS command which allows setting of arbitrary WHOIS lines */ /** Handle /SWHOIS */ class CommandSwhois : public Command { - public: - CommandSwhois (InspIRCd* Instance) : Command(Instance,"SWHOIS","o",2) + StringExtItem swhois; + CommandSwhois(Module* Creator) : Command(Creator,"SWHOIS", 2,2), swhois("swhois", Creator) { - this->source = "m_swhois.so"; - syntax = " "; + flags_needed = 'o'; syntax = " :"; TRANSLATE3(TR_NICK, TR_TEXT, TR_END); } - CmdResult Handle(const char* const* parameters, int pcnt, User* user) + CmdResult Handle(const std::vector ¶meters, User* user) { User* dest = ServerInstance->FindNick(parameters[0]); - - if (!dest) - { - user->WriteServ("401 %s %s :No such nick/channel", user->nick, parameters[0]); - return CMD_FAILURE; - } - std::string line; - for (int i = 1; i < pcnt; i++) + if ((!dest) || (IS_SERVER(dest))) // allow setting swhois using SWHOIS before reg { - if (i != 1) - line.append(" "); - - line.append(parameters[i]); + user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str()); + return CMD_FAILURE; } - - std::string* text; - dest->GetExt("swhois", text); + std::string* text = swhois.get(dest); if (text) { // We already had it set... if (!ServerInstance->ULine(user->server)) // Ulines set SWHOISes silently - ServerInstance->SNO->WriteToSnoMask('A', "%s used SWHOIS to set %s's extra whois from '%s' to '%s'", user->nick, dest->nick, text->c_str(), line.c_str()); - - dest->Shrink("swhois"); - delete text; + ServerInstance->SNO->WriteGlobalSno('a', "%s used SWHOIS to set %s's extra whois from '%s' to '%s'", user->nick.c_str(), dest->nick.c_str(), text->c_str(), parameters[1].c_str()); } else if (!ServerInstance->ULine(user->server)) { // Ulines set SWHOISes silently - ServerInstance->SNO->WriteToSnoMask('A', "%s used SWHOIS to set %s's extra whois to '%s'", user->nick, dest->nick, line.c_str()); + ServerInstance->SNO->WriteGlobalSno('a', "%s used SWHOIS to set %s's extra whois to '%s'", user->nick.c_str(), dest->nick.c_str(), parameters[1].c_str()); } - - text = new std::string(line); - dest->Extend("swhois", text); + + if (parameters[1].empty()) + swhois.unset(dest); + else + swhois.set(dest, parameters[1]); /* Bug #376 - feature request - * To cut down on the amount of commands services etc have to recognise, this only sends METADATA across the network now @@ -75,202 +74,69 @@ class CommandSwhois : public Command * Sorry w00t i know this was your fix, but i got bored and wanted to clear down the tracker :) * -- Brain */ - std::deque* metadata = new std::deque; - metadata->push_back(dest->nick); - metadata->push_back("swhois"); // The metadata id - metadata->push_back(*text); // The value to send - Event event((char*)metadata,(Module*)this,"send_metadata"); - event.Send(ServerInstance); - delete metadata; - - // If it's an empty swhois, unset it (not ideal, but ok) - if (text->empty()) - { - dest->Shrink("swhois"); - delete text; - } + ServerInstance->PI->SendMetaData(dest, "swhois", parameters[1]); - return CMD_LOCALONLY; + return CMD_SUCCESS; } }; class ModuleSWhois : public Module { - CommandSwhois* mycommand; - - ConfigReader* Conf; - + CommandSwhois cmd; + public: - ModuleSWhois(InspIRCd* Me) : Module(Me) + ModuleSWhois() : cmd(this) { - - Conf = new ConfigReader(ServerInstance); - mycommand = new CommandSwhois(ServerInstance); - ServerInstance->AddCommand(mycommand); - Implementation eventlist[] = { I_OnDecodeMetaData, I_OnWhoisLine, I_OnSyncUserMetaData, I_OnUserQuit, I_OnCleanup, I_OnRehash, I_OnPostCommand }; - ServerInstance->Modules->Attach(eventlist, this, 7); } - void OnRehash(User* user, const std::string ¶meter) + void init() { - delete Conf; - Conf = new ConfigReader(ServerInstance); + ServerInstance->Modules->AddService(cmd); + ServerInstance->Modules->AddService(cmd.swhois); + Implementation eventlist[] = { I_OnWhoisLine, I_OnPostOper }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); } - // :kenny.chatspike.net 320 Brain Azhrarn :is getting paid to play games. - int OnWhoisLine(User* user, User* dest, int &numeric, std::string &text) + ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text) { /* We use this and not OnWhois because this triggers for remote, too */ if (numeric == 312) { /* Insert our numeric before 312 */ - std::string* swhois; - dest->GetExt("swhois", swhois); + std::string* swhois = cmd.swhois.get(dest); if (swhois) { - ServerInstance->SendWhoisLine(user, dest, 320, "%s %s :%s",user->nick,dest->nick,swhois->c_str()); + ServerInstance->SendWhoisLine(user, dest, 320, "%s %s :%s",user->nick.c_str(), dest->nick.c_str(), swhois->c_str()); } } - /* Dont block anything */ - return 0; - } - // Whenever the linking module wants to send out data, but doesnt know what the data - // represents (e.g. it is metadata, added to a User or Channel by a module) then - // this method is called. We should use the ProtoSendMetaData function after we've - // corrected decided how the data should look, to send the metadata on its way if - // it is ours. - virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable) - { - // check if the linking module wants to know about OUR metadata - if (extname == "swhois") - { - // check if this user has an swhois field to send - std::string* swhois; - user->GetExt("swhois", swhois); - if (swhois) - { - // call this function in the linking module, let it format the data how it - // sees fit, and send it on its way. We dont need or want to know how. - proto->ProtoSendMetaData(opaque,TYPE_USER,user,extname,*swhois); - } - } - } - - // when a user quits, tidy up their metadata - virtual void OnUserQuit(User* user, const std::string &message, const std::string &oper_message) - { - std::string* swhois; - user->GetExt("swhois", swhois); - if (swhois) - { - user->Shrink("swhois"); - delete swhois; - } - } - - // if the module is unloaded, tidy up all our dangling metadata - virtual void OnCleanup(int target_type, void* item) - { - if (target_type == TYPE_USER) - { - User* user = (User*)item; - std::string* swhois; - user->GetExt("swhois", swhois); - if (swhois) - { - user->Shrink("swhois"); - delete swhois; - } - } + /* Dont block anything */ + return MOD_RES_PASSTHRU; } - // Whenever the linking module receives metadata from another server and doesnt know what - // to do with it (of course, hence the 'meta') it calls this method, and it is up to each - // module in turn to figure out if this metadata key belongs to them, and what they want - // to do with it. - // In our case we're only sending a single string around, so we just construct a std::string. - // Some modules will probably get much more complex and format more detailed structs and classes - // in a textual way for sending over the link. - virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata) + void OnPostOper(User* user, const std::string &opertype, const std::string &opername) { - // check if its our metadata key, and its associated with a user - if ((target_type == TYPE_USER) && (extname == "swhois")) - { - User* dest = (User*)target; - // if they dont already have an swhois field, accept the remote server's - std::string* text; - if (!dest->GetExt("swhois", text)) - { - std::string* text2 = new std::string(extdata); - dest->Extend("swhois",text2); - } - } - } - - virtual void OnPostCommand(const std::string &command, const char* const* params, int pcnt, User *user, CmdResult result, const std::string &original_line) - { - if ((command != "OPER") || (result != CMD_SUCCESS)) + if (!IS_LOCAL(user)) return; - - std::string swhois; - - for (int i = 0; i < Conf->Enumerate("oper"); i++) - { - std::string name = Conf->ReadValue("oper", "name", i); - - if (name == params[0]) - { - swhois = Conf->ReadValue("oper", "swhois", i); - break; - } - } - - if (!swhois.length()) - { - for (int i = 0; i < Conf->Enumerate("type"); i++) - { - std::string type = Conf->ReadValue("type", "name", i); - - if (type == user->oper) - { - swhois = Conf->ReadValue("type", "swhois", i); - break; - } - } - } - std::string *old; - if (user->GetExt("swhois", old)) - { - user->Shrink("swhois"); - delete old; - } - + std::string swhois = user->oper->getConfig("swhois"); + if (!swhois.length()) return; - - std::string *text = new std::string(swhois); - user->Extend("swhois", text); - std::deque* metadata = new std::deque; - metadata->push_back(user->nick); - metadata->push_back("swhois"); // The metadata id - metadata->push_back(*text); // The value to send - Event event((char*)metadata,(Module*)this,"send_metadata"); - event.Send(ServerInstance); - delete metadata; + + cmd.swhois.set(user, swhois); + ServerInstance->PI->SendMetaData(user, "swhois", swhois); } - virtual ~ModuleSWhois() + ~ModuleSWhois() { - delete Conf; } - - virtual Version GetVersion() + + Version GetVersion() { - return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); + return Version("Provides the SWHOIS command which allows setting of arbitrary WHOIS lines", VF_OPTCOMMON | VF_VENDOR); } };