X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/a5ea0e0dc43a9de0cabf80ab95413773f9c79ebe..1548c140218b956485b3fd5c386447a2add59864:/extensions/m_ojoin.c

diff --git a/extensions/m_ojoin.c b/extensions/m_ojoin.c
index f07ea475..38b35d1e 100644
--- a/extensions/m_ojoin.c
+++ b/extensions/m_ojoin.c
@@ -15,49 +15,45 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *   $Id: m_ojoin.c 3297 2007-03-28 14:49:48Z jilles $
  */
 
 #include "stdinc.h"
-#include "tools.h"
-#include "patricia.h"
 #include "channel.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 "send.h"
 #include "whowas.h"
-#include "irc_string.h"
+#include "match.h"
 #include "hash.h"
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
+#include "messages.h"
 
+static const char ojoin_desc[] = "Allow admins to forcibly join channels with the OJOIN command";
 
-static int mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
-
+static void mo_ojoin(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 
 struct Message ojoin_msgtab = {
-	"OJOIN", 0, 0, 0, MFLG_SLOW,
+	"OJOIN", 0, 0, 0, 0,
 	{mg_unreg, mg_not_oper, mg_ignore, mg_ignore, mg_ignore, {mo_ojoin, 2}}
 };
 
 mapi_clist_av1 ojoin_clist[] = { &ojoin_msgtab, NULL };
 
-DECLARE_MODULE_AV1(ojoin, NULL, NULL, ojoin_clist, NULL, NULL, "$Revision: 3297 $");
+DECLARE_MODULE_AV2(ojoin, NULL, NULL, ojoin_clist, NULL, NULL, NULL, NULL, ojoin_desc);
 
 /*
 ** mo_ojoin
-**      parv[0] = sender prefix
 **      parv[1] = channel
 */
-static int
-mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+mo_ojoin(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	struct Channel *chptr;
 	int move_me = 0;
@@ -66,10 +62,10 @@ mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char
 	if(!IsOperAdmin(source_p))
 	{
 		sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "admin");
-		return 0;
+		return;
 	}
 
-	if(*parv[1] == '@' || *parv[1] == '%' || *parv[1] == '+')
+	if(*parv[1] == '@' || *parv[1] == '+')
 	{
 		parv[1]++;
 		move_me = 1;
@@ -79,13 +75,13 @@ mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char
 	{
 		sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL,
 				   form_str(ERR_NOSUCHCHANNEL), parv[1]);
-		return 0;
+		return;
 	}
 
 	if(IsMember(source_p, chptr))
 	{
 		sendto_one_notice(source_p, ":Please part %s before using OJOIN", parv[1]);
-		return 0;
+		return;
 	}
 
 	if(move_me == 1)
@@ -105,37 +101,31 @@ 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);
-		sendto_channel_local(ALL_MEMBERS, chptr, ":%s MODE %s +o %s",
+			      me.id, (long) chptr->channelts, chptr->chname, source_p->id);
+		send_channel_join(chptr, source_p);
+		sendto_channel_local(&me, ALL_MEMBERS, chptr, ":%s MODE %s +o %s",
 				     me.name, chptr->chname, source_p->name);
 
 	}
 	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);
-		sendto_channel_local(ALL_MEMBERS, chptr, ":%s MODE %s +v %s",
+			      me.id, (long) chptr->channelts, chptr->chname, source_p->id);
+		send_channel_join(chptr, source_p);
+		sendto_channel_local(&me, 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... */
@@ -144,11 +134,9 @@ mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char
 		sendto_one(source_p, form_str(RPL_TOPIC), me.name,
 			   source_p->name, chptr->chname, chptr->topic);
 		sendto_one(source_p, form_str(RPL_TOPICWHOTIME), me.name,
-			   source_p->name, chptr->chname, chptr->topic_info, chptr->topic_time);
+			   source_p->name, chptr->chname, chptr->topic_info, (long long)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;
 }