X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_swhois.cpp;h=81abde6f77c2e82aeb004750fe3fdf91be01e377;hb=bbbd6c9ac46c040b9769c227f0f3ffbfcd43b0e7;hp=c2659f6aa53909b7e28b175d84bf804de392f7f9;hpb=1031f333332cf1b09db4fd632f141143ee637c34;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index c2659f6aa..81abde6f7 100644
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -31,7 +31,9 @@ class CommandSwhois : public Command
 {
  public:
 	StringExtItem swhois;
-	CommandSwhois(Module* Creator) : Command(Creator,"SWHOIS", 2,2), swhois("swhois", Creator)
+	CommandSwhois(Module* Creator)
+		: Command(Creator, "SWHOIS", 2, 2)
+		, swhois("swhois", ExtensionItem::EXT_USER, Creator)
 	{
 		flags_needed = 'o'; syntax = "<nick> :<swhois>";
 		TRANSLATE2(TR_NICK, TR_TEXT);
@@ -43,7 +45,7 @@ class CommandSwhois : public Command
 
 		if ((!dest) || (IS_SERVER(dest))) // allow setting swhois using SWHOIS before reg
 		{
-			user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
+			user->WriteNumeric(ERR_NOSUCHNICK, "%s :No such nick/channel", parameters[0].c_str());
 			return CMD_FAILURE;
 		}
 
@@ -51,11 +53,11 @@ class CommandSwhois : public Command
 		if (text)
 		{
 			// We already had it set...
-			if (!ServerInstance->ULine(user->server))
+			if (!user->server->IsULine())
 				// Ulines set SWHOISes silently
 				ServerInstance->SNO->WriteGlobalSno('a', "%s used SWHOIS to set %s's extra whois from '%s' to '%s'", user->nick.c_str(), dest->nick.c_str(), text->c_str(), parameters[1].c_str());
 		}
-		else if (!ServerInstance->ULine(user->server))
+		else if (!user->server->IsULine())
 		{
 			// Ulines set SWHOISes silently
 			ServerInstance->SNO->WriteGlobalSno('a', "%s used SWHOIS to set %s's extra whois to '%s'", user->nick.c_str(), dest->nick.c_str(), parameters[1].c_str());
@@ -88,12 +90,6 @@ class ModuleSWhois : public Module
 	{
 	}
 
-	void init() CXX11_OVERRIDE
-	{
-		ServerInstance->Modules->AddService(cmd);
-		ServerInstance->Modules->AddService(cmd.swhois);
-	}
-
 	// :kenny.chatspike.net 320 Brain Azhrarn :is getting paid to play games.
 	ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text) CXX11_OVERRIDE
 	{
@@ -104,7 +100,7 @@ class ModuleSWhois : public Module
 			std::string* swhois = cmd.swhois.get(dest);
 			if (swhois)
 			{
-				ServerInstance->SendWhoisLine(user, dest, 320, "%s %s :%s",user->nick.c_str(), dest->nick.c_str(), swhois->c_str());
+				ServerInstance->SendWhoisLine(user, dest, 320, "%s :%s", dest->nick.c_str(), swhois->c_str());
 			}
 		}