It'd take the world's longest tape measure to gauge the length of my fail.

[irc/rqf/shadowircd.git] / modules / core / m_join.c

diff --git a/modules/core/m_join.c b/modules/core/m_join.c
index 3a5d05ce5a290750555c24f140a0a4e884c39e15..d411995533bc4d9b7e55410751a8081ec4a149e7 100644 (file)
--- a/modules/core/m_join.c
+++ b/modules/core/m_join.c
@@ -43,6 +43,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 +52,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 +92,26 @@ 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
+ */
+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;
+
+       user_join(&me, target_p, parv[2], NULL);
+       return 0;
+}
+
 /*
  * ms_join
  *      parv[1] = channel TS
@@ -505,7 +531,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
                {
                        if(*s == '!')
                        {
-                               fl |= CHFL_OWNER;
+                               fl |= CHFL_ADMIN;
                                s++;
                        }
                        else if(*s == '@')
@@ -543,7 +569,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 +615,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;
@@ -985,9 +1011,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';