X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/cbeab4bc340b7b3f4fbf424ff327758defb9598a..ea41b24fd4807e3565bf5f8f293e2efc4c20b62d:/modules/m_away.c

diff --git a/modules/m_away.c b/modules/m_away.c
index a36dafbc..b216fb65 100644
--- a/modules/m_away.c
+++ b/modules/m_away.c
@@ -34,8 +34,11 @@
 #include "s_conf.h"
 #include "s_serv.h"
 #include "packet.h"
+#include "s_newconf.h"
 
-static int m_away(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static const char away_desc[] = "Provides the AWAY command to set yourself away";
+
+static void m_away(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 struct Message away_msgtab = {
 	"AWAY", 0, 0, 0, 0,
@@ -43,7 +46,8 @@ struct Message away_msgtab = {
 };
 
 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.
@@ -63,7 +67,7 @@ DECLARE_MODULE_AV1(away, NULL, NULL, away_clist, NULL, NULL, "$Revision: 3370 $"
 ** m_away
 **      parv[1] = away message
 */
-static int
+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 &&
@@ -71,7 +75,7 @@ m_away(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p
 		flood_endgrace(source_p);
 
 	if(!IsClient(source_p))
-		return 0;
+		return;
 
 	if(parc < 2 || EmptyString(parv[1]))
 	{
@@ -88,18 +92,18 @@ m_away(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p
 		}
 		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)
@@ -127,6 +131,4 @@ m_away(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p
 
 	if(MyConnect(source_p))
 		sendto_one_numeric(source_p, RPL_NOWAWAY, form_str(RPL_NOWAWAY));
-
-	return 0;
 }