X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_swhois.cpp;h=ebff25cb838ace4ad742134d54e06c07d7b269da;hb=1c1c5fc3f01c42a09d34594989679bbc8fb21c0d;hp=196c435531d176459491cd567cbd0a4839734d84;hpb=b57c7f4e466f72fdd2ac3deca42caa1ea7748338;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp index 196c43553..ebff25cb8 100644 --- a/src/modules/m_swhois.cpp +++ b/src/modules/m_swhois.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -17,63 +17,44 @@ /** Handle /SWHOIS */ -class cmd_swhois : public Command +class CommandSwhois : public Command { - + public: - cmd_swhois (InspIRCd* Instance) : Command(Instance,"SWHOIS",'o',2) + CommandSwhois (InspIRCd* Instance, Module* Creator) : Command(Instance, Creator,"SWHOIS","o",2, 2) { - this->source = "m_swhois.so"; - syntax = " "; + syntax = " :"; TRANSLATE3(TR_NICK, TR_TEXT, TR_END); } - CmdResult Handle(const char** 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]); + user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str()); return CMD_FAILURE; } - if (!*parameters[1]) - { - user->WriteServ("NOTICE %s :*** SWHOIS: Whois line must be specified", user->nick); - return CMD_FAILURE; - } - - std::string line; - for (int i = 1; i < pcnt; i++) - { - if (i != 1) - line.append(" "); - - line.append(parameters[i]); - } - std::string* text; - dest->GetExt("swhois", text); - - if (text) + if (dest->GetExt("swhois", text)) { // We already had it set... - if (!ServerInstance->ULine(user->server)) // Ulines set SWHOISes silently - ServerInstance->WriteOpers("*** %s used SWHOIS to set %s's extra whois from '%s' to '%s'", user->nick, dest->nick, text->c_str(), line.c_str()); - + 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()); + dest->Shrink("swhois"); - DELETE(text); + delete text; } else if (!ServerInstance->ULine(user->server)) { // Ulines set SWHOISes silently - ServerInstance->WriteOpers("*** %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); + + text = new std::string(parameters[1]); dest->Extend("swhois", text); /* Bug #376 - feature request - @@ -82,61 +63,59 @@ class cmd_swhois : 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; - - return CMD_LOCALONLY; + ServerInstance->PI->SendMetaData(dest, "swhois", *text); + + // If it's an empty swhois, unset it (not ideal, but ok) + if (text->empty()) + { + dest->Shrink("swhois"); + delete text; + } + + return CMD_SUCCESS; } }; class ModuleSWhois : public Module { - cmd_swhois* mycommand; - + CommandSwhois cmd; + ConfigReader* Conf; - + public: - ModuleSWhois(InspIRCd* Me) : Module(Me) + ModuleSWhois(InspIRCd* Me) : Module(Me), cmd(Me, this) { - + Conf = new ConfigReader(ServerInstance); - mycommand = new cmd_swhois(ServerInstance); - ServerInstance->AddCommand(mycommand); + ServerInstance->AddCommand(&cmd); + Implementation eventlist[] = { I_OnDecodeMetaData, I_OnWhoisLine, I_OnSyncUser, I_OnUserQuit, I_OnCleanup, I_OnRehash, I_OnPostCommand }; + ServerInstance->Modules->Attach(eventlist, this, 7); } - void OnRehash(User* user, const std::string ¶meter) + void OnRehash(User* user) { - DELETE(Conf); + delete Conf; Conf = new ConfigReader(ServerInstance); } - void Implements(char* List) - { - List[I_OnDecodeMetaData] = List[I_OnWhoisLine] = List[I_OnSyncUserMetaData] = List[I_OnUserQuit] = List[I_OnCleanup] = List[I_OnRehash] = List[I_OnPostCommand] = 1; - } // :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); - if (swhois) + if (dest->GetExt("swhois", 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; + return MOD_RES_PASSTHRU; } // Whenever the linking module wants to send out data, but doesnt know what the data @@ -144,48 +123,35 @@ class ModuleSWhois : public Module // 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) + virtual void OnSyncUser(User* user, Module* proto, void* opaque) { - // 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); - } - } + // check if this user has an swhois field to send + std::string* swhois; + if (user->GetExt("swhois", swhois)) + proto->ProtoSendMetaData(opaque,user,"swhois",*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) + if (user->GetExt("swhois", swhois)) { user->Shrink("swhois"); - DELETE(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) + if (target_type != TYPE_USER) return; + User* user = static_cast(item); + std::string* swhois; + if (user && user->GetExt("swhois", swhois)) { - User* user = (User*)item; - std::string* swhois; - user->GetExt("swhois", swhois); - if (swhois) - { - user->Shrink("swhois"); - DELETE(swhois); - } + user->Shrink("swhois"); + delete swhois; } } @@ -196,46 +162,52 @@ 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, const std::string &extname, const std::string &extdata) + virtual void OnDecodeMetaData(Extensible* target, const std::string &extname, const std::string &extdata) { + User* dest = dynamic_cast(target); // check if its our metadata key, and its associated with a user - if ((target_type == TYPE_USER) && (extname == "swhois")) + if (extname != "swhois" || !dest) + return; + + // if they already have an swhois field, trash it and replace it with the remote one. + std::string* text; + if (dest->GetExt("swhois", text)) { - 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* text = new std::string(extdata); - dest->Extend("swhois",text); - } + dest->Shrink("swhois"); + delete text; } + + if (extdata.empty()) + return; + + text = new std::string(extdata); + dest->Extend("swhois", text); } - - virtual void OnPostCommand(const std::string &command, const char **params, int pcnt, User *user, CmdResult result, const std::string &original_line) + + virtual void OnPostCommand(const std::string &command, const std::vector ¶ms, User *user, CmdResult result, const std::string &original_line) { 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()) { 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); @@ -248,31 +220,25 @@ class ModuleSWhois : public Module if (user->GetExt("swhois", old)) { user->Shrink("swhois"); - DELETE(old); + delete old; } - + 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; + ServerInstance->PI->SendMetaData(user, "swhois", *text); } virtual ~ModuleSWhois() { - DELETE(Conf); + delete Conf; } - + virtual Version GetVersion() { - return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); + return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); } };