X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_watch.cpp;h=19521dba6deef73bd7268daa7f218a8ed702aaf6;hb=05cc48f1894e40f8a34496bf54a60d8b911e6a5e;hp=b4549509fe2e081bc4ab26f1a25c0f31139c8f3d;hpb=69b3f63bb1d1dffcc9eaa706041f873a46c999e9;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp index b4549509f..19521dba6 100644 --- a/src/modules/m_watch.cpp +++ b/src/modules/m_watch.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -11,14 +11,36 @@ * --------------------------------------------------- */ -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "hashcomp.h" #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) + */ + + /* This module has been refactored to provide a very efficient (in terms of cpu time) * implementation of /WATCH. * @@ -34,7 +56,7 @@ * 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 userrec whilst they + * 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 @@ -61,8 +83,16 @@ * of users using WATCH. */ -typedef nspace::hash_map, nspace::hash > watchentries; -typedef std::map watchlist; +/* + * 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; /* Who's watching each nickname. * NOTE: We do NOT iterate this to display a user's WATCH list! @@ -70,18 +100,46 @@ typedef std::map */ watchentries* whos_watching_me; +class CommandSVSWatch : public Command +{ + public: + 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 char* const* parameters, int pcnt, 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", ¶meters[1], 1, u); + } + + return CMD_SUCCESS; + } +}; + /** Handle /WATCH */ -class cmd_watch : public command_t +class CommandWatch : public Command { unsigned int& MAX_WATCH; public: - CmdResult remove_watch(userrec* user, const char* nick) + CmdResult remove_watch(User* user, const char* nick) { // removing an item from the list if (!ServerInstance->IsNick(nick)) { - user->WriteServ("942 %s %s :Invalid nickname", user->nick, nick); + user->WriteNumeric(942, "%s %s :Invalid nickname", user->nick, nick); return CMD_FAILURE; } @@ -90,12 +148,16 @@ class cmd_watch : public command_t { /* 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->WriteServ("602 %s %s %s :stopped watching", user->nick, n->first.c_str(), n->second.c_str()); + user->WriteNumeric(602, "%s %s %s :stopped watching", user->nick, n->first.c_str(), n->second.c_str()); else - user->WriteServ("602 %s %s * * 0 :stopped watching", user->nick, nick); + user->WriteNumeric(602, "%s %s * * 0 :stopped watching", user->nick, nick); wl->erase(n); } @@ -110,10 +172,10 @@ class cmd_watch : public command_t if (x != whos_watching_me->end()) { /* People are watching this user, am i one of them? */ - std::deque::iterator n = std::find(x->second.begin(), x->second.end(), user); - if (n != x->second.end()) + 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(n); + x->second.erase(n2); if (!x->second.size()) whos_watching_me->erase(nick); @@ -127,32 +189,30 @@ class cmd_watch : public command_t return CMD_FAILURE; } - CmdResult add_watch(userrec* user, const char* nick) + CmdResult add_watch(User* user, const char* nick) { if (!ServerInstance->IsNick(nick)) { - user->WriteServ("942 %s %s :Invalid nickname",user->nick,nick); + user->WriteNumeric(942, "%s %s :Invalid nickname",user->nick,nick); return CMD_FAILURE; } watchlist* wl; if (!user->GetExt("watchlist", wl)) { - ServerInstance->Log(DEBUG,"Allocate new watchlist"); wl = new watchlist(); user->Extend("watchlist", wl); } if (wl->size() == MAX_WATCH) { - user->WriteServ("512 %s %s :Too many WATCH entries", user->nick, nick); + user->WriteNumeric(512, "%s %s :Too many WATCH entries", user->nick, nick); return CMD_FAILURE; } watchlist::iterator n = wl->find(nick); if (n == wl->end()) { - ServerInstance->Log(DEBUG,"*** Add to WATCH: '%s'", nick); /* 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()) @@ -162,38 +222,46 @@ class cmd_watch : public command_t } else { - std::deque newlist; + std::deque newlist; newlist.push_back(user); (*(whos_watching_me))[nick] = newlist; } - userrec* target = ServerInstance->FindNick(nick); + 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, nick); + return CMD_FAILURE; + } + (*wl)[nick] = std::string(target->ident).append(" ").append(target->dhost).append(" ").append(ConvToStr(target->age)); - user->WriteServ("604 %s %s %s :is online",user->nick, nick, (*wl)[nick].c_str()); + user->WriteNumeric(604, "%s %s %s :is online",user->nick, nick, (*wl)[nick].c_str()); + if (IS_AWAY(target)) + { + user->WriteNumeric(609, "%s %s %s %s %lu :is away", user->nick, target->nick, target->ident, target->dhost, (unsigned long) target->awaytime); + } } else { (*wl)[nick] = ""; - user->WriteServ("605 %s %s * * 0 :is offline",user->nick, nick); + user->WriteNumeric(605, "%s %s * * 0 :is offline",user->nick, nick); } } - else - { - ServerInstance->Log(DEBUG,"*** WATCH entry '%s' already exists!", nick); - } return CMD_FAILURE; } - cmd_watch (InspIRCd* Instance, unsigned int &maxwatch) : command_t(Instance,"WATCH",0,0), MAX_WATCH(maxwatch) + 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. */ } - CmdResult Handle (const char** parameters, int pcnt, userrec *user) + CmdResult Handle (const char* const* parameters, int pcnt, User *user) { if (!pcnt) { @@ -203,17 +271,16 @@ class cmd_watch : public command_t for (watchlist::iterator q = wl->begin(); q != wl->end(); q++) { if (!q->second.empty()) - user->WriteServ("604 %s %s %s :is online", user->nick, q->first.c_str(), q->second.c_str()); + user->WriteNumeric(604, "%s %s %s :is online", user->nick, 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); } else if (pcnt > 0) { for (int x = 0; x < pcnt; x++) { const char *nick = parameters[x]; - ServerInstance->Log(DEBUG,"WATCH iterate item '%s'", nick); if (!strcasecmp(nick,"C")) { // watch clear @@ -222,16 +289,16 @@ class cmd_watch : public command_t { for (watchlist::iterator i = wl->begin(); i != wl->end(); i++) { - watchentries::iterator x = whos_watching_me->find(i->first); - if (x != whos_watching_me->end()) + watchentries::iterator i2 = whos_watching_me->find(i->first); + if (i2 != whos_watching_me->end()) { /* People are watching this user, am i one of them? */ - std::deque::iterator n = std::find(x->second.begin(), x->second.end(), user); - if (n != x->second.end()) + std::deque::iterator n = std::find(i2->second.begin(), i2->second.end(), user); + if (n != i2->second.end()) /* I'm no longer watching you... */ - x->second.erase(n); + i2->second.erase(n); - if (!x->second.size()) + if (!i2->second.size()) whos_watching_me->erase(user->nick); } } @@ -248,12 +315,19 @@ class cmd_watch : public command_t for (watchlist::iterator q = wl->begin(); q != wl->end(); q++) { if (!q->second.empty()) - user->WriteServ("604 %s %s %s :is online", user->nick, q->first.c_str(), q->second.c_str()); + { + user->WriteNumeric(604, "%s %s %s :is online", user->nick, 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, targ->nick, targ->ident, targ->dhost, (unsigned long) targ->awaytime); + } + } else - user->WriteServ("605 %s %s * * 0 :is offline", user->nick, q->first.c_str()); + user->WriteNumeric(605, "%s %s * * 0 :is offline", user->nick, q->first.c_str()); } } - user->WriteServ("607 %s :End of WATCH list",user->nick); + user->WriteNumeric(607, "%s :End of WATCH list",user->nick); } else if (!strcasecmp(nick,"S")) { @@ -269,13 +343,13 @@ class cmd_watch : public command_t you_have = wl->size(); } - watchentries::iterator x = whos_watching_me->find(user->nick); - if (x != whos_watching_me->end()) - youre_on = x->second.size(); + watchentries::iterator i2 = whos_watching_me->find(user->nick); + if (i2 != whos_watching_me->end()) + youre_on = i2->second.size(); - user->WriteServ("603 %s :You have %d and are on %d WATCH entries", user->nick, you_have, youre_on); - user->WriteServ("606 %s :%s",user->nick, list.c_str()); - user->WriteServ("607 %s :End of WATCH S",user->nick); + user->WriteNumeric(603, "%s :You have %d and are on %d WATCH entries", user->nick, you_have, youre_on); + user->WriteNumeric(606, "%s :%s",user->nick, list.c_str()); + user->WriteNumeric(607, "%s :End of WATCH S",user->nick); } else if (nick[0] == '-') { @@ -296,32 +370,71 @@ class cmd_watch : public command_t class Modulewatch : public Module { - cmd_watch* mycommand; + CommandWatch* mycommand; + CommandSVSWatch *sw; unsigned int maxwatch; + public: - Modulewatch(InspIRCd* Me) - : Module::Module(Me), maxwatch(32) + : Module(Me), maxwatch(32) { + OnRehash(NULL, ""); whos_watching_me = new watchentries(); - mycommand = new cmd_watch(ServerInstance, maxwatch); + 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); } - void Implements(char* List) + virtual void OnRehash(User* user, const std::string ¶meter) { - List[I_OnGarbageCollect] = List[I_OnCleanup] = List[I_OnUserQuit] = List[I_OnPostConnect] = List[I_OnUserPostNick] = List[I_On005Numeric] = 1; + ConfigReader Conf(ServerInstance); + maxwatch = Conf.ReadInteger("watch", "maxentries", 0, true); + if (!maxwatch) + maxwatch = 32; + } + + virtual int OnSetAway(User *user, const std::string &awaymsg) + { + 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); + 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) { - ServerInstance->Log(DEBUG,"*** WATCH: On global quit: user %s",user->nick); watchentries::iterator x = whos_watching_me->find(user->nick); if (x != whos_watching_me->end()) { - for (std::deque::iterator n = x->second.begin(); n != x->second.end(); n++) + for (std::deque::iterator n = x->second.begin(); n != x->second.end(); n++) { - (*n)->WriteServ("601 %s %s %s %s %lu :went offline", (*n)->nick ,user->nick, user->ident, user->dhost, ServerInstance->Time()); + if (!user->Visibility || user->Visibility->VisibleTo(user)) + (*n)->WriteNumeric(601, "%s %s %s %s %lu :went offline", (*n)->nick ,user->nick, user->ident, user->dhost, (unsigned long) ServerInstance->Time()); + watchlist* wl; if ((*n)->GetExt("watchlist", wl)) /* We were on somebody's notify list, set ourselves offline */ @@ -336,42 +449,43 @@ class Modulewatch : public Module /* 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++) { - watchentries::iterator x = whos_watching_me->find(i->first); - if (x != whos_watching_me->end()) + watchentries::iterator i2 = whos_watching_me->find(i->first); + if (i2 != whos_watching_me->end()) { /* People are watching this user, am i one of them? */ - std::deque::iterator n = std::find(x->second.begin(), x->second.end(), user); - if (n != x->second.end()) + std::deque::iterator n = std::find(i2->second.begin(), i2->second.end(), user); + if (n != i2->second.end()) /* I'm no longer watching you... */ - x->second.erase(n); + i2->second.erase(n); - if (!x->second.size()) + if (!i2->second.size()) whos_watching_me->erase(user->nick); } } /* User's quitting, we're done with this. */ delete wl; + user->Shrink("watchlist"); } } virtual void OnGarbageCollect() { watchentries* old_watch = whos_watching_me; - whos_watching_me = new watchentries(); + 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; + delete old_watch; } - virtual void OnCleanup(int target_type, void* item) + virtual void OnCleanup(int target_type, void* item) { if (target_type == TYPE_USER) { watchlist* wl; - userrec* user = (userrec*)item; + User* user = (User*)item; if (user->GetExt("watchlist", wl)) { @@ -381,15 +495,16 @@ class Modulewatch : public Module } } - virtual void OnPostConnect(userrec* user) + virtual void OnPostConnect(User* user) { - ServerInstance->Log(DEBUG,"*** WATCH: On global connect: user %s",user->nick); watchentries::iterator x = whos_watching_me->find(user->nick); if (x != whos_watching_me->end()) { - for (std::deque::iterator n = x->second.begin(); n != x->second.end(); n++) + for (std::deque::iterator n = x->second.begin(); n != x->second.end(); n++) { - (*n)->WriteServ("600 %s %s %s %s %lu :arrived online", (*n)->nick, user->nick, user->ident, user->dhost, user->age); + if (!user->Visibility || user->Visibility->VisibleTo(user)) + (*n)->WriteNumeric(600, "%s %s %s %s %lu :arrived online", (*n)->nick, user->nick, user->ident, user->dhost, (unsigned long) user->age); + watchlist* wl; if ((*n)->GetExt("watchlist", wl)) /* We were on somebody's notify list, set ourselves online */ @@ -398,37 +513,35 @@ class Modulewatch : public Module } } - virtual void OnUserPostNick(userrec* user, const std::string &oldnick) + virtual void OnUserPostNick(User* user, const std::string &oldnick) { - ServerInstance->Log(DEBUG,"*** WATCH: On global nickchange: old nick: %s new nick: %s",oldnick.c_str(),user->nick); - - watchentries::iterator new_online = whos_watching_me->find(user->nick); watchentries::iterator new_offline = whos_watching_me->find(assign(oldnick)); + watchentries::iterator new_online = whos_watching_me->find(user->nick); - if (new_online != whos_watching_me->end()) + if (new_offline != whos_watching_me->end()) { - for (std::deque::iterator n = new_online->second.begin(); n != new_online->second.end(); n++) + for (std::deque::iterator n = new_offline->second.begin(); n != new_offline->second.end(); n++) { watchlist* wl; if ((*n)->GetExt("watchlist", wl)) { - (*wl)[user->nick] = std::string(user->ident).append(" ").append(user->dhost).append(" ").append(ConvToStr(user->age)); - (*n)->WriteServ("600 %s %s %s :arrived online", (*n)->nick, user->nick, (*wl)[user->nick].c_str()); + if (!user->Visibility || user->Visibility->VisibleTo(user)) + (*n)->WriteNumeric(601, "%s %s %s %s %lu :went offline", (*n)->nick, oldnick.c_str(), user->ident, user->dhost, (unsigned long) user->age); + (*wl)[oldnick.c_str()] = ""; } } } - if (new_offline != whos_watching_me->end()) + if (new_online != whos_watching_me->end()) { - for (std::deque::iterator n = new_offline->second.begin(); n != new_offline->second.end(); n++) + for (std::deque::iterator n = new_online->second.begin(); n != new_online->second.end(); n++) { watchlist* wl; if ((*n)->GetExt("watchlist", wl)) { - /*ServerInstance->Log(DEBUG,"nick=%s", (*n)->nick); - ServerInstance->Log(DEBUG,"nick2=%s", user->nick);*/ - (*n)->WriteServ("601 %s %s %s %s %lu :went offline", (*n)->nick, oldnick.c_str(), user->ident, user->dhost, user->age); - (*wl)[user->nick] = ""; + (*wl)[user->nick] = 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, user->nick, (*wl)[user->nick].c_str()); } } } @@ -437,7 +550,7 @@ class Modulewatch : public Module virtual void On005Numeric(std::string &output) { // we don't really have a limit... - output = output + " WATCH=32"; + output = output + " WATCH=" + ConvToStr(maxwatch); } virtual ~Modulewatch() @@ -447,32 +560,9 @@ class Modulewatch : public Module virtual Version GetVersion() { - return Version(1,1,0,1,VF_VENDOR,API_VERSION); + return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); } }; - -class ModulewatchFactory : public ModuleFactory -{ - public: - ModulewatchFactory() - { - } - - ~ModulewatchFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new Modulewatch(Me); - } - -}; - - -extern "C" void * init_module( void ) -{ - return new ModulewatchFactory; -} +MODULE_INIT(Modulewatch)