help system rework, part 1

[irc/rqf/shadowircd.git] / extensions / m_ojoin.c

diff --git a/extensions/m_ojoin.c b/extensions/m_ojoin.c
index 0e401e326b7d54a612719d0d5979812edfcdae4f..e3a6fa55815382fa63b4966e50da5a9a289406d8 100644 (file)
--- a/extensions/m_ojoin.c
+++ b/extensions/m_ojoin.c
@@ -16,7 +16,7 @@
  *   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"
@@ -49,7 +49,7 @@ 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
@@ -65,7 +65,7 @@ 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;
        }
 
@@ -84,8 +84,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,7 +105,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.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",
@@ -119,7 +121,10 @@ 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.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",
@@ -131,7 +136,10 @@ mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char
        else
        {
                add_user_to_channel(chptr, source_p, CHFL_PEON);
-               sendto_server(client_p, chptr, NOCAPS, NOCAPS,
+               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",