X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_swhois.cpp;h=c6f26384a6b797626bc7aae116b0edfe6c2db001;hb=89fc6ca9c66198fe54cce19d59279cd454fc1bd0;hp=6d813ae9ae171abf3408a36e177e56b72f52cbb7;hpb=4426a2fc448f332e42a7e6ff778e5047bb588c98;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index 6d813ae9a..c6f26384a 100644
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -21,29 +21,23 @@ 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 = "<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++)
 		{
@@ -59,7 +53,6 @@ class CommandSwhois : public Command
 		if (text)
 		{
 			// 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());
@@ -82,13 +75,14 @@ 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<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;
 	}
@@ -133,6 +127,7 @@ class ModuleSWhois : public Module
 				ServerInstance->SendWhoisLine(user, dest, 320, "%s %s :%s",user->nick,dest->nick,swhois->c_str());
 			}
 		}
+
 		/* Dont block anything */
 		return 0;
 	}
@@ -200,17 +195,24 @@ 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 char* const* params, int pcnt, User *user, CmdResult result, const std::string &original_line)
 	{
 		if ((command != "OPER") || (result != CMD_SUCCESS))
 			return;
@@ -254,13 +256,7 @@ class ModuleSWhois : public Module
 		
 		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()
@@ -270,7 +266,7 @@ class ModuleSWhois : public Module
 	
 	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);
 	}
 };