X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_watch.cpp;h=6aa12b4e7197fc1d8f2248eacc64fae5f5b14b07;hb=5b9682275e384635a1fd9f7320cf4d9a604a43b4;hp=e60196c009e7e9e0fc6bd5cd975df396f2d22791;hpb=7f9c6c5118261eac40d9bae22ac2c0ede670512d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp index e60196c00..6aa12b4e7 100644 --- a/src/modules/m_watch.cpp +++ b/src/modules/m_watch.cpp @@ -1,341 +1,545 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. - * This program is free but copyrighted software; see - * the file COPYING for details. + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2005-2008 Craig Edwards + * Copyright (C) 2006-2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis * - * --------------------------------------------------- + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -using namespace std; -#include -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "hashcomp.h" #include "inspircd.h" -/* $ModDesc: Provides support for the /watch command */ +/* $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) + */ + -/** A watchlist entry +/* 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. */ -class watchentry : public classbase + +/* + * 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 + */ + +typedef nspace::hash_map, irc::hash> watchentries; +typedef std::map watchlist; + +/* 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 CommandSVSWatch : public Command { public: - userrec* watcher; - std::string target; -}; + CommandSVSWatch(Module* Creator) : Command(Creator,"SVSWATCH", 2) + { + syntax = " [C|L|S]|[+|-]"; + TRANSLATE3(TR_NICK, TR_TEXT, TR_END); /* we watch for a nick. not a UID. */ + } -typedef std::vector watchlist; -watchlist watches; + CmdResult Handle (const std::vector ¶meters, User *user) + { + if (!ServerInstance->ULine(user->server)) + return CMD_FAILURE; + + User *u = ServerInstance->FindNick(parameters[0]); + if (!u) + return CMD_FAILURE; + + if (IS_LOCAL(u)) + { + ServerInstance->Parser->CallHandler("WATCH", parameters, u); + } + + return CMD_SUCCESS; + } + + RouteDescriptor GetRouting(User* user, const std::vector& parameters) + { + User* target = ServerInstance->FindNick(parameters[0]); + if (target) + return ROUTE_OPT_UCAST(target->server); + return ROUTE_LOCALONLY; + } +}; /** Handle /WATCH */ -class cmd_watch : public command_t +class CommandWatch : public Command { + unsigned int& MAX_WATCH; public: - cmd_watch (InspIRCd* Instance) : command_t(Instance,"WATCH",0,0) + SimpleExtItem ext; + 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 = ext.get(user); + if (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->empty()) + { + ext.unset(user); + } + + 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.empty()) + /* nobody else is, either. */ + whos_watching_me->erase(nick); + } + } + + return CMD_SUCCESS; + } + + 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 = ext.get(user); + if (!wl) + { + wl = new watchlist(); + ext.set(user, 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) + { + (*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_SUCCESS; + } + + CommandWatch(Module* parent, unsigned int &maxwatch) : Command(parent,"WATCH", 0), MAX_WATCH(maxwatch), ext("watchlist", parent) { - this->source = "m_watch.so"; syntax = "[C|L|S]|[+|-]"; + TRANSLATE2(TR_TEXT, TR_END); /* we watch for a nick. not a UID. */ } - CmdResult Handle (const char** parameters, int pcnt, userrec *user) + CmdResult Handle (const std::vector ¶meters, User *user) { - if (!pcnt) + if (parameters.empty()) { - for (watchlist::iterator q = watches.begin(); q != watches.end(); q++) + watchlist* wl = ext.get(user); + if (wl) { - watchentry* a = (watchentry*)(*q); - if (a->watcher == user) + for (watchlist::iterator q = wl->begin(); q != wl->end(); q++) { - userrec* targ = ServerInstance->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 = ext.get(user); + if (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.empty()) + /* nobody else is, either. */ + whos_watching_me->erase(i2); } } + + ext.unset(user); } } else if (!strcasecmp(nick,"L")) { - for (watchlist::iterator q = watches.begin(); q != watches.end(); q++) + watchlist* wl = ext.get(user); + if (wl) { - watchentry* a = (watchentry*)(*q); - if (a->watcher == user) + for (watchlist::iterator q = wl->begin(); q != wl->end(); q++) { - userrec* targ = ServerInstance->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 = ext.get(user); + int you_have = 0; + int youre_on = 0; + std::string list; + + if (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++; - if (!ServerInstance->IsNick(nick)) - { - user->WriteServ("942 %s %s :Invalid nickname",user->nick,nick); - return CMD_FAILURE; - } - 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 = ServerInstance->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++; - if (!ServerInstance->IsNick(nick)) - { - user->WriteServ("942 %s %s :Invalid nickname",user->nick,nick); - return CMD_FAILURE; - } - 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); - ServerInstance->Log(DEBUG,"*** Added %s to watchlist of %s",nick,user->nick); - } - userrec* a = ServerInstance->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); } } } - /* So that spanningtree doesnt pass the WATCH commands to the network! */ - return CMD_FAILURE; + return CMD_SUCCESS; } }; class Modulewatch : public Module { - cmd_watch* mycommand; + unsigned int maxwatch; + CommandWatch cmdw; + CommandSVSWatch sw; + public: + Modulewatch() + : maxwatch(32), cmdw(this, maxwatch), sw(this) + { + OnRehash(NULL); + whos_watching_me = new watchentries(); + ServerInstance->AddCommand(&cmdw); + ServerInstance->AddCommand(&sw); + ServerInstance->Extensions.Register(&cmdw.ext); + Implementation eventlist[] = { I_OnRehash, I_OnGarbageCollect, I_OnUserQuit, I_OnPostConnect, I_OnUserPostNick, I_On005Numeric, I_OnSetAway }; + ServerInstance->Modules->Attach(eventlist, this, 7); + } - Modulewatch(InspIRCd* Me) - : Module::Module(Me) + virtual void OnRehash(User* user) { - - mycommand = new cmd_watch(ServerInstance); - ServerInstance->AddCommand(mycommand); + ConfigReader Conf; + maxwatch = Conf.ReadInteger("watch", "maxentries", 0, true); + if (!maxwatch) + maxwatch = 32; } - void Implements(char* List) + virtual ModResult OnSetAway(User *user, const std::string &awaymsg) { - List[I_OnUserQuit] = List[I_OnPostConnect] = List[I_OnUserPostNick] = List[I_On005Numeric] = 1; + std::string numeric; + int inum; + + if (awaymsg.empty()) + { + numeric = user->nick + " " + user->ident + " " + user->dhost + " " + ConvToStr(ServerInstance->Time()) + " :is no longer away"; + inum = 599; + } + else + { + numeric = 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++) + { + (*n)->WriteNumeric(inum, numeric); + } + } + + return MOD_RES_PASSTHRU; } - virtual void OnUserQuit(userrec* user, const std::string &reason) + virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) { - ServerInstance->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++) { - ServerInstance->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)); + (*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 = cmdw.ext.get(*n); + if (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 = cmdw.ext.get(user); + if (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.empty()) + /* and nobody else is, either. */ + whos_watching_me->erase(i2); } } } } - virtual void OnPostConnect(userrec* user) + virtual void OnGarbageCollect() + { + 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 OnPostConnect(User* user) { - irc::string n2 = user->nick; - ServerInstance->Log(DEBUG,"*** WATCH: On global connect: user %s",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++) { - ServerInstance->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); + (*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 = cmdw.ext.get(*n); + if (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)); } } } - virtual void OnUserPostNick(userrec* user, const std::string &oldnick) + virtual void OnUserPostNick(User* user, const std::string &oldnick) { - irc::string n2 = oldnick.c_str(); - irc::string n3 = user->nick; - ServerInstance->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 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()) { - 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 = new_offline->second.begin(); n != new_offline->second.end(); n++) { - ServerInstance->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)); + 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); + (*wl)[oldnick.c_str()] = ""; + } } - else if (n1 == n3) + } + + if (new_online != whos_watching_me->end()) + { + for (std::deque::iterator n = new_online->second.begin(); n != new_online->second.end(); n++) { - // changed from a nick not on notify to one that is - ServerInstance->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 = cmdw.ext.get(*n); + 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()); + } } } - } + } 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,1,0,1,VF_VENDOR,API_VERSION); - } -}; - -class ModulewatchFactory : public ModuleFactory -{ - public: - ModulewatchFactory() - { - } - - ~ModulewatchFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) + virtual Version GetVersion() { - return new Modulewatch(Me); + return Version("Provides support for the /WATCH command", VF_OPTCOMMON | VF_VENDOR); } - }; - -extern "C" void * init_module( void ) -{ - return new ModulewatchFactory; -} +MODULE_INIT(Modulewatch)