* | 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
*/
#include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
/* $ModDesc: Provides the SWHOIS command which allows setting of arbitary WHOIS lines */
/** Handle /SWHOIS
*/
-class cmd_swhois : public command_t
+class CommandSwhois : public Command
{
-
+
public:
- cmd_swhois (InspIRCd* Instance) : command_t(Instance,"SWHOIS",'o',2)
+ CommandSwhois (InspIRCd* Instance) : Command(Instance,"SWHOIS","o",2)
{
this->source = "m_swhois.so";
- syntax = "<nick> <swhois>";
+ syntax = "<nick> :<swhois>";
+ TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
}
- CmdResult Handle(const char** parameters, int pcnt, userrec* user)
+ CmdResult Handle(const std::vector<std::string> ¶meters, User* user)
{
- userrec* dest = ServerInstance->FindNick(parameters[0]);
-
+ 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)
{
// 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.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->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);
- return CMD_SUCCESS;
+ /* 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;
-
+ CommandSwhois* mycommand;
+
ConfigReader* Conf;
-
+
public:
ModuleSWhois(InspIRCd* Me) : Module(Me)
{
-
+
Conf = new ConfigReader(ServerInstance);
- mycommand = new cmd_swhois(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(userrec* user, const std::string ¶meter)
+ 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(userrec* user, userrec* dest, int &numeric, std::string &text)
+ int 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;
}
// 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, const std::string &extname, bool displayable)
+ 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")
}
// when a user quits, tidy up their metadata
- virtual void OnUserQuit(userrec* user, const std::string &message, const std::string &oper_message)
+ virtual void OnUserQuit(User* user, const std::string &message, const std::string &oper_message)
{
std::string* swhois;
user->GetExt("swhois", swhois);
if (swhois)
{
user->Shrink("swhois");
- DELETE(swhois);
+ delete swhois;
}
}
{
if (target_type == TYPE_USER)
{
- userrec* user = (userrec*)item;
+ User* user = (User*)item;
std::string* swhois;
user->GetExt("swhois", swhois);
if (swhois)
{
user->Shrink("swhois");
- DELETE(swhois);
+ delete swhois;
}
}
}
// 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
+ 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))
+ 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, userrec *user, CmdResult result, const std::string &original_line)
+
+ virtual void OnPostCommand(const std::string &command, const std::vector<std::string> ¶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);
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<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