X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_watch.cpp;h=bbda1f593faa73cf99ba958beead0719523ae851;hb=d185decae97752368d5cf62311cbc0d1a52aa22c;hp=888827cfa79e50a27ad752302569be9e1d0fd53c;hpb=fea1a27cb96a114f698eedcf90401b78406108fb;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp index 888827cfa..bbda1f593 100644 --- a/src/modules/m_watch.cpp +++ b/src/modules/m_watch.cpp @@ -2,327 +2,567 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2008 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -using namespace std; +#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 + * of it, so I'm going to attempt to explain the data structures in here a bit more. + * + * For efficiency, many data structures are kept. + * + * The first is a global list `watchentries': + * hash_map > + * + * That is, if nick 'w00t' is being watched by user pointer 'Brain' and 'Om', + * will be in the watchentries list. + * + * The second is that each user has a per-user data structure attached to their user record via Extensible: + * std::map watchlist; + * So, in the above example with w00t watched by Brain and Om, we'd have: + * Brain- + * `- w00t + * Om- + * `- w00t + * + * Hopefully this helps any brave soul that ventures into this file other than me. :-) + * -- w00t (mar 30, 2008) + */ + -#include -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "helperfuncs.h" -#include "hashcomp.h" +/* This module has been refactored to provide a very efficient (in terms of cpu time) + * implementation of /WATCH. + * + * To improve the efficiency of watch, many lists are kept. The first primary list is + * a hash_map of who's being watched by who. For example: + * + * KEY: Brain ---> Watched by: Boo, w00t, Om + * KEY: Boo ---> Watched by: Brain, w00t + * + * This is used when we want to tell all the users that are watching someone that + * they are now available or no longer available. For example, if the hash was + * populated as shown above, then when Brain signs on, messages are sent to Boo, w00t + * and Om by reading their 'watched by' list. When this occurs, their online status + * in each of these users lists (see below) is also updated. + * + * Each user also has a seperate (smaller) map attached to their User whilst they + * have any watch entries, which is managed by class Extensible. When they add or remove + * a watch entry from their list, it is inserted here, as well as the main list being + * maintained. This map also contains the user's online status. For users that are + * offline, the key points at an empty string, and for users that are online, the key + * points at a string containing "users-ident users-host users-signon-time". This is + * stored in this manner so that we don't have to FindUser() to fetch this info, the + * users signon can populate the field for us. + * + * For example, going again on the example above, this would be w00t's watchlist: + * + * KEY: Boo ---> Status: "Boo brains.sexy.babe 535342348" + * KEY: Brain ---> Status: "" + * + * In this list we can see that Boo is online, and Brain is offline. We can then + * use this list for 'WATCH L', and 'WATCH S' can be implemented as a combination + * of the above two data structures, with minimum CPU penalty for doing so. + * + * In short, the least efficient this ever gets is O(n), and thats only because + * there are parts that *must* loop (e.g. telling all users that are watching a + * nick that the user online), however this is a *major* improvement over the + * 1.0 implementation, which in places had O(n^n) and worse in it, because this + * implementation scales based upon the sizes of the watch entries, whereas the + * old system would scale (or not as the case may be) according to the total number + * of users using WATCH. + */ -/* $ModDesc: Provides support for the /watch command */ +/* + * Before you start screaming, this definition is only used here, so moving it to a header is pointless. + * Yes, it's horrid. Blame cl for being different. -- w00t + */ +#ifdef WINDOWS +typedef nspace::hash_map, nspace::hash_compare > > watchentries; +#else +typedef nspace::hash_map, nspace::hash > watchentries; +#endif +typedef std::map watchlist; -static Server *Srv; +/* Who's watching each nickname. + * NOTE: We do NOT iterate this to display a user's WATCH list! + * See the comments above! + */ +watchentries* whos_watching_me; -class watchentry : public classbase +class CommandSVSWatch : public Command { public: - userrec* watcher; - std::string target; -}; + CommandSVSWatch (InspIRCd* Instance) : Command(Instance,"SVSWATCH", 0, 2) + { + this->source = "m_watch.so"; + syntax = " [C|L|S]|[+|-]"; + TRANSLATE3(TR_NICK, TR_TEXT, TR_END); /* we watch for a nick. not a UID. */ + } + + CmdResult Handle (const std::vector ¶meters, User *user) + { + if (!ServerInstance->ULine(user->server)) + return CMD_FAILURE; -typedef std::vector watchlist; -watchlist watches; + User *u = ServerInstance->FindNick(parameters[0]); + if (!u) + return CMD_FAILURE; + + if (IS_LOCAL(u)) + { + ServerInstance->Parser->CallHandler("WATCH", parameters, u); + } + + return CMD_SUCCESS; + } +}; -class cmd_watch : public command_t +/** Handle /WATCH + */ +class CommandWatch : public Command { + unsigned int& MAX_WATCH; public: - cmd_watch() : command_t("WATCH",0,0) + CmdResult remove_watch(User* user, const char* nick) + { + // removing an item from the list + if (!ServerInstance->IsNick(nick, ServerInstance->Config->Limits.NickMax)) + { + user->WriteNumeric(942, "%s %s :Invalid nickname", user->nick.c_str(), nick); + return CMD_FAILURE; + } + + watchlist* wl; + if (user->GetExt("watchlist", wl)) + { + /* 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()); + else + user->WriteNumeric(602, "%s %s * * 0 :stopped watching", user->nick.c_str(), nick); + + wl->erase(n); + } + + if (!wl->size()) + { + user->Shrink("watchlist"); + delete wl; + } + + watchentries::iterator x = whos_watching_me->find(nick); + if (x != whos_watching_me->end()) + { + /* People are watching this user, am i one of them? */ + std::deque::iterator n2 = std::find(x->second.begin(), x->second.end(), user); + if (n2 != x->second.end()) + /* I'm no longer watching you... */ + x->second.erase(n2); + + if (!x->second.size()) + whos_watching_me->erase(nick); + } + } + + /* This might seem confusing, but we return CMD_FAILURE + * to indicate that this message shouldnt be routed across + * the network to other linked servers. + */ + return CMD_FAILURE; + } + + CmdResult add_watch(User* user, const char* nick) + { + if (!ServerInstance->IsNick(nick, ServerInstance->Config->Limits.NickMax)) + { + user->WriteNumeric(942, "%s %s :Invalid nickname",user->nick.c_str(),nick); + return CMD_FAILURE; + } + + watchlist* wl; + if (!user->GetExt("watchlist", wl)) + { + wl = new watchlist(); + user->Extend("watchlist", wl); + } + + if (wl->size() == MAX_WATCH) + { + user->WriteNumeric(512, "%s %s :Too many WATCH entries", user->nick.c_str(), nick); + return CMD_FAILURE; + } + + watchlist::iterator n = wl->find(nick); + if (n == wl->end()) + { + /* Don't already have the user on my watch list, proceed */ + watchentries::iterator x = whos_watching_me->find(nick); + if (x != whos_watching_me->end()) + { + /* People are watching this user, add myself */ + x->second.push_back(user); + } + else + { + std::deque newlist; + newlist.push_back(user); + (*(whos_watching_me))[nick] = newlist; + } + + User* target = ServerInstance->FindNick(nick); + if (target) + { + if (target->Visibility && !target->Visibility->VisibleTo(user)) + { + (*wl)[nick] = ""; + user->WriteNumeric(605, "%s %s * * 0 :is offline",user->nick.c_str(), nick); + return CMD_FAILURE; + } + + (*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)) + { + 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); + } + } + else + { + (*wl)[nick] = ""; + user->WriteNumeric(605, "%s %s * * 0 :is offline",user->nick.c_str(), nick); + } + } + + return CMD_FAILURE; + } + + CommandWatch (InspIRCd* Instance, unsigned int &maxwatch) : Command(Instance,"WATCH",0,0), MAX_WATCH(maxwatch) { this->source = "m_watch.so"; syntax = "[C|L|S]|[+|-]"; + TRANSLATE2(TR_TEXT, TR_END); /* we watch for a nick. not a UID. */ } - void Handle (const char** parameters, int pcnt, userrec *user) + CmdResult Handle (const std::vector ¶meters, User *user) { - if (!pcnt) + if (!parameters.size()) { - for (watchlist::iterator q = watches.begin(); q != watches.end(); q++) + watchlist* wl; + if (user->GetExt("watchlist", wl)) { - watchentry* a = (watchentry*)(*q); - if (a->watcher == user) + for (watchlist::iterator q = wl->begin(); q != wl->end(); q++) { - userrec* targ = Srv->FindNick(a->target); - if (targ) - { - user->WriteServ("604 %s %s %s %s %lu :is online",user->nick,targ->nick,targ->ident,targ->dhost,targ->age); - } + 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->WriteServ("607 %s :End of WATCH list",user->nick); + user->WriteNumeric(607, "%s :End of WATCH list",user->nick.c_str()); } - else if (pcnt > 0) + else if (parameters.size() > 0) { - for (int x = 0; x < pcnt; x++) + for (int x = 0; x < (int)parameters.size(); x++) { - const char *nick = parameters[x]; + const char *nick = parameters[x].c_str(); if (!strcasecmp(nick,"C")) { // watch clear - bool done = false; - while (!done) + watchlist* wl; + if (user->GetExt("watchlist", wl)) { - done = true; - for (watchlist::iterator q = watches.begin(); q != watches.end(); q++) + for (watchlist::iterator i = wl->begin(); i != wl->end(); i++) { - watchentry* a = (watchentry*)(*q); - if (a->watcher == user) + watchentries::iterator i2 = whos_watching_me->find(i->first); + if (i2 != whos_watching_me->end()) { - done = false; - watches.erase(q); - delete a; - break; + /* People are watching this user, am i one of them? */ + std::deque::iterator n = std::find(i2->second.begin(), i2->second.end(), user); + if (n != i2->second.end()) + /* I'm no longer watching you... */ + i2->second.erase(n); + + if (!i2->second.size()) + whos_watching_me->erase(user->nick.c_str()); } } + + delete wl; + user->Shrink("watchlist"); } } else if (!strcasecmp(nick,"L")) { - for (watchlist::iterator q = watches.begin(); q != watches.end(); q++) + watchlist* wl; + if (user->GetExt("watchlist", wl)) { - watchentry* a = (watchentry*)(*q); - if (a->watcher == user) + for (watchlist::iterator q = wl->begin(); q != wl->end(); q++) { - userrec* targ = Srv->FindNick(a->target); - if (targ) + if (!q->second.empty()) { - user->WriteServ("604 %s %s %s %s %lu :is online",user->nick,targ->nick,targ->ident,targ->dhost,targ->age); + 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)) + { + 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); + } } + else + user->WriteNumeric(605, "%s %s * * 0 :is offline", user->nick.c_str(), q->first.c_str()); } } - user->WriteServ("607 %s :End of WATCH list",user->nick); + user->WriteNumeric(607, "%s :End of WATCH list",user->nick.c_str()); } else if (!strcasecmp(nick,"S")) { - std::string list = ""; - for (watchlist::iterator q = watches.begin(); q != watches.end(); q++) + watchlist* wl; + int you_have = 0; + int youre_on = 0; + std::string list; + + if (user->GetExt("watchlist", wl)) { - watchentry* a = (watchentry*)(*q); - if (a->watcher == user) - { - list.append(" ").append(a->target); - } + for (watchlist::iterator q = wl->begin(); q != wl->end(); q++) + list.append(q->first.c_str()).append(" "); + you_have = wl->size(); } - char* l = (char*)list.c_str(); - if (*l == ' ') - l++; - user->WriteServ("606 %s :%s",user->nick,l); - user->WriteServ("607 %s :End of WATCH S",user->nick); + + watchentries::iterator i2 = whos_watching_me->find(user->nick.c_str()); + 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()); } else if (nick[0] == '-') { - // removing an item from the list nick++; - irc::string n1 = nick; - for (watchlist::iterator q = watches.begin(); q != watches.end(); q++) - { - watchentry* b = (watchentry*)(*q); - if (b->watcher == user) - { - irc::string n2 = b->target.c_str(); - userrec* a = Srv->FindNick(b->target); - if (a) - { - user->WriteServ("602 %s %s %s %s %lu :stopped watching",user->nick,a->nick,a->ident,a->dhost,a->age); - } - else - { - user->WriteServ("602 %s %s * * 0 :stopped watching",user->nick,b->target.c_str()); - } - if (n1 == n2) - { - watches.erase(q); - delete b; - break; - } - } - } + remove_watch(user, nick); } else if (nick[0] == '+') { nick++; - irc::string n1 = nick; - bool exists = false; - for (watchlist::iterator q = watches.begin(); q != watches.end(); q++) - { - watchentry* a = (watchentry*)(*q); - if (a->watcher == user) - { - irc::string n2 = a->target.c_str(); - if (n1 == n2) - { - // already on watch list - exists = true; - } - } - } - if (!exists) - { - watchentry* w = new watchentry(); - w->watcher = user; - w->target = nick; - watches.push_back(w); - log(DEBUG,"*** Added %s to watchlist of %s",nick,user->nick); - } - userrec* a = Srv->FindNick(nick); - if (a) - { - user->WriteServ("604 %s %s %s %s %lu :is online",user->nick,a->nick,a->ident,a->dhost,a->age); - } - else - { - user->WriteServ("605 %s %s * * 0 :is offline",user->nick,nick); - } + add_watch(user, nick); } } } - return; + /* So that spanningtree doesnt pass the WATCH commands to the network! */ + return CMD_FAILURE; } }; class Modulewatch : public Module { - cmd_watch* mycommand; + CommandWatch* mycommand; + CommandSVSWatch *sw; + unsigned int maxwatch; + public: + Modulewatch(InspIRCd* Me) + : Module(Me), maxwatch(32) + { + OnRehash(NULL, ""); + whos_watching_me = new watchentries(); + mycommand = new CommandWatch(ServerInstance, maxwatch); + ServerInstance->AddCommand(mycommand); + sw = new CommandSVSWatch(ServerInstance); + ServerInstance->AddCommand(sw); + Implementation eventlist[] = { I_OnRehash, I_OnGarbageCollect, I_OnCleanup, I_OnUserQuit, I_OnPostConnect, I_OnUserPostNick, I_On005Numeric, I_OnSetAway }; + ServerInstance->Modules->Attach(eventlist, this, 8); + } - Modulewatch(Server* Me) - : Module::Module(Me) + virtual void OnRehash(User* user, const std::string ¶meter) { - Srv = Me; - mycommand = new cmd_watch(); - Srv->AddCommand(mycommand); + ConfigReader Conf(ServerInstance); + maxwatch = Conf.ReadInteger("watch", "maxentries", 0, true); + if (!maxwatch) + maxwatch = 32; } - void Implements(char* List) + virtual int OnSetAway(User *user, const std::string &awaymsg) { - List[I_OnUserQuit] = List[I_OnGlobalConnect] = List[I_OnUserPostNick] = List[I_On005Numeric] = 1; + std::string numeric; + int inum; + + if (awaymsg.empty()) + { + numeric = std::string(user->nick) + " " + user->ident + " " + user->dhost + " " + ConvToStr(ServerInstance->Time()) + " :is no longer away"; + inum = 599; + } + else + { + numeric = std::string(user->nick) + " " + user->ident + " " + user->dhost + " " + ConvToStr(ServerInstance->Time()) + " :" + awaymsg; + inum = 598; + } + + watchentries::iterator x = whos_watching_me->find(user->nick.c_str()); + if (x != whos_watching_me->end()) + { + for (std::deque::iterator n = x->second.begin(); n != x->second.end(); n++) + { + if (!user->Visibility || user->Visibility->VisibleTo(user)) + (*n)->WriteNumeric(inum, numeric); + } + } + + return 0; } - virtual void OnUserQuit(userrec* user, const std::string &reason) + virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) { - log(DEBUG,"*** WATCH: On global quit: user %s",user->nick); - irc::string n2 = user->nick; - for (watchlist::iterator q = watches.begin(); q != watches.end(); q++) + watchentries::iterator x = whos_watching_me->find(user->nick.c_str()); + if (x != whos_watching_me->end()) { - watchentry* a = (watchentry*)(*q); - irc::string n1 = a->target.c_str(); - if (n1 == n2) + for (std::deque::iterator n = x->second.begin(); n != x->second.end(); n++) { - log(DEBUG,"*** WATCH: On global quit: user %s is in notify of %s",user->nick,a->watcher->nick); - a->watcher->WriteServ("601 %s %s %s %s %lu :went offline",a->watcher->nick,user->nick,user->ident,user->dhost,time(NULL)); + if (!user->Visibility || user->Visibility->VisibleTo(user)) + (*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()); + + watchlist* wl; + if ((*n)->GetExt("watchlist", wl)) + /* We were on somebody's notify list, set ourselves offline */ + (*wl)[user->nick.c_str()] = ""; } } - bool done = false; - while (!done) + + /* Now im quitting, if i have a notify list, im no longer watching anyone */ + watchlist* wl; + if (user->GetExt("watchlist", wl)) { - done = true; - for (watchlist::iterator q = watches.begin(); q != watches.end(); q++) + /* Iterate every user on my watch list, and take me out of the whos_watching_me map for each one we're watching */ + for (watchlist::iterator i = wl->begin(); i != wl->end(); i++) { - watchentry* a = (watchentry*)(*q); - if (a->watcher == user) + watchentries::iterator i2 = whos_watching_me->find(i->first); + if (i2 != whos_watching_me->end()) { - done = false; - watches.erase(q); - delete a; - break; + /* People are watching this user, am i one of them? */ + std::deque::iterator n = std::find(i2->second.begin(), i2->second.end(), user); + if (n != i2->second.end()) + /* I'm no longer watching you... */ + i2->second.erase(n); + + if (!i2->second.size()) + whos_watching_me->erase(user->nick.c_str()); } } + + /* User's quitting, we're done with this. */ + delete wl; + user->Shrink("watchlist"); } } - virtual void OnGlobalConnect(userrec* user) + virtual void OnGarbageCollect() { - irc::string n2 = user->nick; - log(DEBUG,"*** WATCH: On global connect: user %s",user->nick); - for (watchlist::iterator q = watches.begin(); q != watches.end(); q++) + watchentries* old_watch = whos_watching_me; + whos_watching_me = new watchentries(); + + for (watchentries::const_iterator n = old_watch->begin(); n != old_watch->end(); n++) + whos_watching_me->insert(*n); + + delete old_watch; + } + + virtual void OnCleanup(int target_type, void* item) + { + if (target_type == TYPE_USER) { - watchentry* a = (watchentry*)(*q); - irc::string n1 = a->target.c_str(); - if (n1 == n2) + watchlist* wl; + User* user = (User*)item; + + if (user->GetExt("watchlist", wl)) { - log(DEBUG,"*** WATCH: On global connect: user %s is in notify of %s",user->nick,a->watcher->nick); - a->watcher->WriteServ("600 %s %s %s %s %lu :arrived online",a->watcher->nick,user->nick,user->ident,user->dhost,user->age); + user->Shrink("watchlist"); + delete wl; } } } - virtual void OnUserPostNick(userrec* user, const std::string &oldnick) + virtual void OnPostConnect(User* user) { - irc::string n2 = oldnick.c_str(); - irc::string n3 = user->nick; - log(DEBUG,"*** WATCH: On global nickchange: old nick: %s new nick: %s",oldnick.c_str(),user->nick); - for (watchlist::iterator q = watches.begin(); q != watches.end(); q++) + watchentries::iterator x = whos_watching_me->find(user->nick.c_str()); + if (x != whos_watching_me->end()) { - watchentry* a = (watchentry*)(*q); - irc::string n1 = a->target.c_str(); - // changed from a nick on the watchlist to one that isnt - if (n1 == n2) + for (std::deque::iterator n = x->second.begin(); n != x->second.end(); n++) { - log(DEBUG,"*** WATCH: On global nickchange: old nick %s was on notify list of %s",oldnick.c_str(),a->watcher->nick); - a->watcher->WriteServ("601 %s %s %s %s %lu :went offline",a->watcher->nick,oldnick.c_str(),user->ident,user->dhost,time(NULL)); + if (!user->Visibility || user->Visibility->VisibleTo(user)) + (*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); + + watchlist* wl; + if ((*n)->GetExt("watchlist", wl)) + /* We were on somebody's notify list, set ourselves online */ + (*wl)[user->nick.c_str()] = std::string(user->ident).append(" ").append(user->dhost).append(" ").append(ConvToStr(user->age)); } - else if (n1 == n3) + } + } + + virtual void OnUserPostNick(User* user, const std::string &oldnick) + { + watchentries::iterator new_offline = whos_watching_me->find(oldnick.c_str()); + watchentries::iterator new_online = whos_watching_me->find(user->nick.c_str()); + + if (new_offline != whos_watching_me->end()) + { + for (std::deque::iterator n = new_offline->second.begin(); n != new_offline->second.end(); n++) { - // changed from a nick not on notify to one that is - log(DEBUG,"*** WATCH: On global nickchange: new nick %s is on notify list of %s",user->nick,a->watcher->nick); - a->watcher->WriteServ("600 %s %s %s %s %lu :arrived online",a->watcher->nick,user->nick,user->ident,user->dhost,user->age); + watchlist* wl; + if ((*n)->GetExt("watchlist", wl)) + { + if (!user->Visibility || user->Visibility->VisibleTo(user)) + (*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); + (*wl)[oldnick.c_str()] = ""; + } } } - } + + if (new_online != whos_watching_me->end()) + { + for (std::deque::iterator n = new_online->second.begin(); n != new_online->second.end(); n++) + { + watchlist* wl; + if ((*n)->GetExt("watchlist", wl)) + { + (*wl)[user->nick.c_str()] = std::string(user->ident).append(" ").append(user->dhost).append(" ").append(ConvToStr(user->age)); + if (!user->Visibility || user->Visibility->VisibleTo(user)) + (*n)->WriteNumeric(600, "%s %s %s :arrived online", (*n)->nick.c_str(), user->nick.c_str(), (*wl)[user->nick.c_str()].c_str()); + } + } + } + } virtual void On005Numeric(std::string &output) { // we don't really have a limit... - output = output + " WATCH=999"; + output = output + " WATCH=" + ConvToStr(maxwatch); } - + virtual ~Modulewatch() { + delete whos_watching_me; } - - virtual Version GetVersion() - { - return Version(1,0,0,1,VF_VENDOR); - } -}; - -class ModulewatchFactory : public ModuleFactory -{ - public: - ModulewatchFactory() - { - } - - ~ModulewatchFactory() - { - } - - virtual Module * CreateModule(Server* Me) + virtual Version GetVersion() { - return new Modulewatch(Me); + return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); } - }; - -extern "C" void * init_module( void ) -{ - return new ModulewatchFactory; -} +MODULE_INIT(Modulewatch)