X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_watch.cpp;h=029055db4ee9cb8716f66115a32650ee80e11c49;hb=a17421dca39d4afabf7143797baa6e13a19a5a97;hp=9b98ca83badedc4b958e6ab5f3301e89b55b1b08;hpb=2630a87bb13b089e6d0fdcff4bcd0f3a9612e52f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp index 9b98ca83b..029055db4 100644 --- a/src/modules/m_watch.cpp +++ b/src/modules/m_watch.cpp @@ -1,16 +1,25 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2005-2008 Craig Edwards + * Copyright (C) 2006-2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * 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 free but copyrighted software; see - * the file COPYING for details. + * 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 . */ + #include "inspircd.h" /* $ModDesc: Provides support for the /WATCH command */ @@ -90,7 +99,7 @@ #if defined(WINDOWS) && !defined(HASHMAP_DEPRECATED) typedef nspace::hash_map, nspace::hash_compare > > watchentries; #else - typedef nspace::hash_map, nspace::hash > watchentries; + typedef nspace::hash_map, irc::hash> watchentries; #endif typedef std::map watchlist; @@ -103,9 +112,8 @@ watchentries* whos_watching_me; class CommandSVSWatch : public Command { public: - CommandSVSWatch (InspIRCd* Instance) : Command(Instance,"SVSWATCH", 0, 2) + CommandSVSWatch(Module* Creator) : Command(Creator,"SVSWATCH", 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. */ } @@ -126,6 +134,14 @@ class CommandSVSWatch : public Command 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 @@ -134,6 +150,7 @@ class CommandWatch : public Command { unsigned int& MAX_WATCH; public: + SimpleExtItem ext; CmdResult remove_watch(User* user, const char* nick) { // removing an item from the list @@ -143,8 +160,8 @@ class CommandWatch : public Command return CMD_FAILURE; } - watchlist* wl; - if (user->GetExt("watchlist", wl)) + watchlist* wl = ext.get(user); + if (wl) { /* Yup, is on my list */ watchlist::iterator n = wl->find(nick); @@ -164,8 +181,7 @@ class CommandWatch : public Command if (wl->empty()) { - user->Shrink("watchlist"); - delete wl; + ext.unset(user); } watchentries::iterator x = whos_watching_me->find(nick); @@ -183,7 +199,7 @@ class CommandWatch : public Command } } - return CMD_LOCALONLY; + return CMD_SUCCESS; } CmdResult add_watch(User* user, const char* nick) @@ -194,11 +210,11 @@ class CommandWatch : public Command return CMD_FAILURE; } - watchlist* wl; - if (!user->GetExt("watchlist", wl)) + watchlist* wl = ext.get(user); + if (!wl) { wl = new watchlist(); - user->Extend("watchlist", wl); + ext.set(user, wl); } if (wl->size() == MAX_WATCH) @@ -227,13 +243,6 @@ class CommandWatch : public Command 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)) @@ -248,12 +257,11 @@ class CommandWatch : public Command } } - return CMD_LOCALONLY; + return CMD_SUCCESS; } - CommandWatch (InspIRCd* Instance, unsigned int &maxwatch) : Command(Instance,"WATCH",0,0), MAX_WATCH(maxwatch) + 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. */ } @@ -262,8 +270,8 @@ class CommandWatch : public Command { if (parameters.empty()) { - watchlist* wl; - if (user->GetExt("watchlist", wl)) + watchlist* wl = ext.get(user); + if (wl) { for (watchlist::iterator q = wl->begin(); q != wl->end(); q++) { @@ -281,8 +289,8 @@ class CommandWatch : public Command if (!strcasecmp(nick,"C")) { // watch clear - watchlist* wl; - if (user->GetExt("watchlist", wl)) + watchlist* wl = ext.get(user); + if (wl) { for (watchlist::iterator i = wl->begin(); i != wl->end(); i++) { @@ -301,14 +309,13 @@ class CommandWatch : public Command } } - delete wl; - user->Shrink("watchlist"); + ext.unset(user); } } else if (!strcasecmp(nick,"L")) { - watchlist* wl; - if (user->GetExt("watchlist", wl)) + watchlist* wl = ext.get(user); + if (wl) { for (watchlist::iterator q = wl->begin(); q != wl->end(); q++) { @@ -329,12 +336,12 @@ class CommandWatch : public Command } else if (!strcasecmp(nick,"S")) { - watchlist* wl; + watchlist* wl = ext.get(user); int you_have = 0; int youre_on = 0; std::string list; - if (user->GetExt("watchlist", wl)) + if (wl) { for (watchlist::iterator q = wl->begin(); q != wl->end(); q++) list.append(q->first.c_str()).append(" "); @@ -361,7 +368,7 @@ class CommandWatch : public Command } } } - return CMD_LOCALONLY; + return CMD_SUCCESS; } }; @@ -372,26 +379,27 @@ class Modulewatch : public Module CommandSVSWatch sw; public: - Modulewatch(InspIRCd* Me) - : Module(Me), maxwatch(32), cmdw(Me, maxwatch), sw(Me) + Modulewatch() + : maxwatch(32), cmdw(this, maxwatch), sw(this) { OnRehash(NULL); whos_watching_me = new watchentries(); ServerInstance->AddCommand(&cmdw); 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); + 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); } virtual void OnRehash(User* user) { - ConfigReader Conf(ServerInstance); + ConfigReader Conf; maxwatch = Conf.ReadInteger("watch", "maxentries", 0, true); if (!maxwatch) maxwatch = 32; } - virtual int OnSetAway(User *user, const std::string &awaymsg) + virtual ModResult OnSetAway(User *user, const std::string &awaymsg) { std::string numeric; int inum; @@ -412,12 +420,11 @@ class Modulewatch : public Module { for (std::deque::iterator n = x->second.begin(); n != x->second.end(); n++) { - if (!user->Visibility || user->Visibility->VisibleTo(user)) - (*n)->WriteNumeric(inum, numeric); + (*n)->WriteNumeric(inum, numeric); } } - return 0; + return MOD_RES_PASSTHRU; } virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) @@ -427,19 +434,18 @@ class Modulewatch : public Module { for (std::deque::iterator n = x->second.begin(); n != x->second.end(); n++) { - if (!user->Visibility || user->Visibility->VisibleTo(*n)) - (*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()); + (*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)) + watchlist* wl = cmdw.ext.get(*n); + if (wl) /* We were on somebody's notify list, set ourselves offline */ (*wl)[user->nick.c_str()] = ""; } } /* Now im quitting, if i have a notify list, im no longer watching anyone */ - watchlist* wl; - if (user->GetExt("watchlist", wl)) + watchlist* wl = cmdw.ext.get(user); + if (wl) { /* 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++) @@ -458,10 +464,6 @@ class Modulewatch : public Module whos_watching_me->erase(i2); } } - - /* User's quitting, we're done with this. */ - delete wl; - user->Shrink("watchlist"); } } @@ -476,21 +478,6 @@ class Modulewatch : public Module delete old_watch; } - virtual void OnCleanup(int target_type, void* item) - { - if (target_type == TYPE_USER) - { - watchlist* wl; - User* user = (User*)item; - - if (user->GetExt("watchlist", wl)) - { - user->Shrink("watchlist"); - delete wl; - } - } - } - virtual void OnPostConnect(User* user) { watchentries::iterator x = whos_watching_me->find(user->nick.c_str()); @@ -498,11 +485,10 @@ class Modulewatch : public Module { for (std::deque::iterator n = x->second.begin(); n != x->second.end(); n++) { - if (!user->Visibility || user->Visibility->VisibleTo(*n)) - (*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); + (*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)) + 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)); } @@ -518,11 +504,10 @@ class Modulewatch : public Module { for (std::deque::iterator n = new_offline->second.begin(); n != new_offline->second.end(); n++) { - watchlist* wl; - if ((*n)->GetExt("watchlist", wl)) + watchlist* wl = cmdw.ext.get(*n); + if (wl) { - if (!user->Visibility || user->Visibility->VisibleTo(*n)) - (*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); + (*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()] = ""; } } @@ -532,12 +517,11 @@ class Modulewatch : public Module { for (std::deque::iterator n = new_online->second.begin(); n != new_online->second.end(); n++) { - watchlist* wl; - if ((*n)->GetExt("watchlist", wl)) + 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)); - if (!user->Visibility || user->Visibility->VisibleTo(*n)) - (*n)->WriteNumeric(600, "%s %s %s :arrived online", (*n)->nick.c_str(), user->nick.c_str(), (*wl)[user->nick.c_str()].c_str()); + (*n)->WriteNumeric(600, "%s %s %s :arrived online", (*n)->nick.c_str(), user->nick.c_str(), (*wl)[user->nick.c_str()].c_str()); } } } @@ -556,7 +540,7 @@ class Modulewatch : public Module virtual Version GetVersion() { - return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); + return Version("Provides support for the /WATCH command", VF_OPTCOMMON | VF_VENDOR); } };