X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Foverride_whois.cpp;h=430467dc73319ad810978c2b4841e55d74ab85a5;hb=8f5efbc7aa33b792e02d01e3288f553e6e98ccaa;hp=2be492e1045ffa5a02ebb23a19b6f488519bf2d0;hpb=553a8da754c8cd308bad2008018849714e70f9b7;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 2be492e10..430467dc7 100644
--- a/src/modules/m_spanningtree/override_whois.cpp
+++ b/src/modules/m_spanningtree/override_whois.cpp
@@ -16,39 +16,24 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
-/* $ModDesc: Provides a spanning tree server link protocol */
-
 #include "inspircd.h"
-#include "socket.h"
-#include "xline.h"
 
 #include "main.h"
-#include "utils.h"
-#include "treeserver.h"
-#include "treesocket.h"
-
-/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
+#include "commandbuilder.h"
 
 ModResult ModuleSpanningTree::HandleRemoteWhois(const std::vector<std::string>& parameters, User* user)
 {
-	if ((IS_LOCAL(user)) && (parameters.size() > 1))
+	User* remote = ServerInstance->FindNickOnly(parameters[1]);
+	if (remote && !IS_LOCAL(remote))
 	{
-		User* remote = ServerInstance->FindNick(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;
-		}
+		CmdBuilder(user, "IDLE").push(remote->uuid).Unicast(remote);
+		return MOD_RES_DENY;
+	}
+	else if (!remote)
+	{
+		user->WriteNumeric(ERR_NOSUCHNICK, "%s :No such nick/channel", parameters[1].c_str());
+		user->WriteNumeric(RPL_ENDOFWHOIS, "%s :End of /WHOIS list.", parameters[1].c_str());
+		return MOD_RES_DENY;
 	}
 	return MOD_RES_PASSTHRU;
 }
-