04952c32ad
Incoming MODE processing is split into a parsing step and an execution step, instead of a mode's effector function being involved in its own parsing. Modes can no longer use custom logic to control their parsing, and instead supply a combination of CHM_* flags to the parser. As a result, we know before we try to effect any mode changes what all of them will be. The reauthorize hack for override is no longer necessary. A side effect of its introduction was that `MODE #foo b x!y@z` no longer worked; in removing it we restore that behaviour. We gain the ability to reject various invalid inputs that: - mutate or query unknown modes - supply excess mode arguments - query modes that can't be queried In each case, whether we *should* reject it is an open question; for now I'm rejecting the first one.
47 lines
1.2 KiB
C
47 lines
1.2 KiB
C
/*
|
|
* Treat cmode +-O as +-iI $o.
|
|
*/
|
|
|
|
#include "stdinc.h"
|
|
#include "modules.h"
|
|
#include "client.h"
|
|
#include "hook.h"
|
|
#include "ircd.h"
|
|
#include "chmode.h"
|
|
|
|
static const char chm_operonly_compat[] =
|
|
"Adds an emulated channel mode +O which is converted into mode +i and +I $o";
|
|
|
|
static int _modinit(void);
|
|
static void _moddeinit(void);
|
|
static void chm_operonly(struct Client *source_p, struct Channel *chptr,
|
|
int alevel, const char *arg, int *errors, int dir, char c, long mode_type);
|
|
|
|
DECLARE_MODULE_AV2(chm_operonly_compat, _modinit, _moddeinit, NULL, NULL, NULL, NULL, NULL, chm_operonly_compat);
|
|
|
|
static int
|
|
_modinit(void)
|
|
{
|
|
chmode_table['O'] = (struct ChannelMode){chm_operonly, 0, 0};
|
|
return 0;
|
|
}
|
|
|
|
static void
|
|
_moddeinit(void)
|
|
{
|
|
chmode_table['O'] = (struct ChannelMode){chm_nosuch, 0, 0};
|
|
}
|
|
|
|
static void
|
|
chm_operonly(struct Client *source_p, struct Channel *chptr,
|
|
int alevel, const char *arg, int *errors, int dir, char c, long mode_type)
|
|
{
|
|
if (MyClient(source_p)) {
|
|
chm_simple(source_p, chptr, alevel, NULL,
|
|
errors, dir, 'i', MODE_INVITEONLY);
|
|
chm_ban(source_p, chptr, alevel, "$o",
|
|
errors, dir, 'I', CHFL_INVEX);
|
|
} else
|
|
chm_nosuch(source_p, chptr, alevel, NULL,
|
|
errors, dir, c, mode_type);
|
|
}
|