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

wraith · Aug 22, 2012 · 02c5feb · 02c5feb
1 parent b645513
commit 02c5feb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/doc/UPDATES b/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.

diff --git a/src/mod/irc.mod/irc.c b/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;