X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/4562c604897f18f08e1bee993d455d9c1774f9ad..bd0d352f12ee12bbe14b43c4eed9fbc74c51ac00:/extensions/m_ojoin.c

diff --git a/extensions/m_ojoin.c b/extensions/m_ojoin.c
index 96efcad9..b69001fd 100644
--- a/extensions/m_ojoin.c
+++ b/extensions/m_ojoin.c
@@ -35,6 +35,7 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
+#include "messages.h"
 
 static int mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 
@@ -50,7 +51,6 @@ DECLARE_MODULE_AV1(ojoin, NULL, NULL, ojoin_clist, NULL, NULL, "$Revision: 3554
 
 /*
 ** mo_ojoin
-**      parv[0] = sender prefix
 **      parv[1] = channel
 */
 static int
@@ -66,7 +66,7 @@ mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char
 		return 0;
 	}
 
-	if(*parv[1] == '@' || *parv[1] == '%' || *parv[1] == '+')
+	if(*parv[1] == '@' || *parv[1] == '+')
 	{
 		parv[1]++;
 		move_me = 1;
@@ -105,12 +105,7 @@ mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char
 		sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
 			      ":%s SJOIN %ld %s + :@%s",
 			      me.id, (long) chptr->channelts, chptr->chname, source_p->id);
-		sendto_server(client_p, chptr, NOCAPS, CAP_TS6,
-			      ":%s SJOIN %ld %s + :@%s",
-			      me.name, (long) chptr->channelts, chptr->chname, source_p->name);
-		sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN %s",
-				     source_p->name,
-				     source_p->username, source_p->host, chptr->chname);
+		send_channel_join(chptr, source_p);
 		sendto_channel_local(ALL_MEMBERS, chptr, ":%s MODE %s +o %s",
 				     me.name, chptr->chname, source_p->name);
 
@@ -121,12 +116,7 @@ mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char
 		sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
 			      ":%s SJOIN %ld %s + :+%s",
 			      me.id, (long) chptr->channelts, chptr->chname, source_p->id);
-		sendto_server(client_p, chptr, NOCAPS, CAP_TS6,
-			      ":%s SJOIN %ld %s + :+%s",
-			      me.name, (long) chptr->channelts, chptr->chname, source_p->name);
-		sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN %s",
-				     source_p->name,
-				     source_p->username, source_p->host, chptr->chname);
+		send_channel_join(chptr, source_p);
 		sendto_channel_local(ALL_MEMBERS, chptr, ":%s MODE %s +v %s",
 				     me.name, chptr->chname, source_p->name);
 	}
@@ -136,12 +126,7 @@ mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char
 		sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
 			      ":%s JOIN %ld %s +",
 			      source_p->id, (long) chptr->channelts, chptr->chname);
-		sendto_server(client_p, chptr, NOCAPS, CAP_TS6,
-			      ":%s SJOIN %ld %s + :%s",
-			      me.name, (long) chptr->channelts, chptr->chname, source_p->name);
-		sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN %s",
-				     source_p->name,
-				     source_p->username, source_p->host, chptr->chname);
+		send_channel_join(chptr, source_p);
 	}
 
 	/* send the topic... */