Replace hardcoded mode letters, part 3

[user/henk/code/inspircd.git] / src / commands / cmd_lusers.cpp

diff --git a/src/commands/cmd_lusers.cpp b/src/commands/cmd_lusers.cpp
index 3dea2c25f5c16b6d295012b7762c508942d59911..c1f35592a04b5691aaf08349b4729749aa5a7ece 100644 (file)
--- a/src/commands/cmd_lusers.cpp
+++ b/src/commands/cmd_lusers.cpp
@@ -20,6 +20,31 @@
 
 #include "inspircd.h"
 
+struct LusersCounters
+{
+       unsigned int max_local;
+       unsigned int max_global;
+       unsigned int invisible;
+
+       LusersCounters(unsigned int inv)
+               : max_local(ServerInstance->Users->LocalUserCount())
+               , max_global(ServerInstance->Users->RegisteredUserCount())
+               , invisible(inv)
+       {
+       }
+
+       inline void UpdateMaxUsers()
+       {
+               unsigned int current = ServerInstance->Users->LocalUserCount();
+               if (current > max_local)
+                       max_local = current;
+
+               current = ServerInstance->Users->RegisteredUserCount();
+               if (current > max_global)
+                       max_global = current;
+       }
+};
+
 /** Handle /LUSERS. These command handlers can be reloaded by the core,
  * and handle basic RFC1459 commands. Commands within modules work
  * the same way, however, they can be fully unloaded, where these
@@ -27,12 +52,12 @@
  */
 class CommandLusers : public Command
 {
-       unsigned int max_local, max_global;
+       LusersCounters& counters;
  public:
        /** Constructor for lusers.
         */
-       CommandLusers ( Module* parent) : Command(parent,"LUSERS",0,0),
-               max_local(0), max_global(0)
+       CommandLusers(Module* parent, LusersCounters& Counters)
+               : Command(parent,"LUSERS",0,0), counters(Counters)
        { }
        /** Handle command.
         * @param parameters The parameters to the comamnd
@@ -47,15 +72,13 @@ class CommandLusers : public Command
  */
 CmdResult CommandLusers::Handle (const std::vector<std::string>&, User *user)
 {
-       unsigned int n_users = ServerInstance->Users->UserCount();
-       unsigned int n_invis = ServerInstance->Users->ModeCount('i');
+       unsigned int n_users = ServerInstance->Users->RegisteredUserCount();
        ProtoServerList serverlist;
        ServerInstance->PI->GetServerList(serverlist);
-       int n_serv = 0;
-       int n_local_servs = 0;
+       unsigned int n_serv = serverlist.size();
+       unsigned int n_local_servs = 0;
        for(ProtoServerList::iterator i = serverlist.begin(); i != serverlist.end(); ++i)
        {
-               n_serv++;
                if (i->parentname == ServerInstance->Config->ServerName)
                        n_local_servs++;
        }
@@ -63,14 +86,10 @@ CmdResult CommandLusers::Handle (const std::vector<std::string>&, User *user)
        if (!n_serv)
                n_serv = 1;
 
-       // these are updated on every connect (or /lusers invocation), which is good enough
-       if (ServerInstance->Users->LocalUserCount() > max_local)
-               max_local = ServerInstance->Users->LocalUserCount();
-       if (n_users > max_global)
-               max_global = n_users;
+       counters.UpdateMaxUsers();
 
        user->WriteNumeric(251, "%s :There are %d users and %d invisible on %d servers",user->nick.c_str(),
-                       n_users-n_invis, n_invis, n_serv);
+                       n_users - counters.invisible, counters.invisible, n_serv);
 
        if (ServerInstance->Users->OperCount())
                user->WriteNumeric(252, "%s %d :operator(s) online",user->nick.c_str(),ServerInstance->Users->OperCount());
@@ -80,25 +99,85 @@ CmdResult CommandLusers::Handle (const std::vector<std::string>&, User *user)
 
        user->WriteNumeric(254, "%s %ld :channels formed",user->nick.c_str(),ServerInstance->ChannelCount());
        user->WriteNumeric(255, "%s :I have %d clients and %d servers",user->nick.c_str(),ServerInstance->Users->LocalUserCount(),n_local_servs);
-       user->WriteNumeric(265, "%s :Current Local Users: %d  Max: %d",user->nick.c_str(),ServerInstance->Users->LocalUserCount(),max_local);
-       user->WriteNumeric(266, "%s :Current Global Users: %d  Max: %d",user->nick.c_str(),n_users,max_global);
+       user->WriteNumeric(265, "%s :Current Local Users: %d  Max: %d", user->nick.c_str(), ServerInstance->Users->LocalUserCount(), counters.max_local);
+       user->WriteNumeric(266, "%s :Current Global Users: %d  Max: %d", user->nick.c_str(), n_users, counters.max_global);
 
        return CMD_SUCCESS;
 }
 
+class InvisibleWatcher : public ModeWatcher
+{
+       unsigned int& invisible;
+public:
+       InvisibleWatcher(Module* mod, unsigned int& Invisible)
+               : ModeWatcher(mod, "invisible", MODETYPE_USER), invisible(Invisible)
+       {
+       }
+
+       void AfterMode(User* source, User* dest, Channel* channel, const std::string& parameter, bool adding)
+       {
+               if (dest->registered != REG_ALL)
+                       return;
+
+               if (adding)
+                       invisible++;
+               else
+                       invisible--;
+       }
+};
+
 class ModuleLusers : public Module
 {
+       UserModeReference invisiblemode;
+       LusersCounters counters;
        CommandLusers cmd;
+       InvisibleWatcher mw;
+
+       unsigned int CountInvisible()
+       {
+               unsigned int c = 0;
+               for (user_hash::iterator i = ServerInstance->Users->clientlist->begin(); i != ServerInstance->Users->clientlist->end(); ++i)
+               {
+                       User* u = i->second;
+                       if (u->IsModeSet(invisiblemode))
+                               c++;
+               }
+               return c;
+       }
 
  public:
        ModuleLusers()
-               : cmd(this)
+               : invisiblemode(this, "invisible")
+               , counters(CountInvisible())
+               , cmd(this, counters)
+               , mw(this, counters.invisible)
        {
        }
 
        void init()
        {
                ServerInstance->Modules->AddService(cmd);
+               Implementation events[] = { I_OnPostConnect, I_OnUserQuit };
+               ServerInstance->Modules->Attach(events, this, sizeof(events)/sizeof(Implementation));
+               ServerInstance->Modes->AddModeWatcher(&mw);
+       }
+
+       void OnPostConnect(User* user)
+       {
+               counters.UpdateMaxUsers();
+               if (user->IsModeSet(invisiblemode))
+                       counters.invisible++;
+       }
+
+       void OnUserQuit(User* user, const std::string& message, const std::string& oper_message)
+       {
+               if (user->IsModeSet(invisiblemode))
+                       counters.invisible--;
+       }
+
+       ~ModuleLusers()
+       {
+               ServerInstance->Modes->DelModeWatcher(&mw);
        }
 
        Version GetVersion()