* Port [3359] to 1.2.14

 * Push +b on join/part flooders when they part if triggered.



svn: 3360

src/eggdrop.h

@@ -130,8 +130,9 @@ enum {		/* TAKE A GUESS */
 #define FLOOD_JOIN       4
 #define FLOOD_KICK       5
 #define FLOOD_DEOP       6
+#define FLOOD_PART       7
 
-#define FLOOD_CHAN_MAX   7
+#define FLOOD_CHAN_MAX   8
 #define FLOOD_GLOBAL_MAX 3
 
 #define FEATURE_NO_TAKE		BIT0

src/mod/irc.mod/chan.c

@@ -411,7 +411,7 @@ static bool detect_chan_flood(char *floodnick, char *floodhost, char *from,
    */
   memberlist *m = ismember(chan, floodnick);
 
-  if (!m && (which != FLOOD_JOIN))
+  if (!m && (which != FLOOD_JOIN) && (which != FLOOD_PART))
     return 0;
 
   struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0 };
@@ -453,6 +453,7 @@ static bool detect_chan_flood(char *floodnick, char *floodhost, char *from,
     strcpy(ftype, "nick");
     break;
   case FLOOD_JOIN:
+  case FLOOD_PART:
     thr = chan->flood_join_thr;
     lapse = chan->flood_join_time;
       strcpy(ftype, "join");
@@ -522,6 +523,7 @@ static bool detect_chan_flood(char *floodnick, char *floodhost, char *from,
       }
       return 1;
     case FLOOD_JOIN:
+    case FLOOD_PART:
     case FLOOD_NICK:
       if (use_exempts &&
 	  (u_match_mask(global_exempts, from) ||
@@ -535,19 +537,21 @@ static bool detect_chan_flood(char *floodnick, char *floodhost, char *from,
       if ((u_match_mask(global_bans, from))
 	  || (u_match_mask(chan->bans, from)))
 	return 1;		/* Already banned */
-      if (which == FLOOD_JOIN)
+      if (which == FLOOD_JOIN || which == FLOOD_PART)
 	putlog(LOG_MISC | LOG_JOIN, chan->dname, "JOIN flood from @%s!  Banning.", p);
       else
 	putlog(LOG_MISC | LOG_JOIN, chan->dname, "NICK flood from @%s!  Banning.", p);
       strcpy(ftype + 4, " flood");
       u_addmask('b', chan, h, conf.bot->nick, ftype, now + (60 * chan->ban_time), 0);
+      if (which == FLOOD_PART)
+        add_mode(chan, '+', 'b', h);
       if (!channel_enforcebans(chan) && me_op(chan)) {
 	  char s[UHOSTLEN];
 	  for (m = chan->channel.member; m && m->nick[0]; m = m->next) {	  
 	    simple_sprintf(s, "%s!%s", m->nick, m->userhost);
-	    if (wild_match(h, s) &&
+	    if (!chan_sentkick(m) && wild_match(h, s) &&
 		(m->joined >= chan->floodtime[which]) &&
-		!chan_sentkick(m) && !match_my_nick(m->nick) && me_op(chan)) {
+		!match_my_nick(m->nick) && me_op(chan)) {
 	      m->flags |= SENTKICK;
 	      if (which == FLOOD_JOIN)
    	        dprintf(DP_SERVER, "KICK %s %s :%sjoin flood\n", chan->name, m->nick, kickprefix);
@@ -2596,7 +2600,7 @@ static int gotpart(char *from, char *msg)
     set_handle_laston(chan->dname, u, now);
 
     if (m) {
-      detect_chan_flood(nick, m->userhost, from, chan, FLOOD_JOIN, NULL);
+      detect_chan_flood(nick, m->userhost, from, chan, FLOOD_PART, NULL);
       killmember(chan, nick);
     }
     if (msg[0])