#include "stdinc.h"
#include "channel.h"
-#include "client.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 "s_newconf.h"
#include "send.h"
#include "whowas.h"
-#include "irc_string.h"
-#include "hash.h"
+#include "match.h"
+#include "hash.h"
#include "msg.h"
#include "parse.h"
#include "modules.h"
+#include "messages.h"
-static int mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static int 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}}
};
/*
** 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[])
+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;
return 0;
}
- if(*parv[1] == '@' || *parv[1] == '%' || *parv[1] == '+')
+ if(*parv[1] == '@' || *parv[1] == '+')
{
parv[1]++;
move_me = 1;
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",
- source_p->name,
- source_p->username, source_p->host, chptr->chname);
+ send_channel_join(chptr, source_p);
sendto_channel_local(ALL_MEMBERS, chptr, ":%s MODE %s +o %s",
me.name, chptr->chname, source_p->name);
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",
- source_p->name,
- source_p->username, source_p->host, chptr->chname);
+ send_channel_join(chptr, source_p);
sendto_channel_local(ALL_MEMBERS, chptr, ":%s MODE %s +v %s",
me.name, chptr->chname, source_p->name);
}
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",
- source_p->name,
- source_p->username, source_p->host, chptr->chname);
+ send_channel_join(chptr, source_p);
}
/* send the topic... */