ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-09 10:39:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clean up core_lusers.

Browse Source
This commit is contained in:
Sadie Powell 2025-01-25 22:00:14 +00:00
parent aa383e7efd
commit 1d96b3cc5d
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/coremods/core_lusers.cpp
View File

@ -84,25 +84,23 @@ public:
CmdResult CommandLusers::Handle(User* user, const Params& parameters) CmdResult CommandLusers::Handle(User* user, const Params& parameters)
{ {
size_t n_users = ServerInstance->Users.GlobalUserCount();
ProtocolInterface::ServerList serverlist; ProtocolInterface::ServerList serverlist;
ServerInstance->PI->GetServerList(serverlist); ServerInstance->PI->GetServerList(serverlist);
size_t n_serv = serverlist.size();
size_t n_local_servs = 0; // If spanningtree is not loaded GetServerList does nothing.
size_t global_servers = std::max<size_t>(serverlist.size(), 1);
size_t local_servers = 0;
for (const auto& server : serverlist) for (const auto& server : serverlist)
{ {
if (server.parentname == ServerInstance->Config->ServerName) if (server.parentname == ServerInstance->Config->ServerName)
n_local_servs++; local_servers++;
} }
// fix for default GetServerList not returning us
if (!n_serv)
n_serv = 1;
counters.UpdateMaxUsers(); counters.UpdateMaxUsers();
user->WriteNumeric(RPL_LUSERCLIENT, INSP_FORMAT("There are {} users and {} invisible on {} servers", user->WriteNumeric(RPL_LUSERCLIENT, INSP_FORMAT("There are {} users and {} invisible on {} servers",
n_users - counters.invisible, counters.invisible, n_serv)); ServerInstance->Users.GlobalUserCount() - counters.invisible, counters.invisible, global_servers));
size_t opercount = ServerInstance->Users.all_opers.size(); size_t opercount = ServerInstance->Users.all_opers.size();
if (opercount) if (opercount)
@ -112,9 +110,9 @@ CmdResult CommandLusers::Handle(User* user, const Params& parameters)
user->WriteNumeric(RPL_LUSERUNKNOWN, ServerInstance->Users.UnknownUserCount(), "unknown connections"); user->WriteNumeric(RPL_LUSERUNKNOWN, ServerInstance->Users.UnknownUserCount(), "unknown connections");
user->WriteNumeric(RPL_LUSERCHANNELS, ServerInstance->Channels.GetChans().size(), "channels formed"); user->WriteNumeric(RPL_LUSERCHANNELS, ServerInstance->Channels.GetChans().size(), "channels formed");
user->WriteNumeric(RPL_LUSERME, INSP_FORMAT("I have {} clients and {} servers", ServerInstance->Users.LocalUserCount(), n_local_servs)); user->WriteNumeric(RPL_LUSERME, INSP_FORMAT("I have {} clients and {} servers", ServerInstance->Users.LocalUserCount(), local_servers));
user->WriteNumeric(RPL_LOCALUSERS, INSP_FORMAT("Current local users: {} Max: {}", ServerInstance->Users.LocalUserCount(), counters.max_local)); user->WriteNumeric(RPL_LOCALUSERS, INSP_FORMAT("Current local users: {} Max: {}", ServerInstance->Users.LocalUserCount(), counters.max_local));
user->WriteNumeric(RPL_GLOBALUSERS, INSP_FORMAT("Current global users: {} Max: {}", n_users, counters.max_global)); user->WriteNumeric(RPL_GLOBALUSERS, INSP_FORMAT("Current global users: {} Max: {}", ServerInstance->Users.GlobalUserCount(), counters.max_global));
return CmdResult::SUCCESS; return CmdResult::SUCCESS;
} }