Changeset 1069

Timestamp:

02/01/10 18:59:10 (2 years ago)

Author:

james

Message:

add channel-level flood checking too

Location:

trunk/modules

Files:

• events.tcl (modified) (8 diffs)
• flood.tcl (modified) (3 diffs)

trunk/modules/events.tcl

@@ -266 +266 @@
 
         #check for someone breaking the loop of lastSpoke 
-        if {[regexp -nocase "(i'm not talking to|not) you" $text] && $bMotionCache($channel,last)} {
+        if {[regexp -nocase "(i'm not talking to|not) you" $text] && [bMotion_did_i_speak_last $channel]} {
                 bMotionDoAction $channel $nick "oh"
                 set bMotionCache($channel,last) 0
@@ -278 +278 @@
                 bMotion_flood_add $nick "" $text
                 if [bMotion_flood_check $nick] { return 0 }
+                if [bMotion_flood_check $channel] { return 0 }
+                bMotion_flood_add $channel "" $text
                 set nick [bMotionGetRealName $nick $host]
                 bMotionDoAction $channel $nick [pickRandom $response]
@@ -287 +289 @@
         if {[llength $response] > 0} {
         #set nick [bMotionGetRealName $nick $host]
+                if [bMotion_flood_check $channel] { return 0 }
                 bMotion_putloglev 1 * "going to run plugins: $response"
                 foreach callback $response {
@@ -295 +298 @@
                         set result 0
                         set result [$callback $nick $host $handle $channel $text]
+                        bMotion_putloglev d * "returned from $callback"
                         set bMotionCache(lastPlugin) $callback
                         bMotion_plugin_history_add $channel "complex" $callback
@@ -304 +308 @@
                         if {$result > 0} {
                                 if {$result == 1} {
+                                        bMotion_putloglev 1 * "adding flood counters"
                                         bMotion_flood_add $nick $callback $text
+                                        bMotion_flood_add $channel $callback $text
                                 }
                                 bMotion_putloglev 2 * "bMotion:          `-$callback returned $result, breaking out..."
@@ -453 +459 @@
         if {$response != ""} {
                 bMotion_flood_add $nick "" $text
+                if [bMotion_flood_check $nick] { return 0 }
+                if [bMotion_flood_check $channel] { return - }
+                bMotion_flood_add $channel "" $text
                 bMotion_putloglev 1 * "bMotion: matched simple action plugin, outputting $response..."
                 set nick [bMotionGetRealName $nick $host]
@@ -463 +472 @@
         if {[llength $response] > 0} {
         #set nick [bMotionGetRealName $nick $host]
+                if [bMotion_flood_check $channel] { return 0 }
                 bMotion_putloglev 1 * "going to run action plugins: $response"
                 foreach callback $response {
@@ -473 +483 @@
                                 if {$result == 1} {
                                         bMotion_flood_add $nick $callback $text
+                                        bMotion_flood_add $channel $callback $text
                                 }
                                 bMotion_putloglev 2 * "bMotion:          `-$callback returned $result, breaking out..."

trunk/modules/flood.tcl

@@ -82 +82 @@
 
   set val 1
-  if [validuser $nick] {
-    set handle $nick
-  } else {
-    set handle [nick2hand $nick]
-    if {$handle == "*"} {
-      set handle $nick
-    }
-  }
+        if {[string index $nick 0] != "#"} {
+                if [validuser $nick] {
+                        set handle $nick
+                } else {
+                        set handle [nick2hand $nick]
+                        if {$handle == "*"} {
+                                set handle $nick
+                        }
+                        bMotion_putloglev d * "Using handle $handle as flood target (was $nick)"
+                }
+        } else {
+                bMotion_putloglev d * "Using channel $nick as flood target"
+                set handle $nick
+        }
   set lastCallback ""
   catch {
@@ -196 +202 @@
 
 proc bMotion_flood_get { nick } {
-  global bMotion_flood_info
-  if [validuser $nick] {
-    set handle $nick
-  } else {
-    set handle [nick2hand $nick]
-    if {$handle == "*"} {
-      set handle $nick
-    }
-  }
-  set flood 0
-  catch {
+        global bMotion_flood_info
+        if {[string index $nick 0] != "#"} {
+                if [validuser $nick] {
+                        set handle $nick
+                } else {
+                        set handle [nick2hand $nick]
+                        if {$handle == "*"} {
+                                set handle $nick
+                        }
+                }
+        } else {
+                set handle $nick
+        }
+        set flood 0
+        catch {
     set flood $bMotion_flood_info($handle)
   }
@@ -226 +236 @@
   set flood [bMotion_flood_get $nick]
   set chance 2
-  if {$flood > 35} {
-    set chance -1
-  }
-
-  if {$flood > 25} {
-    set chance -1
-  }
-
-  if {$flood > 15} {
-    set chance 1
-  }
-  set r [rand 2]
-  if {!($r < $chance)} {
-    putlog "bMotion: FLOOD check on $nick (http://www.bmotion.net:8000/bmotion/wiki/FAQDisableFlood)"
-    return 1
-  }
+
+        if {[string index $nick 0] == "#"} {
+                set is_chan 1
+        } else {
+                set is_chan 0
+        }
+
+        if {!$is_chan} {
+                if {$flood > 35} {
+                        set chance -1
+                }
+
+                if {$flood > 25} {
+                        set chance -1
+                }
+
+                if {$flood > 15} {
+                        set chance 1
+                }
+                set r [rand 2]
+                if {!($r < $chance)} {
+                        putlog "bMotion: FLOOD check on $nick (http://www.bmotion.net:8000/bmotion/wiki/FAQDisableFlood)"
+                        return 1
+                }
+        } else {
+                if {$flood > 35} {
+                        putlog "bMotion: FLOOD protection for $nick (http://www.bmotion.net:8000/bmotion/wiki/FAQDisableFlood)"
+                        return 1
+                }
+        }
   return 0
 }