X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_swhois.cpp;h=0d9adeb4db6e92b3f0b1f2ca1e55849edb173c32;hb=c0090ae7eb5a2d615f5272e3ba71aba70ae486cd;hp=9ebbb2a083783fbf1a4203b1b262bde0a924c4e1;hpb=1af394d68bd6eb328a561acd9468fe272842c409;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp index 9ebbb2a08..0d9adeb4d 100644 --- a/src/modules/m_swhois.cpp +++ b/src/modules/m_swhois.cpp @@ -19,40 +19,25 @@ */ class CommandSwhois : public Command { - + public: - CommandSwhois (InspIRCd* Instance) : Command(Instance,"SWHOIS",'o',2) + CommandSwhois (InspIRCd* Instance) : Command(Instance,"SWHOIS","o",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); @@ -61,18 +46,18 @@ class CommandSwhois : public Command // 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()); - + 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, dest->nick, line.c_str()); + 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(line); + + text = new std::string(parameters[1]); dest->Extend("swhois", text); /* Bug #376 - feature request - @@ -81,16 +66,10 @@ 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; - + ServerInstance->PI->SendMetaData(dest, TYPE_USER, "swhois", *text); + // If it's an empty swhois, unset it (not ideal, but ok) - if (text.empty()) + if (text->empty()) { dest->Shrink("swhois"); delete text; @@ -104,13 +83,13 @@ class CommandSwhois : public Command class ModuleSWhois : public Module { CommandSwhois* mycommand; - + ConfigReader* Conf; - + public: ModuleSWhois(InspIRCd* Me) : Module(Me) { - + Conf = new ConfigReader(ServerInstance); mycommand = new CommandSwhois(ServerInstance); ServerInstance->AddCommand(mycommand); @@ -133,12 +112,12 @@ class ModuleSWhois : public Module { /* 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; } @@ -206,40 +185,47 @@ class ModuleSWhois : public Module if ((target_type == TYPE_USER) && (extname == "swhois")) { User* dest = (User*)target; - // if they dont already have an swhois field, accept the remote server's + + // if they already have an swhois field, trash it and replace it with the remote one. std::string* text; - if (!dest->GetExt("swhois", 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; // 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 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); @@ -254,29 +240,23 @@ class ModuleSWhois : public Module user->Shrink("swhois"); 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, TYPE_USER, "swhois", *text); } virtual ~ModuleSWhois() { delete Conf; } - + virtual Version GetVersion() { - return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); + return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); } };