diff options
| -rw-r--r-- | include/inspircd.h | 5 | ||||
| -rw-r--r-- | src/commands/cmd_lusers.cpp | 2 | ||||
| -rw-r--r-- | src/helperfuncs.cpp | 6 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/main.cpp | 4 |
4 files changed, 3 insertions, 14 deletions
diff --git a/include/inspircd.h b/include/inspircd.h index 28d2d534c..eef05116b 100644 --- a/include/inspircd.h +++ b/include/inspircd.h @@ -681,11 +681,6 @@ class CoreExport InspIRCd : public classbase */ int RegisteredUserCount(); - /** Return a count of invisible (umode +i) users only - * @return The number of invisible users - */ - int InvisibleUserCount(); - /** Return a count of opered (umode +o) users only * @return The number of opers */ diff --git a/src/commands/cmd_lusers.cpp b/src/commands/cmd_lusers.cpp index 04f2906ac..3088169a7 100644 --- a/src/commands/cmd_lusers.cpp +++ b/src/commands/cmd_lusers.cpp @@ -25,7 +25,7 @@ CmdResult CommandLusers::Handle (const char** parameters, int pcnt, User *user) { // this lusers command shows one server at all times because // a protocol module must override it to show those stats. - user->WriteServ("251 %s :There are %d users and %d invisible on 1 server",user->nick,ServerInstance->UserCount()-ServerInstance->InvisibleUserCount(),ServerInstance->InvisibleUserCount()); + user->WriteServ("251 %s :There are %d users and %d invisible on 1 server",user->nick,ServerInstance->UserCount()-ServerInstance->ModeCount('i'),ServerInstance->ModeCount('i')); if (ServerInstance->OperCount()) user->WriteServ("252 %s %d :operator(s) online",user->nick,ServerInstance->OperCount()); if (ServerInstance->UnregisteredUserCount()) diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index 388e9bb50..4fe1fb3b2 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -360,12 +360,6 @@ int InspIRCd::ModeCount(const char mode) return 0; } -/* wrapper for readability */ -int InspIRCd::InvisibleUserCount() -{ - return ModeCount('i'); -} - /* return how many users are opered */ int InspIRCd::OperCount() { diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index 2ccf510c7..7a0c0a2e1 100644 --- a/src/modules/m_spanningtree/main.cpp +++ b/src/modules/m_spanningtree/main.cpp @@ -134,8 +134,8 @@ void ModuleSpanningTree::HandleLusers(const char** parameters, int pcnt, User* u } } user->WriteServ("251 %s :There are %d users and %d invisible on %d servers",user->nick, - n_users-ServerInstance->InvisibleUserCount(), - ServerInstance->InvisibleUserCount(), + n_users-ServerInstance->ModeCount('i'), + ServerInstance->ModeCount('i'), ulined_count ? this->CountServs() - ulined_count : this->CountServs()); if (ServerInstance->OperCount()) |