A ton more clear() and empty() stuff thats been lingering on the long term todo for...

[user/henk/code/inspircd.git] / src / modules / m_watch.cpp

diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp
index 28c809d5bb4ab2bfc065e3b58ae834eda981eb24..ca51fc690b90a343d1e3c2ae2775c39d147dd4b8 100644 (file)
--- a/src/modules/m_watch.cpp
+++ b/src/modules/m_watch.cpp
@@ -11,11 +11,11 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 #include "hashcomp.h"
-#include "inspircd.h"
 
 /* $ModDesc: Provides support for the /WATCH command */
 
@@ -61,8 +61,16 @@
  * of users using WATCH.
  */
 
-typedef nspace::hash_map<irc::string, std::deque<userrec*>, nspace::hash<irc::string> >     watchentries;
-typedef std::map<irc::string, std::string>                                                  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<irc::string, std::deque<userrec*>, nspace::hash_compare<irc::string, less<irc::string> > > watchentries;
+#else
+typedef nspace::hash_map<irc::string, std::deque<userrec*>, nspace::hash<irc::string> > watchentries;
+#endif
+typedef std::map<irc::string, std::string>watchlist;
 
 /* Who's watching each nickname.
  * NOTE: We do NOT iterate this to display a user's WATCH list!
@@ -168,6 +176,13 @@ class cmd_watch : public command_t
                        userrec* target = ServerInstance->FindNick(nick);
                        if (target)
                        {
+                               if (target->Visibility && !target->Visibility->VisibleTo(user))
+                               {
+                                       (*wl)[nick] = "";
+                                       user->WriteServ("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());
                        }
@@ -294,16 +309,25 @@ class Modulewatch : public Module
  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);
                ServerInstance->AddCommand(mycommand);
        }
 
+       virtual void OnRehash(userrec* user, const std::string &parameter)
+       {
+               ConfigReader Conf(ServerInstance);
+               maxwatch = Conf.ReadInteger("watch", "maxentries", 0, true);
+               if (!maxwatch)
+                       maxwatch = 32;
+       }
+
        void Implements(char* List)
        {
-               List[I_OnGarbageCollect] = List[I_OnCleanup] = List[I_OnUserQuit] = List[I_OnPostConnect] = List[I_OnUserPostNick] = List[I_On005Numeric] = 1;
+               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)
@@ -313,7 +337,9 @@ class Modulewatch : public Module
                {
                        for (std::deque<userrec*>::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)->WriteServ("601 %s %s %s %s %lu :went offline", (*n)->nick ,user->nick, user->ident, user->dhost, ServerInstance->Time());
+
                                watchlist* wl;
                                if ((*n)->GetExt("watchlist", wl))
                                        /* We were on somebody's notify list, set ourselves offline */
@@ -350,15 +376,15 @@ class Modulewatch : public Module
        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)
                {
@@ -380,7 +406,9 @@ class Modulewatch : public Module
                {
                        for (std::deque<userrec*>::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)->WriteServ("600 %s %s %s %s %lu :arrived online", (*n)->nick, user->nick, user->ident, user->dhost, user->age);
+
                                watchlist* wl;
                                if ((*n)->GetExt("watchlist", wl))
                                        /* We were on somebody's notify list, set ourselves online */
@@ -402,7 +430,8 @@ class Modulewatch : public Module
                                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)->WriteServ("600 %s %s %s :arrived online", (*n)->nick, user->nick, (*wl)[user->nick].c_str());
                                }
                        }
                }
@@ -414,8 +443,9 @@ class Modulewatch : public Module
                                watchlist* wl;
                                if ((*n)->GetExt("watchlist", wl))
                                {
-                                       (*n)->WriteServ("601 %s %s %s %s %lu :went offline", (*n)->nick, oldnick.c_str(), user->ident, user->dhost, user->age);
-                                       (*wl)[user->nick] = "";
+                                       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()] = "";
                                }
                        }
                }
@@ -424,7 +454,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()
@@ -458,7 +488,7 @@ class ModulewatchFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModulewatchFactory;
 }