MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-03 04:02:47 +01:00
Code Issues Releases Wiki Activity

join: Fix messages about join failures such as banned.

Browse source 
This was broken by 6f7b36d5d0 in February
2013, as join failures are the only situation where a non-trivial
numeric is passed through from other code to be sent to a client. Fix it
by porting more code from ircd-ratbox 3.1.
This commit is contained in:
Jilles Tjoelker 2013-07-07 23:49:33 +02:00
parent b2c208be09
commit 35bfe0e644
1 changed files with 40 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
modules/core/m_join.c
View file

@ -72,6 +72,7 @@ DECLARE_MODULE_AV1(join, NULL, NULL, join_clist, join_hlist, NULL, "$Revision: 3
static void do_join_0(struct Client *client_p, struct Client *source_p); static void do_join_0(struct Client *client_p, struct Client *source_p);
static int check_channel_name_loc(struct Client *source_p, const char *name); static int check_channel_name_loc(struct Client *source_p, const char *name);
static void send_join_error(struct Client *source_p, int numeric, const char *name);
static void set_final_mode(struct Mode *mode, struct Mode *oldmode); static void set_final_mode(struct Mode *mode, struct Mode *oldmode);
static void remove_our_modes(struct Channel *chptr, struct Client *source_p); static void remove_our_modes(struct Channel *chptr, struct Client *source_p);
@ -256,10 +257,10 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
if(moduledata.approved != 0) if(moduledata.approved != 0)
{ {
#ifdef XXX_NOTYET if(moduledata.approved != ERR_CUSTOM)
sendto_one(source_p, form_str(moduledata.approved), send_join_error(source_p,
me.name, source_p->name, name); moduledata.approved,
#endif name);
continue; continue;
} }
@ -304,10 +305,8 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
* see extensions/chm_operonly.c for other comments on this * see extensions/chm_operonly.c for other comments on this
* -- dwr * -- dwr
*/ */
#ifdef XXX_NOTYET
if(i != ERR_CUSTOM) if(i != ERR_CUSTOM)
sendto_one(source_p, form_str(i), me.name, source_p->name, name); send_join_error(source_p, i, name);
#endif
continue; continue;
} }
else if(chptr != chptr2) else if(chptr != chptr2)
@ -1023,6 +1022,40 @@ check_channel_name_loc(struct Client *source_p, const char *name)
return 1; return 1;
} }
/* send_join_error()
*
* input - client to send to, reason, channel name
* output - none
* side effects - error message sent to client
*/
static void
send_join_error(struct Client *source_p, int numeric, const char *name)
{
/* This stuff is necessary because the form_str macro only
* accepts constants.
*/
switch (numeric)
{
#define NORMAL_NUMERIC(i) \
case i: \
sendto_one(source_p, form_str(i), \
me.name, source_p->name, name); \
break
NORMAL_NUMERIC(ERR_BANNEDFROMCHAN);
NORMAL_NUMERIC(ERR_INVITEONLYCHAN);
NORMAL_NUMERIC(ERR_BADCHANNELKEY);
NORMAL_NUMERIC(ERR_CHANNELISFULL);
NORMAL_NUMERIC(ERR_NEEDREGGEDNICK);
NORMAL_NUMERIC(ERR_THROTTLE);
default:
sendto_one_numeric(source_p, numeric,
"%s :Cannot join channel", name);
break;
}
}
static void static void
set_final_mode(struct Mode *mode, struct Mode *oldmode) set_final_mode(struct Mode *mode, struct Mode *oldmode)
{ {