* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
{
public:
- CommandSwhois (InspIRCd* Instance) : Command(Instance,"SWHOIS",'o',2)
+ CommandSwhois (InspIRCd* Instance) : Command(Instance,"SWHOIS","o",2)
{
this->source = "m_swhois.so";
syntax = "<nick> <swhois>";
TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
}
- CmdResult Handle(const char** parameters, int pcnt, User* user)
+ CmdResult Handle(const char* const* parameters, int pcnt, 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(401, "%s %s :No such nick/channel", user->nick, parameters[0]);
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 (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->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);
+ 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->WriteToSnoMask('A', "%s used SWHOIS to set %s's extra whois to '%s'", user->nick, dest->nick, line.c_str());
}
text = new std::string(line);
* Sorry w00t i know this was your fix, but i got bored and wanted to clear down the tracker :)
* -- Brain
*/
- std::deque<std::string>* metadata = new std::deque<std::string>;
- 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())
+ {
+ dest->Shrink("swhois");
+ delete text;
+ }
return CMD_LOCALONLY;
}
void OnRehash(User* user, const std::string ¶meter)
{
- 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)
ServerInstance->SendWhoisLine(user, dest, 320, "%s %s :%s",user->nick,dest->nick,swhois->c_str());
}
}
+
/* Dont block anything */
return 0;
}
if (swhois)
{
user->Shrink("swhois");
- DELETE(swhois);
+ delete swhois;
}
}
if (swhois)
{
user->Shrink("swhois");
- DELETE(swhois);
+ delete swhois;
}
}
}
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 char* const* params, int pcnt, User *user, CmdResult result, const std::string &original_line)
{
if ((command != "OPER") || (result != CMD_SUCCESS))
return;
if (user->GetExt("swhois", old))
{
user->Shrink("swhois");
- DELETE(old);
+ delete old;
}
if (!swhois.length())
std::string *text = new std::string(swhois);
user->Extend("swhois", text);
- std::deque<std::string>* metadata = new std::deque<std::string>;
- 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);
+ 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);
}
};
projects / user / henk / code / inspircd.git / blobdiff