X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/4af8bcef595d229c1509300f21d973d4cdfd9f38..eeabf33a7c34efbedce519f67b8b87e4c75a422f:/modules/m_away.c

diff --git a/modules/m_away.c b/modules/m_away.c
index d8eb8764..80bbc55e 100644
--- 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"
@@ -37,19 +35,21 @@
 #include "s_serv.h"
 #include "packet.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 int 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,7 +57,7 @@ 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 ;)
  ***********************************************************************/
@@ -67,9 +67,10 @@ DECLARE_MODULE_AV1(away, NULL, NULL, away_clist, NULL, NULL, "$Revision: 3370 $"
 **      parv[1] = away message
 */
 static int
-m_away(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+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))
@@ -78,22 +79,55 @@ m_away(struct Client *client_p, struct Client *source_p, int parc, const char *p
 	if(parc < 2 || EmptyString(parv[1]))
 	{
 		/* Marking as not away */
-		if(get_metadata(source_p, "away") != NULL)
+		if(source_p->user->away != NULL)
 		{
 			/* 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));
-			delete_metadata(source_p, "away");
+			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;
 	}
 
-	set_metadata(source_p, "away", parv[1]);
-	sendto_server(client_p, NULL, CAP_TS6, NOCAPS, 
-		      ":%s AWAY :%s", use_id(source_p), parv[1]);
-			
+	/* 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);
+		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));