X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_watch.cpp;h=8b84132b23838dc43b5e852a684a9b2df8748b0f;hb=a0f7d012791d79b67b56b62415f7901d5e48870f;hp=6e9a6f9ed716be97ee34dcf1953e8214bccce1f1;hpb=5267fb9d362aeb326c9e64f7171c957f76776f90;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp
index 6e9a6f9ed..8b84132b2 100644
--- a/src/modules/m_watch.cpp
+++ b/src/modules/m_watch.cpp
@@ -18,6 +18,7 @@
 
 
 #include "inspircd.h"
+#include "modules/away.h"
 
 #define INSPIRCD_MONITOR_MANAGER_ONLY
 #include "m_monitor.cpp"
@@ -36,7 +37,8 @@ enum
 	RPL_ENDOFWATCHLIST = 607,
 	// RPL_CLEARWATCH = 608, // unused
 	RPL_NOWISAWAY = 609,
-	ERR_TOOMANYWATCH = 512
+	ERR_TOOMANYWATCH = 512,
+	ERR_INVALIDWATCHNICK = 942
 };
 
 class CommandWatch : public SplitCommand
@@ -53,9 +55,9 @@ class CommandWatch : public SplitCommand
 		{
 			// The away state should only be sent if the client requests away notifications for a nick but 2.0 always sends them so we do that too
 			if (target->IsAway())
-				user->WriteNumeric(RPL_NOWISAWAY, target->nick, target->ident, target->dhost, (unsigned long)target->awaytime, "is away");
+				user->WriteNumeric(RPL_NOWISAWAY, target->nick, target->ident, target->GetDisplayedHost(), (unsigned long)target->awaytime, "is away");
 			else
-				user->WriteNumeric(RPL_NOWON, target->nick, target->ident, target->dhost, (unsigned long)target->age, "is online");
+				user->WriteNumeric(RPL_NOWON, target->nick, target->ident, target->GetDisplayedHost(), (unsigned long)target->age, "is online");
 		}
 		else if (show_offline)
 			user->WriteNumeric(RPL_NOWOFF, nick, "*", "*", "0", "is offline");
@@ -72,7 +74,7 @@ class CommandWatch : public SplitCommand
 		}
 		else if (result == IRCv3::Monitor::Manager::WR_INVALIDNICK)
 		{
-			user->WriteNumeric(942, nick, "Invalid nickname");
+			user->WriteNumeric(ERR_INVALIDWATCHNICK, nick, "Invalid nickname");
 			return;
 		}
 		else if (result != IRCv3::Monitor::Manager::WR_OK)
@@ -88,7 +90,7 @@ class CommandWatch : public SplitCommand
 
 		User* target = IRCv3::Monitor::Manager::FindNick(nick);
 		if (target)
-			user->WriteNumeric(RPL_WATCHOFF, target->nick, target->ident, target->dhost, (unsigned long)target->age, "stopped watching");
+			user->WriteNumeric(RPL_WATCHOFF, target->nick, target->ident, target->GetDisplayedHost(), (unsigned long)target->age, "stopped watching");
 		else
 			user->WriteNumeric(RPL_WATCHOFF, nick, "*", "*", "0", "stopped watching");
 	}
@@ -134,7 +136,7 @@ class CommandWatch : public SplitCommand
 		syntax = "[<C|L|S|l|+<nick1>|-<nick>>]";
 	}
 
-	CmdResult HandleLocal(const std::vector<std::string>& parameters, LocalUser* user)
+	CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE
 	{
 		if (parameters.empty())
 		{
@@ -178,7 +180,9 @@ class CommandWatch : public SplitCommand
 	}
 };
 
-class ModuleWatch : public Module
+class ModuleWatch
+	: public Module
+	, public Away::EventListener
 {
 	IRCv3::Monitor::Manager manager;
 	CommandWatch cmd;
@@ -190,7 +194,7 @@ class ModuleWatch : public Module
 			return;
 
 		Numeric::Numeric num(numeric);
-		num.push(nick).push(user->ident).push(user->dhost).push(ConvToStr(shownts)).push(numerictext);
+		num.push(nick).push(user->ident).push(user->GetDisplayedHost()).push(ConvToStr(shownts)).push(numerictext);
 		for (IRCv3::Monitor::WatcherList::const_iterator i = list->begin(); i != list->end(); ++i)
 		{
 			LocalUser* curr = *i;
@@ -210,7 +214,8 @@ class ModuleWatch : public Module
 
  public:
 	ModuleWatch()
-		: manager(this, "watch")
+		: Away::EventListener(this)
+		, manager(this, "watch")
 		, cmd(this, manager)
 	{
 	}
@@ -218,7 +223,7 @@ class ModuleWatch : public Module
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("watch");
-		cmd.maxwatch = tag->getInt("maxwatch", 30, 1);
+		cmd.maxwatch = tag->getUInt("maxwatch", 30, 1);
 	}
 
 	void OnPostConnect(User* user) CXX11_OVERRIDE
@@ -244,14 +249,14 @@ class ModuleWatch : public Module
 		Offline(user, user->nick);
 	}
 
-	ModResult OnSetAway(User* user, const std::string& awaymsg) CXX11_OVERRIDE
+	void OnUserAway(User* user) CXX11_OVERRIDE
 	{
-		if (awaymsg.empty())
-			SendAlert(user, user->nick, RPL_NOTAWAY, "is no longer away", ServerInstance->Time());
-		else
-			SendAlert(user, user->nick, RPL_GONEAWAY, awaymsg.c_str(), user->awaytime);
+		SendAlert(user, user->nick, RPL_GONEAWAY, user->awaymsg.c_str(), user->awaytime);
+	}
 
-		return MOD_RES_PASSTHRU;
+	void OnUserBack(User* user) CXX11_OVERRIDE
+	{
+		SendAlert(user, user->nick, RPL_NOTAWAY, "is no longer away", ServerInstance->Time());
 	}
 
 	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE