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

diff --git a/extensions/m_ojoin.c b/extensions/m_ojoin.c
index 0e401e32..b69001fd 100644
--- a/extensions/m_ojoin.c
+++ b/extensions/m_ojoin.c
@@ -16,28 +16,26 @@
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *   $Id: m_ojoin.c 3121 2007-01-02 13:23:04Z jilles $
+ *   $Id: m_ojoin.c 3554 2007-08-10 22:31:14Z jilles $
  */
 
 #include "stdinc.h"
-#include "tools.h"
-#include "patricia.h"
 #include "channel.h"
-#include "client.h"
+#include "client.h" 
 #include "ircd.h"
 #include "numeric.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"
 #include "s_conf.h"
-#include "s_newconf.h"
+#include "s_newconf.h" 
 #include "send.h"
 #include "whowas.h"
-#include "irc_string.h"
-#include "hash.h"
+#include "match.h"
+#include "hash.h" 
 #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[]);
 
@@ -49,11 +47,10 @@ struct Message ojoin_msgtab = {
 
 mapi_clist_av1 ojoin_clist[] = { &ojoin_msgtab, NULL };
 
-DECLARE_MODULE_AV1(ojoin, NULL, NULL, ojoin_clist, NULL, NULL, "$Revision: 3121 $");
+DECLARE_MODULE_AV1(ojoin, NULL, NULL, ojoin_clist, NULL, NULL, "$Revision: 3554 $");
 
 /*
 ** mo_ojoin
-**      parv[0] = sender prefix
 **      parv[1] = channel
 */
 static int
@@ -65,11 +62,11 @@ mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char
 	/* admins only */
 	if(!IsOperAdmin(source_p))
 	{
-		sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "ojoin");
+		sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "admin");
 		return 0;
 	}
 
-	if(*parv[1] == '@' || *parv[1] == '%' || *parv[1] == '+')
+	if(*parv[1] == '@' || *parv[1] == '+')
 	{
 		parv[1]++;
 		move_me = 1;
@@ -84,8 +81,7 @@ mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char
 
 	if(IsMember(source_p, chptr))
 	{
-		sendto_one(source_p, ":%s NOTICE %s :Please part %s before using OJOIN",
-			   me.name, source_p->name, parv[1]);
+		sendto_one_notice(source_p, ":Please part %s before using OJOIN", parv[1]);
 		return 0;
 	}
 
@@ -106,12 +102,10 @@ mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char
 	if(*parv[1] == '@')
 	{
 		add_user_to_channel(chptr, source_p, CHFL_CHANOP);
-		sendto_server(client_p, chptr, NOCAPS, NOCAPS,
+		sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
 			      ":%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);
+			      me.id, (long) chptr->channelts, chptr->chname, source_p->id);
+		send_channel_join(chptr, source_p);
 		sendto_channel_local(ALL_MEMBERS, chptr, ":%s MODE %s +o %s",
 				     me.name, chptr->chname, source_p->name);
 
@@ -119,24 +113,20 @@ mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char
 	else if(*parv[1] == '+')
 	{
 		add_user_to_channel(chptr, source_p, CHFL_VOICE);
-		sendto_server(client_p, chptr, NOCAPS, NOCAPS,
+		sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
 			      ":%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);
+			      me.id, (long) chptr->channelts, chptr->chname, source_p->id);
+		send_channel_join(chptr, source_p);
 		sendto_channel_local(ALL_MEMBERS, chptr, ":%s MODE %s +v %s",
 				     me.name, chptr->chname, source_p->name);
 	}
 	else
 	{
 		add_user_to_channel(chptr, source_p, CHFL_PEON);
-		sendto_server(client_p, chptr, NOCAPS, NOCAPS,
-			      ":%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);
+		sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
+			      ":%s JOIN %ld %s +",
+			      source_p->id, (long) chptr->channelts, chptr->chname);
+		send_channel_join(chptr, source_p);
 	}
 
 	/* send the topic... */
@@ -148,7 +138,7 @@ mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char
 			   source_p->name, chptr->chname, chptr->topic_info, chptr->topic_time);
 	}
 
-	source_p->localClient->last_join_time = CurrentTime;
+	source_p->localClient->last_join_time = rb_current_time();
 	channel_member_names(chptr, source_p, 1);
 
 	return 0;