X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_watch.cpp;h=9cb31a6d88e3460bbc7fc042ce851d3bc2fe3cfd;hb=0e5fb98a6b82af738f6d5c3093d9597d470be3a6;hp=712699775e318396bfa23d1eb547f56ecede8f23;hpb=5c9427cde0a949a17a476311db0a2a275345337b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp
index 712699775..9cb31a6d8 100644
--- a/src/modules/m_watch.cpp
+++ b/src/modules/m_watch.cpp
@@ -22,8 +22,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for the /WATCH command */
-
 
 /*
  * Okay, it's nice that this was documented and all, but I at least understood very little
@@ -107,12 +105,12 @@ class CommandSVSWatch : public Command
 	CommandSVSWatch(Module* Creator) : Command(Creator,"SVSWATCH", 2)
 	{
 		syntax = "<target> [C|L|S]|[+|-<nick>]";
-		TRANSLATE3(TR_NICK, TR_TEXT, TR_END); /* we watch for a nick. not a UID. */
+		TRANSLATE2(TR_NICK, TR_TEXT); /* we watch for a nick. not a UID. */
 	}
 
 	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
-		if (!ServerInstance->ULine(user->server))
+		if (!user->server->IsULine())
 			return CMD_FAILURE;
 
 		User *u = ServerInstance->FindNick(parameters[0]);
@@ -121,7 +119,7 @@ class CommandSVSWatch : public Command
 
 		if (IS_LOCAL(u))
 		{
-			ServerInstance->Parser->CallHandler("WATCH", parameters, u);
+			ServerInstance->Parser.CallHandler("WATCH", parameters, u);
 		}
 
 		return CMD_SUCCESS;
@@ -148,7 +146,7 @@ class CommandWatch : public Command
 		// removing an item from the list
 		if (!ServerInstance->IsNick(nick))
 		{
-			user->WriteNumeric(942, "%s %s :Invalid nickname", user->nick.c_str(), nick);
+			user->WriteNumeric(942, "%s :Invalid nickname", nick);
 			return CMD_FAILURE;
 		}
 
@@ -158,15 +156,12 @@ class CommandWatch : public Command
 			/* Yup, is on my list */
 			watchlist::iterator n = wl->find(nick);
 
-			if (!wl)
-				return CMD_FAILURE;
-
 			if (n != wl->end())
 			{
 				if (!n->second.empty())
-					user->WriteNumeric(602, "%s %s %s :stopped watching", user->nick.c_str(), n->first.c_str(), n->second.c_str());
+					user->WriteNumeric(602, "%s %s :stopped watching", n->first.c_str(), n->second.c_str());
 				else
-					user->WriteNumeric(602, "%s %s * * 0 :stopped watching", user->nick.c_str(), nick);
+					user->WriteNumeric(602, "%s * * 0 :stopped watching", nick);
 
 				wl->erase(n);
 			}
@@ -198,7 +193,7 @@ class CommandWatch : public Command
 	{
 		if (!ServerInstance->IsNick(nick))
 		{
-			user->WriteNumeric(942, "%s %s :Invalid nickname",user->nick.c_str(),nick);
+			user->WriteNumeric(942, "%s :Invalid nickname", nick);
 			return CMD_FAILURE;
 		}
 
@@ -209,9 +204,9 @@ class CommandWatch : public Command
 			ext.set(user, wl);
 		}
 
-		if (wl->size() == MAX_WATCH)
+		if (wl->size() >= MAX_WATCH)
 		{
-			user->WriteNumeric(512, "%s %s :Too many WATCH entries", user->nick.c_str(), nick);
+			user->WriteNumeric(512, "%s :Too many WATCH entries", nick);
 			return CMD_FAILURE;
 		}
 
@@ -233,19 +228,19 @@ class CommandWatch : public Command
 			}
 
 			User* target = ServerInstance->FindNick(nick);
-			if (target)
+			if ((target) && (target->registered == REG_ALL))
 			{
 				(*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());
+				user->WriteNumeric(604, "%s %s :is online", nick, (*wl)[nick].c_str());
 				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);
+					user->WriteNumeric(609, "%s %s %s %lu :is away", target->nick.c_str(), target->ident.c_str(), target->dhost.c_str(), (unsigned long) target->awaytime);
 				}
 			}
 			else
 			{
 				(*wl)[nick].clear();
-				user->WriteNumeric(605, "%s %s * * 0 :is offline",user->nick.c_str(), nick);
+				user->WriteNumeric(605, "%s * * 0 :is offline", nick);
 			}
 		}
 
@@ -255,7 +250,6 @@ class CommandWatch : public Command
 	CommandWatch(Module* parent, unsigned int &maxwatch) : Command(parent,"WATCH", 0), MAX_WATCH(maxwatch), ext("watchlist", parent)
 	{
 		syntax = "[C|L|S]|[+|-<nick>]";
-		TRANSLATE2(TR_TEXT, TR_END); /* we watch for a nick. not a UID. */
 	}
 
 	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
@@ -268,10 +262,10 @@ class CommandWatch : public Command
 				for (watchlist::iterator q = wl->begin(); q != wl->end(); q++)
 				{
 					if (!q->second.empty())
-						user->WriteNumeric(604, "%s %s %s :is online", user->nick.c_str(), q->first.c_str(), q->second.c_str());
+						user->WriteNumeric(604, "%s %s :is online", q->first.c_str(), q->second.c_str());
 				}
 			}
