Merge branch 'master+whoiscontext'

1 files changed, 7 insertions, 5 deletions

diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index 81abde6f7..e75921a80 100644
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -81,26 +81,28 @@ class CommandSwhois : public Command
 
 };
 
-class ModuleSWhois : public Module
+class ModuleSWhois : public Module, public Whois::LineEventListener
 {
 	CommandSwhois cmd;
 
  public:
-	ModuleSWhois() : cmd(this)
+	ModuleSWhois()
+		: Whois::LineEventListener(this)
+		, cmd(this)
 	{
 	}
 
 	// :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
+	ModResult OnWhoisLine(Whois::Context& whois, unsigned int& numeric, std::string& text) CXX11_OVERRIDE
 	{
 		/* We use this and not OnWhois because this triggers for remote, too */
 		if (numeric == 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", dest->nick.c_str(), swhois->c_str());
+				whois.SendLine(320, ":%s", swhois->c_str());
 			}
 		}