X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_showwhois.cpp;h=d01e1a83be06ad09d70616454361d95ea5c3d452;hb=99af213a58946185621b3e4de01970a7c21cce93;hp=332752f934488a2f7eff671dfebba0303cc6b0b6;hpb=d02011d69fe1e52ec0bc38051eff9ea93a1cc88c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 332752f93..d01e1a83b 100644
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -22,6 +22,7 @@
 
 
 #include "inspircd.h"
+#include "modules/whois.h"
 
 /** Handle user mode +W
  */
@@ -50,11 +51,11 @@ class WhoisNoticeCmd : public Command
 	void HandleFast(User* dest, User* src)
 	{
 		dest->WriteNotice("*** " + src->nick + " (" + src->ident + "@" +
-			(dest->HasPrivPermission("users/auspex") ? src->host : src->dhost) +
+			src->GetHost(dest->HasPrivPermission("users/auspex")) + 
 			") did a /whois on you");
 	}
 
-	CmdResult Handle(const std::vector<std::string> &parameters, User *user)
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
 		User* dest = ServerInstance->FindNick(parameters[0]);
 		if (!dest)
@@ -69,7 +70,7 @@ class WhoisNoticeCmd : public Command
 	}
 };
 
-class ModuleShowwhois : public Module
+class ModuleShowwhois : public Module, public Whois::EventListener
 {
 	bool ShowWhoisFromOpers;
 	SeeWhois sw;
@@ -78,7 +79,9 @@ class ModuleShowwhois : public Module
  public:
 
 	ModuleShowwhois()
-		: sw(this), cmd(this)
+		: Whois::EventListener(this)
+		, sw(this)
+		, cmd(this)
 	{
 	}
 
@@ -95,9 +98,11 @@ class ModuleShowwhois : public Module
 		return Version("Allows opers to set +W to see when a user uses WHOIS on them",VF_OPTCOMMON|VF_VENDOR);
 	}
 
-	void OnWhois(User* source, User* dest) CXX11_OVERRIDE
+	void OnWhois(Whois::Context& whois) CXX11_OVERRIDE
 	{
-		if (!dest->IsModeSet(sw) || source == dest)
+		User* const source = whois.GetSource();
+		User* const dest = whois.GetTarget();
+		if (!dest->IsModeSet(sw) || whois.IsSelfWhois())
 			return;
 
 		if (!ShowWhoisFromOpers && source->IsOper())
@@ -109,12 +114,10 @@ class ModuleShowwhois : public Module
 		}
 		else
 		{
-			std::vector<std::string> params;
-			params.push_back(dest->server->GetName());
-			params.push_back("WHOISNOTICE");
+			CommandBase::Params params;
 			params.push_back(dest->uuid);
 			params.push_back(source->uuid);
-			ServerInstance->PI->SendEncapsulatedData(params);
+			ServerInstance->PI->SendEncapsulatedData(dest->server->GetName(), cmd.name, params);
 		}
 	}
 };