From 8e8f4ffc19fc8f3c00d20375e0d455d5d67d91d1 Mon Sep 17 00:00:00 2001 From: jilles Date: Fri, 10 Aug 2007 15:31:14 -0700 Subject: [PATCH] [svn] Send TS6 protocol for the actual work of override modules. Wallops remain TS5-style for now. --- ChangeLog | 9 +++++++++ extensions/m_ojoin.c | 19 ++++++++++++++----- extensions/m_okick.c | 8 +++++--- extensions/m_opme.c | 12 ++++++++---- include/serno.h | 2 +- 5 files changed, 37 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index e65f2664..75371664 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +nenolod 2007/08/09 06:50:13 UTC (20070809-3552) + Log: + - update IDEAS as TS6 only is partially done + + + Changes: Modified: + +1 -1 trunk/IDEAS (File Modified) + + nenolod 2007/08/09 06:47:26 UTC (20070809-3550) Log: - TS6 is always enabled now. diff --git a/extensions/m_ojoin.c b/extensions/m_ojoin.c index f07ea475..e3a6fa55 100644 --- 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 3297 2007-03-28 14:49:48Z 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: 3297 $"); +DECLARE_MODULE_AV1(ojoin, NULL, NULL, ojoin_clist, NULL, NULL, "$Revision: 3554 $"); /* ** mo_ojoin @@ -105,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", @@ -118,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", @@ -130,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", diff --git a/extensions/m_okick.c b/extensions/m_okick.c index 8fd76437..07c5800d 100644 --- a/extensions/m_okick.c +++ b/extensions/m_okick.c @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA * - * $Id: m_okick.c 3117 2007-01-02 13:11:04Z jilles $ + * $Id: m_okick.c 3554 2007-08-10 22:31:14Z jilles $ */ #include "stdinc.h" @@ -49,7 +49,7 @@ struct Message okick_msgtab = { mapi_clist_av1 okick_clist[] = { &okick_msgtab, NULL }; -DECLARE_MODULE_AV1(okick, NULL, NULL, okick_clist, NULL, NULL, "$Revision: 3117 $"); +DECLARE_MODULE_AV1(okick, NULL, NULL, okick_clist, NULL, NULL, "$Revision: 3554 $"); /* ** m_okick @@ -135,7 +135,9 @@ mo_okick(struct Client *client_p, struct Client *source_p, int parc, const char sendto_channel_local(ALL_MEMBERS, chptr, ":%s KICK %s %s :%s", me.name, chptr->chname, who->name, comment); - sendto_server(&me, chptr, NOCAPS, NOCAPS, + sendto_server(&me, chptr, CAP_TS6, NOCAPS, + ":%s KICK %s %s :%s", me.id, chptr->chname, who->id, comment); + sendto_server(&me, chptr, NOCAPS, CAP_TS6, ":%s KICK %s %s :%s", me.name, chptr->chname, who->name, comment); remove_user_from_channel(msptr); return 0; diff --git a/extensions/m_opme.c b/extensions/m_opme.c index c90a02b0..193a1eb8 100644 --- a/extensions/m_opme.c +++ b/extensions/m_opme.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_opme.c 3297 2007-03-28 14:49:48Z jilles $ + * $Id: m_opme.c 3554 2007-08-10 22:31:14Z jilles $ */ #include "stdinc.h" #include "tools.h" @@ -46,7 +46,7 @@ struct Message opme_msgtab = { mapi_clist_av1 opme_clist[] = { &opme_msgtab, NULL }; -DECLARE_MODULE_AV1(opme, NULL, NULL, opme_clist, NULL, NULL, "$Revision: 3297 $"); +DECLARE_MODULE_AV1(opme, NULL, NULL, opme_clist, NULL, NULL, "$Revision: 3554 $"); /* @@ -105,8 +105,12 @@ mo_opme(struct Client *client_p, struct Client *source_p, int parc, const char * sendto_server(NULL, NULL, NOCAPS, NOCAPS, ":%s WALLOPS :OPME called for [%s] by %s!%s@%s", me.name, parv[1], source_p->name, source_p->username, source_p->host); - sendto_server(NULL, chptr, NOCAPS, NOCAPS, ":%s PART %s", source_p->name, parv[1]); - sendto_server(NULL, chptr, NOCAPS, NOCAPS, + sendto_server(NULL, chptr, CAP_TS6, NOCAPS, ":%s PART %s", source_p->id, parv[1]); + sendto_server(NULL, chptr, NOCAPS, CAP_TS6, ":%s PART %s", source_p->name, parv[1]); + sendto_server(NULL, chptr, CAP_TS6, NOCAPS, + ":%s SJOIN %ld %s + :@%s", + me.id, (long) chptr->channelts, parv[1], source_p->id); + sendto_server(NULL, chptr, NOCAPS, CAP_TS6, ":%s SJOIN %ld %s + :@%s", me.name, (long) chptr->channelts, parv[1], source_p->name); } diff --git a/include/serno.h b/include/serno.h index d73a70db..57831e24 100644 --- a/include/serno.h +++ b/include/serno.h @@ -1 +1 @@ -#define SERNO "20070809-3550" +#define SERNO "20070809-3552"