1 files changed, 28 insertions, 35 deletions

diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index b29d268d1..6c420ca3a 100644
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -24,8 +24,13 @@
 
 
 #include "inspircd.h"
+#include "modules/whois.h"
 
-/* $ModDesc: Provides the SWHOIS command which allows setting of arbitrary WHOIS lines */
+enum
+{
+	// From UnrealIRCd.
+	RPL_WHOISSPECIAL = 320
+};
 
 /** Handle /SWHOIS
  */
@@ -35,21 +40,21 @@ class CommandSwhois : public Command
 	LocalIntExt operblock;
 	StringExtItem swhois;
 	CommandSwhois(Module* Creator)
-		: Command(Creator,"SWHOIS", 2,2)
-		, operblock("swhois_operblock", Creator)
-		, swhois("swhois", Creator)
+		: Command(Creator, "SWHOIS", 2, 2)
+		, operblock("swhois_operblock", ExtensionItem::EXT_USER, Creator)
+		, swhois("swhois", ExtensionItem::EXT_USER, Creator)
 	{
 		flags_needed = 'o'; syntax = "<nick> :<swhois>";
-		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
+		TRANSLATE2(TR_NICK, TR_TEXT);
 	}
 
-	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) || (IS_SERVER(dest))) // allow setting swhois using SWHOIS before reg
+		if (!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(Numerics::NoSuchNick(parameters[0]));
 			return CMD_FAILURE;
 		}
 
@@ -57,11 +62,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());
@@ -86,34 +91,28 @@ class CommandSwhois : public Command
 
 };
 
-class ModuleSWhois : public Module
+class ModuleSWhois : public Module, public Whois::LineEventListener
 {
 	CommandSwhois cmd;
 
  public:
-	ModuleSWhois() : cmd(this)
-	{
-	}
-
-	void init()
+	ModuleSWhois()
+		: Whois::LineEventListener(this)
+		, cmd(this)
 	{
-		ServiceProvider* providerlist[] = { &cmd, &cmd.operblock, &cmd.swhois };
-		ServerInstance->Modules->AddServices(providerlist, sizeof(providerlist)/sizeof(ServiceProvider*));
-		Implementation eventlist[] = { I_OnWhoisLine, I_OnPostOper, I_OnPostDeoper, I_OnDecodeMetaData };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	// :kenny.chatspike.net 320 Brain Azhrarn :is getting paid to play games.
-	ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
+	ModResult OnWhoisLine(Whois::Context& whois, Numeric::Numeric& numeric) CXX11_OVERRIDE
 	{
 		/* We use this and not OnWhois because this triggers for remote, too */
-		if (numeric == 312)
+		if (numeric.GetNumeric() == 312)
 		{
 			/* Insert our numeric before 312 */
-			std::string* swhois = cmd.swhois.get(dest);
+			std::string* swhois = cmd.swhois.get(whois.GetTarget());
 			if (swhois)
 			{
-				ServerInstance->SendWhoisLine(user, dest, 320, "%s %s :%s",user->nick.c_str(), dest->nick.c_str(), swhois->c_str());
+				whois.SendLine(RPL_WHOISSPECIAL, *swhois);
 			}
 		}
 
@@ -121,7 +120,7 @@ class ModuleSWhois : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	void OnPostOper(User* user, const std::string &opertype, const std::string &opername)
+	void OnPostOper(User* user, const std::string &opertype, const std::string &opername) CXX11_OVERRIDE
 	{
 		if (!IS_LOCAL(user))
 			return;
@@ -136,7 +135,7 @@ class ModuleSWhois : public Module
 		ServerInstance->PI->SendMetaData(user, "swhois", swhois);
 	}
 
-	void OnPostDeoper(User* user)
+	void OnPostDeoper(User* user) CXX11_OVERRIDE
 	{
 		std::string* swhois = cmd.swhois.get(user);
 		if (!swhois)
@@ -150,20 +149,14 @@ class ModuleSWhois : public Module
 		ServerInstance->PI->SendMetaData(user, "swhois", "");
 	}
 
-	void OnDecodeMetaData(Extensible* target, const std::string& extname, const std::string&)
+	void OnDecodeMetaData(Extensible* target, const std::string& extname, const std::string&) CXX11_OVERRIDE
 	{
-		// XXX: We use a dynamic_cast in m_services_account so I used one
-		// here but do we actually need it or is static_cast okay?
-		User* dest = dynamic_cast<User*>(target);
+		User* dest = static_cast<User*>(target);
 		if (dest && (extname == "swhois"))
 			cmd.operblock.set(dest, 0);
 	}
 
-	~ModuleSWhois()
-	{
-	}
-
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides the SWHOIS command which allows setting of arbitrary WHOIS lines", VF_OPTCOMMON | VF_VENDOR);
 	}