* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 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.
{
public:
- CommandSwhois (InspIRCd* Instance) : Command(Instance,"SWHOIS","o",2, 2)
+ CommandSwhois (InspIRCd* Instance, Module* Creator) : Command(Instance, Creator,"SWHOIS","o",2, 2)
{
- this->source = "m_swhois.so";
syntax = "<nick> :<swhois>";
TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
}
// 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());
+ 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;
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());
+ 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(parameters[1]);
* 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);
+ ServerInstance->PI->SendMetaData(dest, "swhois", *text);
// If it's an empty swhois, unset it (not ideal, but ok)
if (text->empty())
delete text;
}
- return CMD_LOCALONLY;
+ return CMD_SUCCESS;
}
};
class ModuleSWhois : public Module
{
- CommandSwhois* 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 CommandSwhois(ServerInstance);
- ServerInstance->AddCommand(mycommand);
- Implementation eventlist[] = { I_OnDecodeMetaData, I_OnWhoisLine, I_OnSyncUserMetaData, I_OnUserQuit, I_OnCleanup, I_OnRehash, I_OnPostCommand };
+ 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;
Conf = new ConfigReader(ServerInstance);
// :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)
}
/* Dont block anything */
- return 0;
+ return MOD_RES_PASSTHRU;
}
// Whenever the linking module wants to send out data, but doesnt know what the data
// 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;
- if (user->GetExt("swhois", 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
// 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<User*>(item);
+ std::string* swhois;
+ if (user && user->GetExt("swhois", swhois))
{
- User* user = (User*)item;
- std::string* swhois;
- if (user->GetExt("swhois", swhois))
- {
- user->Shrink("swhois");
- delete swhois;
- }
+ user->Shrink("swhois");
+ delete swhois;
}
}
// 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<User*>(target);
// check if its our metadata key, and its associated with a user
- if ((target_type == TYPE_USER) && (extname == "swhois"))
- {
- User* dest = (User*)target;
+ 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))
- {
- dest->Shrink("swhois");
- delete text;
- }
+ // if they already have an swhois field, trash it and replace it with the remote one.
+ std::string* text;
+ if (dest->GetExt("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
+ if (extdata.empty())
+ return;
- text = new std::string(extdata);
- dest->Extend("swhois", text);
- }
+ text = new std::string(extdata);
+ dest->Extend("swhois", text);
}
virtual void OnPostCommand(const std::string &command, const std::vector<std::string> ¶ms, User *user, CmdResult result, const std::string &original_line)
std::string *text = new std::string(swhois);
user->Extend("swhois", text);
- ServerInstance->PI->SendMetaData(user, TYPE_USER, "swhois", *text);
+ ServerInstance->PI->SendMetaData(user, "swhois", *text);
}
virtual ~ModuleSWhois()
projects / user / henk / code / inspircd.git / blobdiff