X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_watch.cpp;h=60ea79a83cb2adafae55164ab3f3493016d9eff2;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=3b87ed4c31ea1664ad236e88d6f7bf574d94d534;hpb=fd655fa93a00a5f2993adb7ef562b6dbab8aa87c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp
index 3b87ed4c3..60ea79a83 100644
--- a/src/modules/m_watch.cpp
+++ b/src/modules/m_watch.cpp
@@ -242,7 +242,7 @@ class CommandWatch : public Command
 			{
 				(*wl)[nick] = std::string(target->ident).append(" ").append(target->dhost).append(" ").append(ConvToStr(target->age));
 				user->WriteNumeric(604, "%s %s %s :is online",user->nick.c_str(), nick, (*wl)[nick].c_str());
-				if (IS_AWAY(target))
+				if (target->IsAway())
 				{
 					user->WriteNumeric(609, "%s %s %s %s %lu :is away", user->nick.c_str(), target->nick.c_str(), target->ident.c_str(), target->dhost.c_str(), (unsigned long) target->awaytime);
 				}
@@ -320,7 +320,7 @@ class CommandWatch : public Command
 							{
 								user->WriteNumeric(604, "%s %s %s :is online", user->nick.c_str(), q->first.c_str(), q->second.c_str());
 								User *targ = ServerInstance->FindNick(q->first.c_str());
-								if (IS_AWAY(targ))
+								if (targ->IsAway())
 								{
 									user->WriteNumeric(609, "%s %s %s %s %lu :is away", user->nick.c_str(), targ->nick.c_str(), targ->ident.c_str(), targ->dhost.c_str(), (unsigned long) targ->awaytime);
 								}
@@ -527,10 +527,9 @@ class Modulewatch : public Module
 		}
 	}
 
-	virtual void On005Numeric(std::string &output)
+	virtual void On005Numeric(std::map<std::string, std::string>& tokens)
 	{
-		// we don't really have a limit...
-		output = output + " WATCH=" + ConvToStr(maxwatch);
+		tokens["WATCH"] = ConvToStr(maxwatch);
 	}
 
 	virtual ~Modulewatch()
@@ -545,4 +544,3 @@ class Modulewatch : public Module
 };
 
 MODULE_INIT(Modulewatch)
-