-			user->WriteNumeric(607, "%s :End of WATCH list",user->nick.c_str());
+			user->WriteNumeric(607, ":End of WATCH list");
 		}
 		else if (parameters.size() > 0)
 		{
@@ -311,20 +305,20 @@ class CommandWatch : public Command
 					{
 						for (watchlist::iterator q = wl->begin(); q != wl->end(); q++)
 						{
-							if (!q->second.empty())
+							User* targ = ServerInstance->FindNick(q->first.c_str());
+							if (targ && !q->second.empty())
 							{
-								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());
+								user->WriteNumeric(604, "%s %s :is online", q->first.c_str(), q->second.c_str());
 								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);
+									user->WriteNumeric(609, "%s %s %s %lu :is away", targ->nick.c_str(), targ->ident.c_str(), targ->dhost.c_str(), (unsigned long) targ->awaytime);
 								}
 							}
 							else
-								user->WriteNumeric(605, "%s %s * * 0 :is offline", user->nick.c_str(), q->first.c_str());
+								user->WriteNumeric(605, "%s * * 0 :is offline", q->first.c_str());
 						}
 					}
-					user->WriteNumeric(607, "%s :End of WATCH list",user->nick.c_str());
+					user->WriteNumeric(607, ":End of WATCH list");
 				}
 				else if (!strcasecmp(nick,"S"))
 				{
@@ -344,9 +338,9 @@ class CommandWatch : public Command
 					if (i2 != whos_watching_me->end())
 						youre_on = i2->second.size();
 
-					user->WriteNumeric(603, "%s :You have %d and are on %d WATCH entries", user->nick.c_str(), you_have, youre_on);
-					user->WriteNumeric(606, "%s :%s",user->nick.c_str(), list.c_str());
-					user->WriteNumeric(607, "%s :End of WATCH S",user->nick.c_str());
+					user->WriteNumeric(603, ":You have %d and are on %d WATCH entries", you_have, youre_on);
+					user->WriteNumeric(606, ":%s", list.c_str());
+					user->WriteNumeric(607, ":End of WATCH S");
 				}
 				else if (nick[0] == '-')
 				{
@@ -377,17 +371,7 @@ class Modulewatch : public Module
 		whos_watching_me = new watchentries();
 	}
 
-	void init() CXX11_OVERRIDE
-	{
-		OnRehash(NULL);
-		ServerInstance->Modules->AddService(cmdw);
-		ServerInstance->Modules->AddService(sw);
-		ServerInstance->Modules->AddService(cmdw.ext);
-		Implementation eventlist[] = { I_OnRehash, I_OnGarbageCollect, I_OnUserQuit, I_OnPostConnect, I_OnUserPostNick, I_On005Numeric, I_OnSetAway };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-	}
-
-	void OnRehash(User* user) CXX11_OVERRIDE
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		maxwatch = ServerInstance->Config->ConfValue("watch")->getInt("maxentries", 32);
 		if (!maxwatch)
@@ -429,7 +413,7 @@ class Modulewatch : public Module
 		{
 			for (std::deque<User*>::iterator n = x->second.begin(); n != x->second.end(); n++)
 			{
-				(*n)->WriteNumeric(601, "%s %s %s %s %lu :went offline", (*n)->nick.c_str() ,user->nick.c_str(), user->ident.c_str(), user->dhost.c_str(), (unsigned long) ServerInstance->Time());
+				(*n)->WriteNumeric(601, "%s %s %s %lu :went offline", user->nick.c_str(), user->ident.c_str(), user->dhost.c_str(), (unsigned long) ServerInstance->Time());
 
 				watchlist* wl = cmdw.ext.get(*n);
 				if (wl)
@@ -480,7 +464,7 @@ class Modulewatch : public Module
 		{
 			for (std::deque<User*>::iterator n = x->second.begin(); n != x->second.end(); n++)
 			{
-				(*n)->WriteNumeric(600, "%s %s %s %s %lu :arrived online", (*n)->nick.c_str(), user->nick.c_str(), user->ident.c_str(), user->dhost.c_str(), (unsigned long) user->age);
+				(*n)->WriteNumeric(600, "%s %s %s %lu :arrived online", user->nick.c_str(), user->ident.c_str(), user->dhost.c_str(), (unsigned long) user->age);
 
 				watchlist* wl = cmdw.ext.get(*n);
 				if (wl)
@@ -502,7 +486,7 @@ class Modulewatch : public Module
 				watchlist* wl = cmdw.ext.get(*n);
 				if (wl)
 				{
-					(*n)->WriteNumeric(601, "%s %s %s %s %lu :went offline", (*n)->nick.c_str(), oldnick.c_str(), user->ident.c_str(), user->dhost.c_str(), (unsigned long) user->age);
+					(*n)->WriteNumeric(601, "%s %s %s %lu :went offline", oldnick.c_str(), user->ident.c_str(), user->dhost.c_str(), (unsigned long) user->age);
 					(*wl)[oldnick.c_str()].clear();
 				}
 			}
@@ -516,7 +500,7 @@ class Modulewatch : public Module
 				if (wl)
 				{
 					(*wl)[user->nick.c_str()] = std::string(user->ident).append(" ").append(user->dhost).append(" ").append(ConvToStr(user->age));
-					(*n)->WriteNumeric(600, "%s %s %s :arrived online", (*n)->nick.c_str(), user->nick.c_str(), (*wl)[user->nick.c_str()].c_str());
+					(*n)->WriteNumeric(600, "%s %s :arrived online", user->nick.c_str(), (*wl)[user->nick.c_str()].c_str());
 				}
 			}
 		}