m_info: Correct description of general::client_exit like in example confs.

[solanum.git] / modules / m_who.c

diff --git a/modules/m_who.c b/modules/m_who.c
index 834ab7544a5fea5dd7d41468787e1ae91dd6daea..8bb05afe3ccea1fde5490ace53f1e38e60095192 100644 (file)
--- a/modules/m_who.c
+++ b/modules/m_who.c
@@ -40,6 +40,7 @@
 #include "modules.h"
 #include "packet.h"
 #include "s_newconf.h"
+#include "ratelimit.h"
 
 #define FIELD_CHANNEL    0x0001
 #define FIELD_HOP        0x0002
@@ -177,8 +178,18 @@ m_who(struct Client *client_p, struct Client *source_p, int parc, const char *pa
        {
                /* List all users on a given channel */
                chptr = find_channel(parv[1] + operspy);
+
                if(chptr != NULL)
                {
+                       if (!IsOper(source_p) && !ratelimit_client_who(source_p, rb_dlink_list_length(&chptr->members)/50))
+                       {
+                               sendto_one(source_p, form_str(RPL_LOAD2HI),
+                                               me.name, source_p->name, "WHO");
+                               sendto_one(source_p, form_str(RPL_ENDOFWHO),
+                                          me.name, source_p->name, "*");
+                               return 0;
+                       }
+
                        if(operspy)
                                report_operspy(source_p, "WHO", chptr->chname);
 
@@ -187,6 +198,7 @@ m_who(struct Client *client_p, struct Client *source_p, int parc, const char *pa
                        else if(!SecretChannel(chptr))
                                do_who_on_channel(source_p, chptr, server_oper, NO, &fmt);
                }
+
                sendto_one(source_p, form_str(RPL_ENDOFWHO),
                           me.name, source_p->name, parv[1] + operspy);
                return 0;
@@ -233,7 +245,7 @@ m_who(struct Client *client_p, struct Client *source_p, int parc, const char *pa
        /* it has to be a global who at this point, limit it */
        if(!IsOper(source_p))
        {
-               if((last_used + ConfigFileEntry.pace_wait) > rb_current_time())
+               if((last_used + ConfigFileEntry.pace_wait) > rb_current_time() || !ratelimit_client(source_p, 1))
                {
                        sendto_one(source_p, form_str(RPL_LOAD2HI),
                                        me.name, source_p->name, "WHO");
@@ -467,7 +479,7 @@ do_who(struct Client *source_p, struct Client *target_p, struct membership *mspt
        const char *q;
 
        rb_sprintf(status, "%c%s%s",
-                  (get_metadata(target_p, "away") != NULL) ? 'G' : 'H', IsOper(target_p) ? "*" : "", msptr ? find_channel_status(msptr, fmt->fields || IsCapable(source_p, CLICAP_MULTI_PREFIX)) : "");
+                  target_p->user->away ? 'G' : 'H', IsOper(target_p) ? "*" : "", msptr ? find_channel_status(msptr, fmt->fields || IsCapable(source_p, CLICAP_MULTI_PREFIX)) : "");
 
        if (fmt->fields == 0)
                sendto_one(source_p, form_str(RPL_WHOREPLY), me.name,