X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_swhois.cpp;h=50f6578dbc104fd73f0d695d536d075314874a0b;hb=8a0a8ce160dbc623350b80f8f6e06afb9c7a1f86;hp=c868060984175f8afa8f0c15a65e1c44ed051f18;hpb=3a554ef1e9be9dbcf3de3301a4a6c2938d643bea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index c86806098..50f6578db 100644
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -97,18 +97,25 @@ class ModuleSWhois : public Module
 
 	void Implements(char* List)
 	{
-		List[I_OnWhois] = List[I_OnSyncUserMetaData] = List[I_OnUserQuit] = List[I_OnCleanup] = List[I_OnRehash] = List[I_OnPostCommand] = 1;
+		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.
-	virtual void OnWhois(userrec* source, userrec* dest)
+	int OnWhoisLine(userrec* user, userrec* dest, int &numeric, std::string &text)
 	{
-		std::string* swhois;
-		dest->GetExt("swhois", swhois);
-		if (swhois)
+		/* We use this and not OnWhois because this triggers for remote, too */
+		if (numeric == 312)
 		{
-			ServerInstance->SendWhoisLine(source, dest, 320, "%s %s :%s",source->nick,dest->nick,swhois->c_str());
+			/* Insert our numeric before 312 */
+			std::string* swhois;
+			dest->GetExt("swhois", swhois);
+			if (swhois)
+			{
+				ServerInstance->SendWhoisLine(user, dest, 320, "%s %s :%s",user->nick,dest->nick,swhois->c_str());
+			}
 		}
+		/* Dont block anything */
+		return 0;
 	}
 
 	// Whenever the linking module wants to send out data, but doesnt know what the data
@@ -228,8 +235,15 @@ 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;
 	}
-	
+
 	virtual ~ModuleSWhois()
 	{
 		DELETE(Conf);