Browse files

Fix CAPS/COLOR flood detection not obeying x|x flags

  • Loading branch information...
1 parent b645513 commit 02c5feb0b2c58459f151875cff31b520c8db91a0 @bdrewery bdrewery committed Aug 22, 2012
Showing with 2 additions and 0 deletions.
  1. +1 −0 doc/UPDATES
  2. +1 −0 src/mod/irc.mod/irc.c
View
1 doc/UPDATES
@@ -3,6 +3,7 @@ maint
* Remove 'chanset +meankicks'. You can customize your kicks in doc/responses.txt and recompile.
* Don't allow running as root
* Don't allow more than 5 bots per binary.
+ * Fix CAPS/COLOR flood detection not obeying x|x flags
1.4.0 - http://wraith.botpack.net/milestone/1.4.0
* Updated server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.
View
1 src/mod/irc.mod/irc.c
@@ -127,6 +127,7 @@ detect_offense(memberlist* m, struct chanset_t *chan, char *msg)
get_user_flagrec(u, &fr, chan->dname, chan);
if (glob_bot(fr) ||
+ chk_noflood(fr) ||
(m && chan->flood_exempt_mode == CHAN_FLAG_OP && chan_hasop(m)) ||
(m && chan->flood_exempt_mode == CHAN_FLAG_VOICE && (chan_hasvoice(m) || chan_hasop(m))))
return 0;

0 comments on commit 02c5feb

Please sign in to comment.