Changeset 1069 for trunk/modules/events.tcl

Timestamp:

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

Author:

james

Message:

add channel-level flood checking too

File:

• trunk/modules/events.tcl (modified) (8 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..."