summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cmd_list.cpp2
-rw-r--r--src/modules/m_safelist.cpp5
2 files changed, 3 insertions, 4 deletions
diff --git a/src/cmd_list.cpp b/src/cmd_list.cpp
index 27a9ce44d..1676a48c0 100644
--- a/src/cmd_list.cpp
+++ b/src/cmd_list.cpp
@@ -49,7 +49,7 @@ void cmd_list::Handle (char **parameters, int pcnt, userrec *user)
bool n = i->second->HasUser(user);
if (((!(i->second->modes[CM_PRIVATE])) && (!(i->second->modes[CM_SECRET]))) || (n))
{
- long users = usercount_i(i->second);
+ long users = usercount(i->second);
if (users)
WriteServ(user->fd,"322 %s %s %d :[+%s] %s",user->nick,i->second->name,users,chanmodes(i->second,n),i->second->topic);
}
diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp
index fb5513fe2..d4173213e 100644
--- a/src/modules/m_safelist.cpp
+++ b/src/modules/m_safelist.cpp
@@ -100,12 +100,11 @@ class ListTimer : public InspTimer
bool has_user = (chan && chan->HasUser(u));
if ((chan) && (((!(chan->modes[CM_PRIVATE])) && (!(chan->modes[CM_SECRET]))) || (has_user)))
{
- /* Increment total plus linefeed */
- long users = usercount_i(chan);
- /* If there are only invisible users on the channel, dont show it */
+ long users = usercount(chan);
if (users)
{
int counter = snprintf(buffer,MAXBUF,"322 %s %s %ld :[+%s] %s",u->nick,chan->name,users,chanmodes(chan,has_user),chan->topic);
+ /* Increment total plus linefeed */
amount_sent += counter + 4 + Srv->GetServerName().length();
log(DEBUG,"m_safelist.so: Sent %ld of safe %ld / 4",amount_sent,u->sendqmax);
WriteServ_NoFormat(u->fd,buffer);