X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_swhois.cpp;h=0d9adeb4db6e92b3f0b1f2ca1e55849edb173c32;hb=c0090ae7eb5a2d615f5272e3ba71aba70ae486cd;hp=000eeb0403e41786029c4a0f6a4f65fc54a05845;hpb=416cc382022d9c41670e7b53390a900ef0ec8c89;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp index 000eeb040..0d9adeb4d 100644 --- a/src/modules/m_swhois.cpp +++ b/src/modules/m_swhois.cpp @@ -2,124 +2,141 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2008 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "helperfuncs.h" +#include "inspircd.h" /* $ModDesc: Provides the SWHOIS command which allows setting of arbitary WHOIS lines */ -class cmd_swhois : public command_t +/** Handle /SWHOIS + */ +class CommandSwhois : public Command { - Server* Srv; + public: - cmd_swhois(Server* server) : command_t("SWHOIS",'o',2) + CommandSwhois (InspIRCd* Instance) : Command(Instance,"SWHOIS","o",2) { - this->Srv = server; this->source = "m_swhois.so"; + syntax = " :"; + TRANSLATE3(TR_NICK, TR_TEXT, TR_END); } - void Handle(char** parameters, int pcnt, userrec* user) + CmdResult Handle(const std::vector ¶meters, User* user) { - userrec* dest = Srv->FindNick(std::string(parameters[0])); - if(dest) + User* dest = ServerInstance->FindNick(parameters[0]); + + if (!dest) { - std::string line; - for(int i = 1; i < pcnt; i++) - { - if (i != 1) - line.append(" "); - - line.append(parameters[i]); - } - - std::string* text = (std::string*)dest->GetExt("swhois"); - - if(text) - { - // We already had it set... - - WriteOpers("%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; - } - else - { - WriteOpers("%s used SWHOIS to set %s's extra whois to '%s'", user->nick, dest->nick, line.c_str()); - } - - text = new std::string(line); - dest->Extend("swhois", (char*)text); + 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); + + 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.c_str(), dest->nick.c_str(), text->c_str(), parameters[1].c_str()); + + dest->Shrink("swhois"); + delete text; + } + 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.c_str(), dest->nick.c_str(), parameters[1].c_str()); } + + text = new std::string(parameters[1]); + dest->Extend("swhois", text); + + /* 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 + * not an actual SWHOIS command. Any SWHOIS command sent from services will be automatically translated to METADATA by this. + * Sorry w00t i know this was your fix, but i got bored and wanted to clear down the tracker :) + * -- Brain + */ + ServerInstance->PI->SendMetaData(dest, TYPE_USER, "swhois", *text); + + // If it's an empty swhois, unset it (not ideal, but ok) + if (text->empty()) + { + dest->Shrink("swhois"); + delete text; + } + + return CMD_LOCALONLY; } + }; class ModuleSWhois : public Module { - cmd_swhois* mycommand; - Server* Srv; + CommandSwhois* mycommand; + ConfigReader* Conf; - + public: - ModuleSWhois(Server* Me) : Module::Module(Me) + ModuleSWhois(InspIRCd* Me) : Module(Me) { - Srv = Me; - Conf = new ConfigReader(); - mycommand = new cmd_swhois(Srv); - Srv->AddCommand(mycommand); + + 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(std::string parameter) + void OnRehash(User* user, const std::string ¶meter) { delete Conf; - Conf = new ConfigReader(); + Conf = new ConfigReader(ServerInstance); } - void Implements(char* List) - { - List[I_OnWhois] = List[I_OnSyncUserMetaData] = List[I_OnUserQuit] = List[I_OnCleanup] = List[I_OnRehash] = List[I_OnOper] = 1; - } // :kenny.chatspike.net 320 Brain Azhrarn :is getting paid to play games. - virtual void OnWhois(userrec* source, userrec* dest) + int OnWhoisLine(User* user, User* dest, int &numeric, std::string &text) { - char* desc = dest->GetExt("swhois"); - if (desc) + /* We use this and not OnWhois because this triggers for remote, too */ + if (numeric == 312) { - std::string* swhois = (std::string*)desc; - WriteServ(source->fd,"320 %s %s :%s",source->nick,dest->nick,swhois->c_str()); + /* Insert our numeric before 312 */ + std::string* swhois; + if (dest->GetExt("swhois", swhois)) + { + 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 userrec or chanrec by a module) then + // 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(userrec* user, Module* proto, void* opaque, std::string extname) + 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 - char* field = user->GetExt("swhois"); - if (field) + std::string* swhois; + user->GetExt("swhois", swhois); + if (swhois) { - // get our extdata out with a cast - std::string* swhois = (std::string*)field; // 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); @@ -128,12 +145,12 @@ class ModuleSWhois : public Module } // when a user quits, tidy up their metadata - virtual void OnUserQuit(userrec* user, std::string message) + virtual void OnUserQuit(User* user, const std::string &message, const std::string &oper_message) { - char* field = user->GetExt("swhois"); - if (field) + std::string* swhois; + user->GetExt("swhois", swhois); + if (swhois) { - std::string* swhois = (std::string*)field; user->Shrink("swhois"); delete swhois; } @@ -144,11 +161,11 @@ class ModuleSWhois : public Module { if (target_type == TYPE_USER) { - userrec* user = (userrec*)item; - char* field = user->GetExt("swhois"); - if (field) + User* user = (User*)item; + std::string* swhois; + user->GetExt("swhois", swhois); + if (swhois) { - std::string* swhois = (std::string*)field; user->Shrink("swhois"); delete swhois; } @@ -162,81 +179,85 @@ class ModuleSWhois : public Module // 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, std::string extname, std::string extdata) + virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata) { // check if its our metadata key, and its associated with a user if ((target_type == TYPE_USER) && (extname == "swhois")) { - userrec* dest = (userrec*)target; - // if they dont already have an swhois field, accept the remote server's - if (!dest->GetExt("swhois")) + User* dest = (User*)target; + + // if they already have an swhois field, trash it and replace it with the remote one. + std::string* text; + if (dest->GetExt("swhois", text)) { - std::string* text = new std::string(extdata); - dest->Extend("swhois",(char*)text); + dest->Shrink("swhois"); + delete text; } + + if (extdata.empty()) + return; // XXX does the command parser even allow sending blank mdata? it needs to here! -- w00t + + text = new std::string(extdata); + dest->Extend("swhois", text); } } - - virtual void OnOper(userrec* user, std::string opertype) + + virtual void OnPostCommand(const std::string &command, const std::vector ¶ms, User *user, CmdResult result, const std::string &original_line) { - for(int i =0; i < Conf->Enumerate("type"); i++) + if ((command != "OPER") || (result != CMD_SUCCESS)) + 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()) { - std::string type = Conf->ReadValue("type", "name", i); - - if(strcmp(type.c_str(), user->oper) == 0) + for (int i = 0; i < Conf->Enumerate("type"); i++) { - std::string swhois = Conf->ReadValue("type", "swhois", i); - - if(swhois.length()) + std::string type = Conf->ReadValue("type", "name", i); + + if (type == user->oper) { - if(std::string* old = (std::string*)user->GetExt("swhois")) - { - user->Shrink("swhois"); - delete old; - } - - std::string* text = new std::string(swhois); - user->Extend("swhois", (char*)text); - + swhois = Conf->ReadValue("type", "swhois", i); break; } } - } + } + + std::string *old; + if (user->GetExt("swhois", old)) + { + user->Shrink("swhois"); + delete old; + } + + if (!swhois.length()) + return; + + std::string *text = new std::string(swhois); + user->Extend("swhois", text); + ServerInstance->PI->SendMetaData(user, TYPE_USER, "swhois", *text); } - + virtual ~ModuleSWhois() { delete Conf; } - - virtual Version GetVersion() - { - return Version(1,0,0,0,VF_VENDOR); - } -}; - -class ModuleSWhoisFactory : public ModuleFactory -{ - public: - ModuleSWhoisFactory() - { - } - - ~ModuleSWhoisFactory() - { - } - - virtual Module * CreateModule(Server* Me) + virtual Version GetVersion() { - return new ModuleSWhois(Me); + return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleSWhoisFactory; -} - +MODULE_INIT(ModuleSWhois)