pegasus/unrealircd
1
0
Fork 0
mirror of https://github.com/unrealircd/unrealircd.git synced 2026-07-05 05:53:14 +02:00
Code Activity

extra +f action support: c#m c#M j#R m#M

Browse Source
This commit is contained in:
Bram Matthys
2003-09-01 15:33:33 +00:00
parent 8c5246bc25
commit aee400a104
6 changed files with 70 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Changes
+3
View File
@@ -2381,3 +2381,6 @@ seen. gmtime warning still there
- Made SSL users unable to -z themselves, also added 2 flags to /stats S,
reported by Joolz (#0001200).
- Fixed problem with opers having both 'admin' and 'coadmin' causing double-notices (#0001043).
- +f now also allows you to specify an 'action'. For example +f [30j#R]:15 will set the
channel +R (instead of +i) if more than 30 joins in 15 seconds are reached.
The following combinations are allowed: c#m, c#M, j#R and m#M. (docs will be updated later)
include/h.h
+1 -1
View File
@@ -596,7 +596,7 @@ extern void extcmode_free_paramlist(CmodeParam *);
#endif
extern CMD_FUNC(m_eos);
extern int do_chanflood(ChanFloodProt *, int);
extern void do_chanflood_action(aChannel *, int, char *, char, long);
extern void do_chanflood_action(aChannel *, int, char *);
extern char *channel_modef_string(ChanFloodProt *);
extern void chmode_str(struct ChMode, char *, char *);
extern char *get_cptr_status(aClient *);
src/channel.c
+49 -12
View File
@@ -841,13 +841,13 @@ int can_send(aClient *cptr, aChannel *chptr, char *msgtext)
}
/* [just a helper for channel_modef_string()] */
static inline char *chmodefstrhelper(char *buf, char t, unsigned short l, unsigned char a)
static inline char *chmodefstrhelper(char *buf, char t, char tdef, unsigned short l, unsigned char a)
{
char *p;
ircsprintf(buf, "%hd", l);
p = buf + strlen(buf);
*p++ = t;
if (a)
if (a && (a != tdef))
{
*p++ = '#';
*p++ = a;
@@ -865,17 +865,17 @@ char *p = retbuf;
/* (alphabetized) */
if (x->l[FLD_CTCP])
p = chmodefstrhelper(p, 'c', x->l[FLD_CTCP], x->a[FLD_CTCP]);
p = chmodefstrhelper(p, 'c', 'C', x->l[FLD_CTCP], x->a[FLD_CTCP]);
if (x->l[FLD_JOIN])
p = chmodefstrhelper(p, 'j', x->l[FLD_JOIN], x->a[FLD_JOIN]);
p = chmodefstrhelper(p, 'j', 'i', x->l[FLD_JOIN], x->a[FLD_JOIN]);
if (x->l[FLD_KNOCK])
p = chmodefstrhelper(p, 'k', x->l[FLD_KNOCK], x->a[FLD_KNOCK]);
p = chmodefstrhelper(p, 'k', 'K', x->l[FLD_KNOCK], x->a[FLD_KNOCK]);
if (x->l[FLD_MSG])
p = chmodefstrhelper(p, 'm', x->l[FLD_MSG], x->a[FLD_MSG]);
p = chmodefstrhelper(p, 'm', 'm', x->l[FLD_MSG], x->a[FLD_MSG]);
if (x->l[FLD_NICK])
p = chmodefstrhelper(p, 'n', x->l[FLD_NICK], x->a[FLD_NICK]);
p = chmodefstrhelper(p, 'n', 'N', x->l[FLD_NICK], x->a[FLD_NICK]);
if (x->l[FLD_TEXT])
p = chmodefstrhelper(p, 't', x->l[FLD_TEXT], x->a[FLD_TEXT]);
p = chmodefstrhelper(p, 't', '\0', x->l[FLD_TEXT], x->a[FLD_TEXT]);
if (*(p - 1) == ',')
p--;
@@ -2517,23 +2517,37 @@ int do_mode_char(aChannel *chptr, long modetype, char modechar, char *param,
{
case 'c':
newf.l[FLD_CTCP] = v;
if ((a == 'm') || (a == 'M'))
newf.a[FLD_CTCP] = a;
else
newf.a[FLD_CTCP] = 'C';
break;
case 'j':
newf.l[FLD_JOIN] = v;
if (a == 'R')
newf.a[FLD_JOIN] = a;
else
newf.a[FLD_JOIN] = 'i';
break;
case 'k':
newf.l[FLD_KNOCK] = v;
newf.a[FLD_KNOCK] = 'K';
break;
case 'm':
newf.l[FLD_MSG] = v;
if (a == 'M')
newf.a[FLD_MSG] = a;
else
newf.a[FLD_MSG] = 'm';
break;
case 'n':
newf.l[FLD_NICK] = v;
newf.a[FLD_NICK] = 'N';
break;
case 't':
newf.l[FLD_TEXT] = v;
if (a == 'b')
newf.a[FLD_TEXT] = 'b';
newf.a[FLD_TEXT] = a;
break;
default:
breakit=1;
@@ -3622,7 +3636,7 @@ CMD_FUNC(do_join)
if (chptr->mode.floodprot && (MyClient(sptr) || sptr->serv->flags.synced) &&
do_chanflood(chptr->mode.floodprot, FLD_JOIN) && MyClient(sptr))
{
do_chanflood_action(chptr, FLD_JOIN, "join", 'i', MODE_INVITEONLY);
do_chanflood_action(chptr, FLD_JOIN, "join");
}
#endif
}
@@ -5115,7 +5129,7 @@ CMD_FUNC(m_knock)
#ifdef NEWCHFLOODPROT
if (chptr->mode.floodprot && do_chanflood(chptr->mode.floodprot, FLD_KNOCK) && MyClient(sptr))
do_chanflood_action(chptr, FLD_KNOCK, "knock", 'K', MODE_NOKNOCK);
do_chanflood_action(chptr, FLD_KNOCK, "knock");
#endif
return 0;
}
@@ -6434,8 +6448,31 @@ int do_chanflood(ChanFloodProt *chp, int what)
return 0;
}
void do_chanflood_action(aChannel *chptr, int what, char *text, char m, long modeflag)
void do_chanflood_action(aChannel *chptr, int what, char *text)
{
long modeflag = 0;
aCtab *tab = &cFlagTab[0];
char m;
m = chptr->mode.floodprot->a[what];
if (!m)
return;
/* [TODO: add extended channel mode support] */
while(tab->mode != 0x0)
{
if (tab->flag == m)
{
modeflag = tab->mode;
break;
}
tab++;
}
if (!modeflag)
return;
if (!(chptr->mode.mode & modeflag))
{
char comment[1024];
src/modules/m_message.c
+2 -2
View File
@@ -463,14 +463,14 @@ DLLFUNC int m_message(aClient *cptr, aClient *sptr, int parc, char *parv[], int
!IsULine(sptr) && do_chanflood(chptr->mode.floodprot, FLD_MSG) &&
MyClient(sptr))
{
do_chanflood_action(chptr, FLD_MSG, "msg/notice", 'm', MODE_MODERATED);
do_chanflood_action(chptr, FLD_MSG, "msg/notice");
}
if (chptr->mode.floodprot && !is_skochanop(sptr, chptr) &&
(text[0] == '\001') && strncmp(text+1, "ACTION ", 7) &&
do_chanflood(chptr->mode.floodprot, FLD_CTCP) && MyClient(sptr))
{
do_chanflood_action(chptr, FLD_CTCP, "CTCP", 'C', MODE_NOCTCP);
do_chanflood_action(chptr, FLD_CTCP, "CTCP");
}
#endif
sendanyways = 0;
src/s_conf.c
+14
View File
@@ -666,18 +666,32 @@ void set_channelmodes(char *modes, struct ChMode *store)
{
case 'c':
newf.l[FLD_CTCP] = v;
if ((a == 'm') || (a == 'M'))
newf.a[FLD_CTCP] = a;
else
newf.a[FLD_CTCP] = 'C';
break;
case 'j':
newf.l[FLD_JOIN] = v;
if (a == 'R')
newf.a[FLD_TEXT] = a;
else
newf.a[FLD_TEXT] = 'i';
break;
case 'k':
newf.l[FLD_KNOCK] = v;
newf.a[FLD_KNOCK] = 'K';
break;
case 'm':
newf.l[FLD_MSG] = v;
if (a == 'M')
newf.a[FLD_CTCP] = a;
else
newf.a[FLD_CTCP] = 'm';
break;
case 'n':
newf.l[FLD_NICK] = v;
newf.a[FLD_NICK] = 'N';
break;
case 't':
newf.l[FLD_TEXT] = v;
src/s_user.c
+1 -1
View File
@@ -1817,7 +1817,7 @@ CMD_FUNC(m_nick)
if (chptr && !(mp->flags & (CHFL_CHANOP|CHFL_VOICE|CHFL_CHANOWNER|CHFL_HALFOP|CHFL_CHANPROT)) &&
chptr->mode.floodprot && do_chanflood(chptr->mode.floodprot, FLD_NICK) && MyClient(sptr))
{
do_chanflood_action(chptr, FLD_NICK, "nick", 'N', MODE_NONICKCHANGE);
do_chanflood_action(chptr, FLD_NICK, "nick");
}
}
}