X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_watch.cpp;h=94f53c16451ab4fbedd644fbb95bb15773adc739;hb=67de413cad88194972d55a8ff88464370890c5a9;hp=1a05946373bc07b5618809fbbd93aa92cc42cbc9;hpb=4ab1c43c1eee708fc50a4808f714a731891b75e8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp
index 1a0594637..94f53c164 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,7 +105,7 @@ 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)
@@ -146,7 +144,7 @@ class CommandWatch : public Command
 	CmdResult remove_watch(User* user, const char* nick)
 	{
 		// removing an item from the list
-		if (!ServerInstance->IsNick(nick, ServerInstance->Config->Limits.NickMax))
+		if (!ServerInstance->IsNick(nick))
 		{
 			user->WriteNumeric(942, "%s %s :Invalid nickname", user->nick.c_str(), nick);
 			return CMD_FAILURE;
@@ -196,7 +194,7 @@ class CommandWatch : public Command
 
 	CmdResult add_watch(User* user, const char* nick)
 	{
-		if (!ServerInstance->IsNick(nick, ServerInstance->Config->Limits.NickMax))
+		if (!ServerInstance->IsNick(nick))
 		{
 			user->WriteNumeric(942, "%s %s :Invalid nickname",user->nick.c_str(),nick);
 			return CMD_FAILURE;
@@ -255,7 +253,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)
@@ -383,8 +380,6 @@ class Modulewatch : public Module
 		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