Replace RPL_WHOISTEXT(337) with RPL_WHOISSPECIAL(320) (#419)

[solanum.git] / modules / m_away.c

diff --git a/modules/m_away.c b/modules/m_away.c
index 6cd488d71948430e94fc96fb9d1031e3135ff5ef..b216fb65af05bb8812d5423e949732b9bb5d4eb4 100644 (file)
--- a/modules/m_away.c
+++ b/modules/m_away.c
@@ -20,8 +20,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: m_away.c 3370 2007-04-03 10:15:39Z nenolod $
  */
 
 #include "stdinc.h"
@@ -36,20 +34,23 @@
 #include "s_conf.h"
 #include "s_serv.h"
 #include "packet.h"
+#include "s_newconf.h"
 
+static const char away_desc[] = "Provides the AWAY command to set yourself away";
 
-static int m_away(struct Client *, struct Client *, int, const char **);
+static void m_away(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 struct Message away_msgtab = {
-       "AWAY", 0, 0, 0, MFLG_SLOW,
+       "AWAY", 0, 0, 0, 0,
        {mg_unreg, {m_away, 0}, {m_away, 0}, mg_ignore, mg_ignore, {m_away, 0}}
 };
 
 mapi_clist_av1 away_clist[] = { &away_msgtab, NULL };
-DECLARE_MODULE_AV1(away, NULL, NULL, away_clist, NULL, NULL, "$Revision: 3370 $");
+
+DECLARE_MODULE_AV2(away, NULL, NULL, away_clist, NULL, NULL, NULL, NULL, away_desc);
 
 /***********************************************************************
- * m_away() - Added 14 Dec 1988 by jto. 
+ * m_away() - Added 14 Dec 1988 by jto.
  *            Not currently really working, I don't like this
  *            call at all...
  *
@@ -57,24 +58,24 @@ DECLARE_MODULE_AV1(away, NULL, NULL, away_clist, NULL, NULL, "$Revision: 3370 $"
  *            but perhaps it's worth the load it causes to net.
  *            This requires flooding of the whole net like NICK,
  *            USER, MODE, etc messages...  --msa
- *             
+ *
  *            The above comments have long since irrelvant, but
  *            are kept for historical purposes now ;)
  ***********************************************************************/
 
 /*
 ** 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[])
+static void
+m_away(struct MsgBuf *msgbuf_p, 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))
-               return 0;
+               return;
 
        if(parc < 2 || EmptyString(parv[1]))
        {
@@ -84,31 +85,50 @@ m_away(struct Client *client_p, struct Client *source_p, int parc, const char *p
                        /* we now send this only if they were away before --is */
                        sendto_server(client_p, NULL, CAP_TS6, NOCAPS,
                                      ":%s AWAY", use_id(source_p));
-                       sendto_server(client_p, NULL, NOCAPS, CAP_TS6, 
-                                     ":%s AWAY", source_p->name);
                        free_away(source_p);
+
+                       sendto_common_channels_local_butone(source_p, CLICAP_AWAY_NOTIFY, NOCAPS, ":%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;
+               return;
        }
 
+       /* Rate limit this because it is sent to common channels. */
+       if (MyClient(source_p))
+       {
+               if(!IsOperGeneral(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;
+               }
+               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, 
+               sendto_server(client_p, NULL, CAP_TS6, NOCAPS,
                              ":%s AWAY :%s", use_id(source_p), source_p->user->away);
-               sendto_server(client_p, NULL, NOCAPS, CAP_TS6,
-                             ":%s AWAY :%s", source_p->name, source_p->user->away);
-                       
-       } else {
-               rb_strlcpy(source_p->user->away, parv[1], AWAYLEN);
+               sendto_common_channels_local_butone(source_p,
+                                                   CLICAP_AWAY_NOTIFY, NOCAPS,
+                                                   ":%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));
-
-       return 0;
 }