X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/f237e31a12ce7d1b72228254ac09d7016ca3a8c0..43946961df9e7703c8877e4bbd9181507422429d:/modules/m_away.c

diff --git a/modules/m_away.c b/modules/m_away.c
index 6b350087..d52c66f4 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"
@@ -84,13 +84,10 @@ 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);
 		}
 		if(MyConnect(source_p))
-			sendto_one(source_p, form_str(RPL_UNAWAY),
-				   me.name, source_p->name);
+			sendto_one_numeric(source_p, RPL_UNAWAY, form_str(RPL_UNAWAY));
 		return 0;
 	}
 
@@ -101,15 +98,13 @@ m_away(struct Client *client_p, struct Client *source_p, int parc, const char *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);
+		sendto_one_numeric(source_p, RPL_NOWAWAY, form_str(RPL_NOWAWAY));
 
 	return 0;
 }