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 27cdac9cd2cf491bdfac0c1ba3e39071dccd95c6..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,16 +34,20 @@
 #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.
@@ -65,15 +67,15 @@ DECLARE_MODULE_AV1(away, NULL, NULL, away_clist, NULL, NULL, "$Revision: 3370 $"
 ** m_away
 **      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) && 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]))
        {
@@ -85,23 +87,23 @@ m_away(struct Client *client_p, struct Client *source_p, int parc, const char *p
                                      ":%s AWAY", use_id(source_p));
                        free_away(source_p);
 
-                       sendto_common_channels_local_butone(source_p, CLICAP_AWAY_NOTIFY, ":%s!%s@%s AWAY",
+                       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(!IsOper(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 0;
+                       return;
                }
                if(source_p->localClient->next_away < rb_current_time() -
                                ConfigFileEntry.away_interval)
@@ -119,7 +121,7 @@ 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 :%s", use_id(source_p), source_p->user->away);
                sendto_common_channels_local_butone(source_p,
-                                                   CLICAP_AWAY_NOTIFY,
+                                                   CLICAP_AWAY_NOTIFY, NOCAPS,
                                                    ":%s!%s@%s AWAY :%s",
                                                    source_p->name,
                                                    source_p->username,
@@ -129,6 +131,4 @@ m_away(struct Client *client_p, struct Client *source_p, int parc, const char *p
 
        if(MyConnect(source_p))
                sendto_one_numeric(source_p, RPL_NOWAWAY, form_str(RPL_NOWAWAY));
-
-       return 0;
 }