X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/3b0e9fa20ed055db5d862caaff4cef4b3b58c0bc..refs/tags/shadowircd-6.2.0-beta1:/modules/core/m_join.c

diff --git a/modules/core/m_join.c b/modules/core/m_join.c
index 3a5d05c..82d5d70 100644
--- a/modules/core/m_join.c
+++ b/modules/core/m_join.c
@@ -21,7 +21,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_join.c 3494 2007-05-27 13:07:27Z jilles $
  */
 
 #include "stdinc.h"
@@ -43,6 +42,7 @@
 #include "chmode.h"
 
 static int m_join(struct Client *, struct Client *, int, const char **);
+static int me_svsjoin(struct Client *, struct Client *, int, const char **);
 static int ms_join(struct Client *, struct Client *, int, const char **);
 static int ms_sjoin(struct Client *, struct Client *, int, const char **);
 
@@ -51,12 +51,17 @@ struct Message join_msgtab = {
 	{mg_unreg, {m_join, 2}, {ms_join, 2}, mg_ignore, mg_ignore, {m_join, 2}}
 };
 
+struct Message svsjoin_msgtab = {
+	"SVSJOIN", 0, 0, 0, MFLG_SLOW,
+	{mg_ignore, mg_ignore, mg_ignore, mg_ignore, {me_svsjoin, 3}, mg_ignore}
+};
+
 struct Message sjoin_msgtab = {
 	"SJOIN", 0, 0, 0, MFLG_SLOW,
 	{mg_unreg, mg_ignore, mg_ignore, {ms_sjoin, 4}, mg_ignore, mg_ignore}
 };
 
-mapi_clist_av1 join_clist[] = { &join_msgtab, &sjoin_msgtab, NULL };
+mapi_clist_av1 join_clist[] = { &join_msgtab, &svsjoin_msgtab, &sjoin_msgtab, NULL };
 
 DECLARE_MODULE_AV1(join, NULL, NULL, join_clist, NULL, NULL, "$Revision: 3494 $");
 
@@ -86,6 +91,33 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
 	return 0;
 }
 
+/*
+ * me_svsjoin - small function to allow services to forcejoin clients, mainly for ns_ajoin
+ *		parv[1] = user to act on (join to a channel)
+ *		parv[2] = channel
+ * This does allow opers to "forcejoin" users to channels with operserv/raw or by writing a
+ * custom module (where they can make it not log anything), but the former bitches that it's
+ * being used and the latter...Can probably be done anyway with enough hackyness if this
+ * command didn't exist so it's not all that bad.
+ */
+static int
+me_svsjoin(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+{
+	struct Client *target_p;
+
+	if(!(source_p->flags & FLAGS_SERVICE))
+		return 0;
+
+	if((target_p = find_person(parv[1])) == NULL)
+		return 0;
+
+	if(!MyClient(target_p))
+		return 0;
+
+	user_join(&me, target_p, parv[2], NULL);
+	return 0;
+}
+
 /*
  * ms_join
  *      parv[1] = channel TS
@@ -198,6 +230,9 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *
 					source_p->servptr->name,
 					chptr->chname, modebuf, parabuf);
 		*omodebuf = *modebuf = *parabuf = '\0';
+
+		/* since we're dropping our modes, we want to clear the mlock as well. --nenolod */
+		set_channel_mlock(client_p, source_p, chptr, NULL, FALSE);
 	}
 
 	if(!IsMember(source_p, chptr))
@@ -459,6 +494,9 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 		/* Update capitalization in channel name, this makes the
 		 * capitalization timestamped like modes are -- jilles */
 		strcpy(chptr->chname, parv[2]);
+
+		/* since we're dropping our modes, we want to clear the mlock as well. --nenolod */
+		set_channel_mlock(client_p, source_p, chptr, NULL, FALSE);
 	}
 
 	if(*modebuf != '\0')
@@ -501,11 +539,11 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 	{
 		fl = 0;
 
-		for (i = 0; i < 2; i++)
+		for (i = 0; i < 4; i++)
 		{
 			if(*s == '!')
 			{
-				fl |= CHFL_OWNER;
+				fl |= CHFL_ADMIN;
 				s++;
 			}
 			else if(*s == '@')
@@ -543,7 +581,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 
 		if(keep_new_modes)
 		{
-			if(fl & CHFL_OWNER)
+			if(fl & CHFL_ADMIN)
 			{
 				*ptr_uid++ = '!';
 				len_nick++;
@@ -589,7 +627,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 		/* If anyone can think of a way to do this that doesn't make babies cry
 		 * I would love to hear it - Taros */
 
-		if(fl & CHFL_OWNER)
+		if(fl & CHFL_ADMIN)
 		{
 			*mbuf++ = 'a';
 			para[pargs++] = target_p->name;
@@ -661,7 +699,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 				para[pargs++] = target_p->name;
 			}
 		}
-		if(fl & CHFL_CHANOP)
+		else if(fl & CHFL_CHANOP)
 		{
 			*mbuf++ = 'o';
 			para[pargs++] = target_p->name;
@@ -711,7 +749,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 				para[pargs++] = target_p->name;
 			}
 		}
-		if(fl & CHFL_HALFOP)
+		else if(fl & CHFL_HALFOP)
 		{
 			*mbuf++ = 'h';
 			para[pargs++] = target_p->name;
@@ -985,9 +1023,9 @@ remove_our_modes(struct Channel *chptr, struct Client *source_p)
 		/* If anyone can think of a way to do this that doesn't make babies cry
 		 * I would love to hear it - Taros */
 
-		if(is_owner(msptr))
+		if(is_admin(msptr))
 		{
-			msptr->flags &= ~CHFL_OWNER;
+			msptr->flags &= ~CHFL_ADMIN;
 			lpara[count++] = msptr->client_p->name;
 			*mbuf++ = 'a';