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

[solanum.git] / modules / m_away.c

diff --git a/modules/m_away.c b/modules/m_away.c
index d52c66f42b0d8077536b6942e886540d809974bf..5a0fdced0bd1c1710d6ba3c96971bd814f5d3a17 100644 (file)
--- a/modules/m_away.c
+++ b/modules/m_away.c
@@ -37,7 +37,6 @@
 #include "s_serv.h"
 #include "packet.h"
 
-
 static int m_away(struct Client *, struct Client *, int, const char **);
 
 struct Message away_msgtab = {
@@ -64,13 +63,13 @@ DECLARE_MODULE_AV1(away, NULL, NULL, away_clist, NULL, NULL, "$Revision: 3370 $"
 
 /*
 ** m_away
-**      parv[0] = sender prefix
 **      parv[1] = away message
 */
 static int
 m_away(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
-       if(MyClient(source_p) && !IsFloodDone(source_p))
+       if(MyClient(source_p) && source_p->localClient->next_away &&
+                       !IsFloodDone(source_p))
                flood_endgrace(source_p);
 
        if(!IsClient(source_p))
@@ -85,24 +84,49 @@ m_away(struct Client *client_p, struct Client *source_p, int parc, const char *p
                        sendto_server(client_p, NULL, CAP_TS6, NOCAPS,
                                      ":%s AWAY", use_id(source_p));
                        free_away(source_p);
+
+                       sendto_common_channels_local_butone(source_p, CLICAP_AWAY_NOTIFY, ":%s!%s@%s AWAY",
+                                                           source_p->name, source_p->username, source_p->host);
                }
                if(MyConnect(source_p))
                        sendto_one_numeric(source_p, RPL_UNAWAY, form_str(RPL_UNAWAY));
                return 0;
        }
 
+       /* Rate limit this because it is sent to common channels. */
+       if (MyClient(source_p))
+       {
+               if(!IsOper(source_p) &&
+                               source_p->localClient->next_away > rb_current_time())
+               {
+                       sendto_one(source_p, form_str(RPL_LOAD2HI),
+                                       me.name, source_p->name, "AWAY");
+                       return 0;
+               }
+               if(source_p->localClient->next_away < rb_current_time() -
+                               ConfigFileEntry.away_interval)
+                       source_p->localClient->next_away = rb_current_time();
+               else
+                       source_p->localClient->next_away = rb_current_time() +
+                               ConfigFileEntry.away_interval;
+       }
 
        if(source_p->user->away == NULL)
-       {
                allocate_away(source_p);
+       if(strncmp(source_p->user->away, parv[1], AWAYLEN - 1))
+       {
                rb_strlcpy(source_p->user->away, parv[1], AWAYLEN);
                sendto_server(client_p, NULL, CAP_TS6, NOCAPS, 
                              ":%s AWAY :%s", use_id(source_p), source_p->user->away);
-                       
-       } else {
-               rb_strlcpy(source_p->user->away, parv[1], AWAYLEN);
+               sendto_common_channels_local_butone(source_p,
+                                                   CLICAP_AWAY_NOTIFY,
+                                                   ":%s!%s@%s AWAY :%s",
+                                                   source_p->name,
+                                                   source_p->username,
+                                                   source_p->host,
+                                                   source_p->user->away);
        }
-       
+
        if(MyConnect(source_p))
                sendto_one_numeric(source_p, RPL_NOWAWAY, form_str(RPL_NOWAWAY));