X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_watch.cpp;h=4ce4d0340bfbb7a345413c8e002bb6d6a92f7057;hb=53afaa7cadcdf222dcf761441727305f79b4c557;hp=9b68b976f1069b6d1a6815e933859091ca447d93;hpb=4e7c9f5a9257723765f9994aff90440a0b6cf3c9;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp index 9b68b976f..4ce4d0340 100644 --- a/src/modules/m_watch.cpp +++ b/src/modules/m_watch.cpp @@ -30,7 +30,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 @@ -62,9 +62,9 @@ * Yes, it's horrid. Blame cl for being different. -- w00t */ #ifdef WINDOWS -typedef nspace::hash_map, nspace::hash_compare > > watchentries; +typedef nspace::hash_map, nspace::hash_compare > > watchentries; #else -typedef nspace::hash_map, nspace::hash > watchentries; +typedef nspace::hash_map, nspace::hash > watchentries; #endif typedef std::map watchlist; @@ -76,11 +76,11 @@ watchentries* whos_watching_me; /** 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)) @@ -114,7 +114,7 @@ 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); + std::deque::iterator n = std::find(x->second.begin(), x->second.end(), user); if (n != x->second.end()) /* I'm no longer watching you... */ x->second.erase(n); @@ -131,7 +131,7 @@ 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)) { @@ -164,12 +164,12 @@ 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)) @@ -192,13 +192,14 @@ class cmd_watch : public command_t 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** parameters, int pcnt, User *user) { if (!pcnt) { @@ -230,7 +231,7 @@ 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); + std::deque::iterator n = std::find(x->second.begin(), x->second.end(), user); if (n != x->second.end()) /* I'm no longer watching you... */ x->second.erase(n); @@ -300,7 +301,7 @@ class cmd_watch : public command_t class Modulewatch : public Module { - cmd_watch* mycommand; + CommandWatch* mycommand; unsigned int maxwatch; public: @@ -309,11 +310,13 @@ class Modulewatch : public Module { OnRehash(NULL, ""); whos_watching_me = new watchentries(); - mycommand = new cmd_watch(ServerInstance, maxwatch); + mycommand = new CommandWatch(ServerInstance, maxwatch); ServerInstance->AddCommand(mycommand); + Implementation eventlist[] = { I_OnRehash, I_OnGarbageCollect, I_OnCleanup, I_OnUserQuit, I_OnPostConnect, I_OnUserPostNick, I_On005Numeric }; + ServerInstance->Modules->Attach(eventlist, this, 7); } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { ConfigReader Conf(ServerInstance); maxwatch = Conf.ReadInteger("watch", "maxentries", 0, true); @@ -321,17 +324,13 @@ class Modulewatch : public Module maxwatch = 32; } - void Implements(char* List) - { - List[I_OnRehash] = List[I_OnGarbageCollect] = List[I_OnCleanup] = List[I_OnUserQuit] = List[I_OnPostConnect] = List[I_OnUserPostNick] = List[I_On005Numeric] = 1; - } - virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message) + virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) { 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++) { if (!user->Visibility || user->Visibility->VisibleTo(user)) (*n)->WriteServ("601 %s %s %s %s %lu :went offline", (*n)->nick ,user->nick, user->ident, user->dhost, ServerInstance->Time()); @@ -354,7 +353,7 @@ class Modulewatch : public Module 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); + std::deque::iterator n = std::find(x->second.begin(), x->second.end(), user); if (n != x->second.end()) /* I'm no longer watching you... */ x->second.erase(n); @@ -385,7 +384,7 @@ class Modulewatch : public Module if (target_type == TYPE_USER) { watchlist* wl; - userrec* user = (userrec*)item; + User* user = (User*)item; if (user->GetExt("watchlist", wl)) { @@ -395,12 +394,12 @@ class Modulewatch : public Module } } - virtual void OnPostConnect(userrec* user) + virtual void OnPostConnect(User* user) { 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++) { if (!user->Visibility || user->Visibility->VisibleTo(user)) (*n)->WriteServ("600 %s %s %s %s %lu :arrived online", (*n)->nick, user->nick, user->ident, user->dhost, user->age); @@ -413,35 +412,35 @@ class Modulewatch : public Module } } - virtual void OnUserPostNick(userrec* user, const std::string &oldnick) + virtual void OnUserPostNick(User* user, const std::string &oldnick) { - 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)); if (!user->Visibility || user->Visibility->VisibleTo(user)) - (*n)->WriteServ("600 %s %s %s :arrived online", (*n)->nick, user->nick, (*wl)[user->nick].c_str()); + (*n)->WriteServ("601 %s %s %s %s %lu :went offline", (*n)->nick, oldnick.c_str(), user->ident, user->dhost, 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)) { + (*wl)[user->nick] = std::string(user->ident).append(" ").append(user->dhost).append(" ").append(ConvToStr(user->age)); if (!user->Visibility || user->Visibility->VisibleTo(user)) - (*n)->WriteServ("601 %s %s %s %s %lu :went offline", (*n)->nick, oldnick.c_str(), user->ident, user->dhost, user->age); - (*wl)[oldnick.c_str()] = ""; + (*n)->WriteServ("600 %s %s %s :arrived online", (*n)->nick, user->nick, (*wl)[user->nick].c_str()); } } }