Remove a few unnecessary .c_str() calls

[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 6866619c5fb26bc440646c27e623d140eafe025e..7cd0f2ca1c65b7af88fdd14a091322c87b89a43a 100644 (file)
--- a/src/commands/cmd_lusers.cpp
+++ b/src/commands/cmd_lusers.cpp
@@ -24,16 +24,18 @@ struct LusersCounters
 {
        unsigned int max_local;
        unsigned int max_global;
+       unsigned int invisible;
 
-       LusersCounters()
-               : max_local(ServerInstance->Users->LocalUserCount() - ServerInstance->Users->UnregisteredUserCount())
+       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() - ServerInstance->Users->UnregisteredUserCount();
+               unsigned int current = ServerInstance->Users->LocalUserCount();
                if (current > max_local)
                        max_local = current;
 
@@ -70,13 +72,12 @@ 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');
-       ProtoServerList serverlist;
+       unsigned int n_users = ServerInstance->Users->RegisteredUserCount();
+       ProtocolInterface::ServerList serverlist;
        ServerInstance->PI->GetServerList(serverlist);
        unsigned int n_serv = serverlist.size();
        unsigned int n_local_servs = 0;
-       for(ProtoServerList::iterator i = serverlist.begin(); i != serverlist.end(); ++i)
+       for (ProtocolInterface::ServerList::const_iterator i = serverlist.begin(); i != serverlist.end(); ++i)
        {
                if (i->parentname == ServerInstance->Config->ServerName)
                        n_local_servs++;
@@ -87,44 +88,83 @@ CmdResult CommandLusers::Handle (const std::vector<std::string>&, User *user)
 
        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);
+       user->WriteNumeric(RPL_LUSERCLIENT, ":There are %d users and %d invisible on %d servers",
+                       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());
+               user->WriteNumeric(RPL_LUSEROP, "%d :operator(s) online", ServerInstance->Users->OperCount());
 
        if (ServerInstance->Users->UnregisteredUserCount())
-               user->WriteNumeric(253, "%s %d :unknown connections",user->nick.c_str(),ServerInstance->Users->UnregisteredUserCount());
+               user->WriteNumeric(RPL_LUSERUNKNOWN, "%d :unknown connections", ServerInstance->Users->UnregisteredUserCount());
 
-       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(), counters.max_local);
-       user->WriteNumeric(266, "%s :Current Global Users: %d  Max: %d", user->nick.c_str(), n_users, counters.max_global);
+       user->WriteNumeric(RPL_LUSERCHANNELS, "%ld :channels formed", ServerInstance->ChannelCount());
+       user->WriteNumeric(RPL_LUSERME, ":I have %d clients and %d servers", ServerInstance->Users->LocalUserCount(),n_local_servs);
+       user->WriteNumeric(RPL_LOCALUSERS, ":Current Local Users: %d  Max: %d", ServerInstance->Users->LocalUserCount(), counters.max_local);
+       user->WriteNumeric(RPL_GLOBALUSERS, ":Current Global Users: %d  Max: %d", 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;
 
- public:
-       ModuleLusers()
-               : cmd(this, counters)
+       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;
        }
 
-       void init()
+ public:
+       ModuleLusers()
+               : invisiblemode(this, "invisible")
+               , counters(CountInvisible())
+               , cmd(this, counters)
+               , mw(this, counters.invisible)
        {
-               ServerInstance->Modules->AddService(cmd);
-               Implementation events[] = { I_OnPostConnect };
-               ServerInstance->Modules->Attach(events, this, sizeof(events)/sizeof(Implementation));
        }
 
        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--;
        }
 
        Version GetVersion()