X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/1b95ca0b6a315abdd6466f94a5fa11971b87c922..24170ac312f9e042993a5377ed82769f4ae74e55:/modules/m_away.c

diff --git a/modules/m_away.c b/modules/m_away.c
index 0d462f9..02b510d 100644
--- a/modules/m_away.c
+++ b/modules/m_away.c
@@ -26,7 +26,7 @@
 
 #include "stdinc.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"
@@ -64,52 +64,46 @@ 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))
-		flood_endgrace(source_p);
-
-	if(!IsClient(source_p))
-		return 0;
-
-	if(parc < 2 || EmptyString(parv[1]))
-	{
-		/* Marking as not away */
-		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));
-			sendto_server(client_p, NULL, NOCAPS, CAP_TS6, 
-				      ":%s AWAY", source_p->name);
-			free_away(source_p);
-		}
-		if(MyConnect(source_p))
-			sendto_one(source_p, form_str(RPL_UNAWAY),
-				   me.name, source_p->name);
-		return 0;
-	}
-
-
-	if(source_p->user->away == NULL)
-	{
-		allocate_away(source_p);
-		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_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);
-	}
-	
-	if(MyConnect(source_p))
-		sendto_one(source_p, form_str(RPL_NOWAWAY), me.name, source_p->name);
-
+	if(MyClient(source_p) && !IsFloodDone(source_p))
+		flood_endgrace(source_p);
+
+	if(!IsClient(source_p))
+		return 0;
+
+	if(parc < 2 || EmptyString(parv[1]))
+	{
+		/* Marking as not away */
+		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));
+			free_away(source_p);
+		}
+		if(MyConnect(source_p))
+			sendto_one_numeric(source_p, RPL_UNAWAY, form_str(RPL_UNAWAY));
+		return 0;
+	}
+
+
+	if(source_p->user->away == NULL)
+	{
+		allocate_away(source_p);
+		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);
+	}
+	
+	if(MyConnect(source_p))
+		sendto_one_numeric(source_p, RPL_NOWAWAY, form_str(RPL_NOWAWAY));
+
 	return 0;
 }