X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Foverride_whois.cpp;h=6a64a9403efc6e568b3bf4edc03098b4beb661f9;hb=ee7db9bbfbb5f3bc7359d22e7021415aebddb9d2;hp=45a7399bfe1b27f2b698bd68b5cdbfa0fdca58b3;hpb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/override_whois.cpp b/src/modules/m_spanningtree/override_whois.cpp
index 45a7399bf..6a64a9403 100644
--- a/src/modules/m_spanningtree/override_whois.cpp
+++ b/src/modules/m_spanningtree/override_whois.cpp
@@ -19,29 +19,21 @@
 #include "inspircd.h"
 
 #include "main.h"
-#include "utils.h"
+#include "commandbuilder.h"
 
-/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h */
-
-ModResult ModuleSpanningTree::HandleRemoteWhois(const std::vector<std::string>& parameters, User* user)
+ModResult ModuleSpanningTree::HandleRemoteWhois(const CommandBase::Params& parameters, User* user)
 {
-	if ((IS_LOCAL(user)) && (parameters.size() > 1))
+	User* remote = ServerInstance->FindNickOnly(parameters[1]);
+	if (remote && !IS_LOCAL(remote))
+	{
+		CmdBuilder(user, "IDLE").push(remote->uuid).Unicast(remote);
+		return MOD_RES_DENY;
+	}
+	else if (!remote)
 	{
-		User* remote = ServerInstance->FindNickOnly(parameters[1]);
-		if (remote && !IS_LOCAL(remote))
-		{
-			parameterlist params;
-			params.push_back(remote->uuid);
-			Utils->DoOneToOne(user->uuid,"IDLE",params,remote->server);
-			return MOD_RES_DENY;
-		}
-		else if (!remote)
-		{
-			user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), parameters[1].c_str());
-			user->WriteNumeric(318, "%s %s :End of /WHOIS list.",user->nick.c_str(), parameters[1].c_str());
-			return MOD_RES_DENY;
-		}
+		user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
+		user->WriteNumeric(RPL_ENDOFWHOIS, parameters[0], "End of /WHOIS list.");
+		return MOD_RES_DENY;
 	}
 	return MOD_RES_PASSTHRU;
 }
-