Changeset 954 for trunk

Timestamp:

20/08/2008 17:55:55 (3 months ago)

Author:

james

Message:

check the queue for lines duplicating what we're seeing on the channel

Location:

trunk/modules

Files:

• events.tcl (modified) (13 diffs)
• interbot.tcl (modified) (16 diffs)
• output.tcl (modified) (1 diff)
• queue.tcl (modified) (9 diffs)

trunk/modules/events.tcl

@@ -23 +23 @@
 ### bMotionDoEventResponse 
 proc bMotionDoEventResponse { type nick host handle channel text } {
-        #check our global toggle
-  global bMotionGlobal bMotionInfo
-  if {$bMotionGlobal == 0} {
-    return 0
-  }
-
-  if [matchattr $handle J] {
-    return 0
-  }
-
-  set channel [string tolower $channel]
-
-  #ignore other bots
-  if {[matchattr $handle b] && (![matchattr $handle I])} {
-    set bMotionCache($channel,last) 0
-    return 0
-  }
-
-  bMotion_putloglev 4 * "entering bMotionDoEventResponse: $type $nick $host $handle $channel $text"
-  if { ![regexp -nocase "nick|join|quit|part|split" $type] } {
-    return 0
-  }
-
-  global bMotionInfo
-  set response [bMotion_plugin_find_irc_event $text $type $bMotionInfo(language)]
-  if {[llength $response] > 0} {
-    foreach callback $response {
+#check our global toggle
+        global bMotionGlobal bMotionInfo
+        if {$bMotionGlobal == 0} {
+                return 0
+        }
+
+        if [matchattr $handle J] {
+                return 0
+        }
+
+        set channel [string tolower $channel]
+
+        #ignore other bots
+        if {[matchattr $handle b] && (![matchattr $handle I])} {
+                set bMotionCache($channel,last) 0
+                return 0
+        }
+
+        bMotion_putloglev 4 * "entering bMotionDoEventResponse: $type $nick $host $handle $channel $text"
+        if { ![regexp -nocase "nick|join|quit|part|split" $type] } {
+                return 0
+        }
+
+        global bMotionInfo
+        set response [bMotion_plugin_find_irc_event $text $type $bMotionInfo(language)]
+        if {[llength $response] > 0} {
+                foreach callback $response {
                         bMotion_putloglev 2 * "adding flood for callback $callback"
                         bMotion_flood_add $nick $callback $text
-      if [bMotion_flood_check $nick] { return 0 }
-
-      bMotion_putloglev 1 * "bMotion: matched irc event plugin, running callback $callback"
-      set result [$callback $nick $host $handle $channel $text ]
+                        if [bMotion_flood_check $nick] { return 0 }
+
+                        bMotion_putloglev 1 * "bMotion: matched irc event plugin, running callback $callback"
+                        set result [$callback $nick $host $handle $channel $text ]
                         bMotion_putloglev 2 * "returned from callback $callback"
-      if {$result == 1} {
-        bMotion_putloglev 2 * "bMotion: $callback returned 1, breaking out..."
-        break
-      }
-      return 1
-    }
-    return 0
-  }
-  return 0
+                        if {$result == 1} {
+                                bMotion_putloglev 2 * "bMotion: $callback returned 1, breaking out..."
+                                break
+                        }
+                        return 1
+                }
+                return 0
+        }
+        return 0
 }
 
 ### bMotion_event_onjoin 
 proc bMotion_event_onjoin {nick host handle channel} {
-  #ignore me
-  if [isbotnick $nick] {
-    return 0
-  }
-
-  #ignore the J flag users
-  if [matchattr $handle J] {
-    return 0
-  }
-
-  #ignore bots without the I flag
-  if [matchattr $handle b-I] {
-    return 0
-  }
-
-        if {![channel get $channel bmotion]} {
-                return 0
-        }
-
-  set result [bMotionDoEventResponse "join" $nick $host $handle $channel ""]
+#ignore me
+if [isbotnick $nick] {
+return 0
+}
+
+#ignore the J flag users
+if [matchattr $handle J] {
+return 0
+}
+
+#ignore bots without the I flag
+if [matchattr $handle b-I] {
+return 0
+}
+
+if {![channel get $channel bmotion]} {
+        return 0
+}
+
+set result [bMotionDoEventResponse "join" $nick $host $handle $channel ""]
 }
 
@@ -95 +95 @@
 ### bMotion_event_onpart 
 proc bMotion_event_onpart {nick host handle channel {msg ""}} {
-  #check our global toggle
-  global bMotionGlobal
-  if {$bMotionGlobal == 0} {
-    return 0
-  }
+#check our global toggle
+        global bMotionGlobal
+        if {$bMotionGlobal == 0} {
+                return 0
+        }
 
         # channel is missing when the bot itself is parting, so ignore itself
@@ -110 +110 @@
         }
 
-  bMotion_putloglev 3 * "entering bmotion_event_onpart: $nick $host $handle $channel $msg"
+        bMotion_putloglev 3 * "entering bmotion_event_onpart: $nick $host $handle $channel $msg"
 
         bMotion_plugins_settings_set "system" "lastleft" $channel "" $nick
 
-  #TODO: Fix this? Passing a cleaned nick around can break things
-  set nick [bMotion_cleanNick $nick $handle]
-
-  set result [bMotionDoEventResponse "part" $nick $host $handle $channel $msg]
+        #TODO: Fix this? Passing a cleaned nick around can break things
+        set nick [bMotion_cleanNick $nick $handle]
+
+        set result [bMotionDoEventResponse "part" $nick $host $handle $channel $msg]
 }
 
 ### bMotion_event_onquit 
 proc bMotion_event_onquit {nick host handle channel reason} {
-  global bMotionSettings bMotionInfo
-
-  #check our global toggle
-  global bMotionGlobal
-  if {$bMotionGlobal == 0} {
-    return 0
-  }
+        global bMotionSettings bMotionInfo
+
+        #check our global toggle
+        global bMotionGlobal
+        if {$bMotionGlobal == 0} {
+                return 0
+        }
 
         # channel is missing when the bot itself is quiting, so ignore itself
@@ -139 +139 @@
         }
 
-  set nick [bMotion_cleanNick $nick $handle]
-
-  bMotion_plugins_settings_set "system" "lastleft" $channel "" $nick
-
-  if {$bMotionInfo(brig) != ""} {
-    #check if that person was in the brig
-    regexp -nocase "(.+)@(.+)" $bMotionInfo(brig) pop brigNick brigChannel
-    if [string match -nocase $nick $brigNick] {
-      set bMotionInfo(brig) ""
-      bMotionDoAction $brigChannel "" "Curses! They escaped from the brig."
-      return 0
-    }
-  }
-  set result [bMotionDoEventResponse "quit" $nick $host $handle $channel $reason ]
+        set nick [bMotion_cleanNick $nick $handle]
+
+        bMotion_plugins_settings_set "system" "lastleft" $channel "" $nick
+
+        if {$bMotionInfo(brig) != ""} {
+        #check if that person was in the brig
+                regexp -nocase "(.+)@(.+)" $bMotionInfo(brig) pop brigNick brigChannel
+                if [string match -nocase $nick $brigNick] {
+                        set bMotionInfo(brig) ""
+                        bMotionDoAction $brigChannel "" "Curses! They escaped from the brig."
+                        return 0
+                }
+        }
+        set result [bMotionDoEventResponse "quit" $nick $host $handle $channel $reason ]
 }
 
 ### bMotion_event_main 
 proc bMotion_event_main {nick host handle channel text} {
-  #check our global toggle
-  global bMotionGlobal bMotionPluginHistory
-  if {$bMotionGlobal == 0} {
-    return 0
-  }
-
-  ## Global definitions ##
-  global mood botnick
-  global bMotionLastEvent bMotionSettings botnicks bMotionCache bMotionInfo
-  global bMotionThisText bMotionOriginalInput bMotionOriginalNick
-
-  if [matchattr $handle J] {
-    return 0
-  }
-
-  set bMotionOriginalNick $nick
-
-  set channel [string tolower $channel]
-
-  #ignore other bots 
-  if {[matchattr $handle b] && (![matchattr $handle I])} {
-    set bMotionCache($channel,last) 0
-    return 0
-  }
+#check our global toggle
+        global bMotionGlobal bMotionPluginHistory
+        if {$bMotionGlobal == 0} {
+                return 0
+        }
+
+        ## Global definitions ##
+        global mood botnick
+        global bMotionLastEvent bMotionSettings botnicks bMotionCache bMotionInfo
+        global bMotionThisText bMotionOriginalInput bMotionOriginalNick
+
+        if [matchattr $handle J] {
+                return 0
+        }
+
+        set bMotionOriginalNick $nick
+
+        set channel [string tolower $channel]
+
+        #ignore other bots 
+        if {[matchattr $handle b] && (![matchattr $handle I])} {
+                set bMotionCache($channel,last) 0
+                return 0
+        }
 
         #make sure we're allowed to talk in here 
-  if {![channel get $channel bmotion]} {
-    return 0
-  }
+        if {![channel get $channel bmotion]} {
+                return 0
+        }
 
         #don't trigger on !seen etc 
@@ -196 +196 @@
                 return 0
         }
-        
-  bMotion_putloglev 4 * "bMotion: entering bMotion_event_main with nick: $nick host: $host handle: $handle chan: $channel text: $text"
-
-  set bMotionOriginalInput $text
-
-  #filter bold, etc codes out 
-  regsub -all "\002" $text "" text
-  regsub -all "\022" $text "" text
-  regsub -all "\037" $text "" text
+
+        bMotion_putloglev 4 * "bMotion: entering bMotion_event_main with nick: $nick host: $host handle: $handle chan: $channel text: $text"
+
+        bMotion_queue_dupecheck $text $channel
+
+        set bMotionOriginalInput $text
+
+        #filter bold, etc codes out 
+        regsub -all "\002" $text "" text
+        regsub -all "\022" $text "" text
+        regsub -all "\037" $text "" text
 
         # thanks, anonymous ticket poster (ticket #125)
-  regsub -all "\003\[0-9\]{0,2}(,\[0-9\]{1,2})?" $text "" text
-  
-  #try stripcodes (eggdrop 1.6.17+)
-  catch {
-        set text [stripcodes bcruag $text]
-  }
+        regsub -all "\003\[0-9\]{0,2}(,\[0-9\]{1,2})?" $text "" text
+
+        #try stripcodes (eggdrop 1.6.17+)
+        catch {
+                set text [stripcodes bcruag $text]
+        }
 
         bMotion_check_botnicks
 
-  #does this look like a paste? 
-  if [regexp -nocase {^[([]?[0-9]{2}[-:.][0-9]{2}. ?[[<(]?[%@+]?[a-z0-9` ]+[@+%]?. \w+} $text] {
-    return 0
-  }
-
-  ## Update the channel idle tracker 
-  set bMotionLastEvent($channel) [clock seconds]
-
-  #don't let people break us 
-  if {![matchattr $handle n]} {
-    if [regexp -nocase "%(pronoun|me|noun|colen|percent|VAR|\\|)" $text] {
-      regsub -all "%" $text "%percent" text
-    }
-  }
-  regsub -all "\</" $text "%slash" text
-        
-  #If this isn't just a smiley of some kind, trim smilies 
-  if {[string length $text] >= ([string length $botnick] + 4)} {
-    regsub -all -nocase {[;:=]-?[()d<>/sp9x]} $text "" text
-    regsub -all {([\-^])_*[\-^];*} $text "" text
+        #does this look like a paste? 
+        if [regexp -nocase {^[([]?[0-9]{2}[-:.][0-9]{2}. ?[[<(]?[%@+]?[a-z0-9` ]+[@+%]?. \w+} $text] {
+                return 0
+        }
+
+        ## Update the channel idle tracker 
+        set bMotionLastEvent($channel) [clock seconds]
+
+        #don't let people break us 
+        if {![matchattr $handle n]} {
+                if [regexp -nocase "%(pronoun|me|noun|colen|percent|VAR|\\|)" $text] {
+                        regsub -all "%" $text "%percent" text
+                }
+        }
+        regsub -all "\</" $text "%slash" text
+
+        #If this isn't just a smiley of some kind, trim smilies 
+        if {[string length $text] >= ([string length $botnick] + 4)} {
+                regsub -all -nocase {[;:=]-?[()d<>/sp9x]} $text "" text
+                regsub -all {([\-^])_*[\-^];*} $text "" text
                 regsub -all {\\o/} $text "" text
-  }
-
-  #Trim stuff 
-  set text [string trim $text]
-
-  ## Dump double+ spaces 
-  regsub -all "  +" $text " " text
-
-  ## Update the last-talked flag for the join system
-  bMotion_plugins_settings_set "system:join" "lasttalk" $channel "" 0
-
-  set bMotionThisText $text
-
-  #if we spoke last, add "$botnick: " if it's not in the line 
-  if {![regexp -nocase $botnicks $text] && ([bMotion_did_i_speak_last $channel] || ([bMotion_setting_get "bitlbee"] == "1"))} {
-        if [regexp {^[^:]+:.+} $text] {
-                        #since our nick isn't in the line and they're addressing someone, drop this line
-                        return 0
-                }
-    set text "${botnick}: $text"
-  }
- 
-  if {[bMotion_setting_get "bitlbee"] == "1"} {
-    bMotion_putloglev d * "bitlbee incoming from $nick: $text"
-  }
-
-  #check for someone breaking the loop of lastSpoke 
-  if {[regexp -nocase "(i'm not talking to|not) you" $text] && $bMotionCache($channel,last)} {
-    bMotionDoAction $channel $nick "oh"
-    set bMotionCache($channel,last) 0
-    return 0
-  }
-  set bMotionCache($channel,last) 0
-
-  #Run the simple plugins 
-  set response [bMotion_plugin_find_simple $text $bMotionInfo(language)]
-  if {$response != ""} {
-    bMotion_flood_add $nick "" $text
-    if [bMotion_flood_check $nick] { return 0 }
-    set nick [bMotionGetRealName $nick $host]
-    bMotionDoAction $channel $nick [pickRandom $response]
-    return 0
-  }
-
-  #Run the complex plugins 
-  set response [bMotion_plugin_find_complex $text $bMotionInfo(language)]
-  if {[llength $response] > 0} {
-    #set nick [bMotionGetRealName $nick $host]
-    bMotion_putloglev 1 * "going to run plugins: $response"
-    foreach callback $response {
+        }
+
+        #Trim stuff 
+        set text [string trim $text]
+
+        ## Dump double+ spaces 
+        regsub -all "  +" $text " " text
+
+        ## Update the last-talked flag for the join system
+        bMotion_plugins_settings_set "system:join" "lasttalk" $channel "" 0
+
+        set bMotionThisText $text
+
+        #if we spoke last, add "$botnick: " if it's not in the line 
+        if {![regexp -nocase $botnicks $text] && ([bMotion_did_i_speak_last $channel] || ([bMotion_setting_get "bitlbee"] == "1"))} {
+                if [regexp {^[^:]+:.+} $text] {
+                #since our nick isn't in the line and they're addressing someone, drop this line
+                        return 0
+                }
+                set text "${botnick}: $text"
+        }
+
+        if {[bMotion_setting_get "bitlbee"] == "1"} {
+                bMotion_putloglev d * "bitlbee incoming from $nick: $text"
+        }
+
+        #check for someone breaking the loop of lastSpoke 
+        if {[regexp -nocase "(i'm not talking to|not) you" $text] && $bMotionCache($channel,last)} {
+                bMotionDoAction $channel $nick "oh"
+                set bMotionCache($channel,last) 0
+                return 0
+        }
+        set bMotionCache($channel,last) 0
+
+        #Run the simple plugins 
+        set response [bMotion_plugin_find_simple $text $bMotionInfo(language)]
+        if {$response != ""} {
+                bMotion_flood_add $nick "" $text
+                if [bMotion_flood_check $nick] { return 0 }
+                set nick [bMotionGetRealName $nick $host]
+                bMotionDoAction $channel $nick [pickRandom $response]
+                return 0
+        }
+
+        #Run the complex plugins 
+        set response [bMotion_plugin_find_complex $text $bMotionInfo(language)]
+        if {[llength $response] > 0} {
+        #set nick [bMotionGetRealName $nick $host]
+                bMotion_putloglev 1 * "going to run plugins: $response"
+                foreach callback $response {
                         bMotion_putloglev 1 * "bMotion: doing flood for $callback..."
-      if [bMotion_flood_check $nick] { return 0 }
-
-      bMotion_putloglev 1 * "bMotion: `- running callback $callback"
+                        if [bMotion_flood_check $nick] { return 0 }
+
+                        bMotion_putloglev 1 * "bMotion: `- running callback $callback"
                         set result 0
                         set result [$callback $nick $host $handle $channel $text]
@@ -300 +302 @@
                         # they should return 0 if they don't trigger
 
-      if {$result > 0} {
+                        if {$result > 0} {
                                 if {$result == 1} {
                                         bMotion_flood_add $nick $callback $text
                                 }
-        bMotion_putloglev 2 * "bMotion:    `-$callback returned $result, breaking out..."
-        break
-      }
-    }
-  }
-
-  #Check for all caps 
-  regsub -all {[^A-Za-z]} $text "" textChars
-  regsub -all {[a-z]} $textChars "" textLowerChars
-  if {(([string length $textChars] > 4) && ([expr [string length $textLowerChars] / [string length $textChars]] > 0.9)) ||
-        [regexp ".+!{4,}" $text]} {
-    global blownAways
-    if {[rand 60] >= 55} {
-      bMotionDoAction $channel $nick "%VAR{blownAways}"
-      return 0
-    }
-  }
-
-  #Reload config files 
+                                bMotion_putloglev 2 * "bMotion:          `-$callback returned $result, breaking out..."
+                                break
+                        }
+                }
+        }
+
+        #Check for all caps 
+        regsub -all {[^A-Za-z]} $text "" textChars
+        regsub -all {[a-z]} $textChars "" textLowerChars
+        if {(([string length $textChars] > 4) && ([expr [string length $textLowerChars] / [string length $textChars]] > 0.9)) ||
+                 [regexp ".+!{4,}" $text]} {
+                global blownAways
+                if {[rand 60] >= 55} {
+                        bMotionDoAction $channel $nick "%VAR{blownAways}"
+                        return 0
+                }
+        }
+
+        #Reload config files 
         #TODO: move this into a plugin?
-  if [regexp -nocase "${botnicks},?:? re(hash|load)( your config files?)?" $text] {
-    #putlog "bMotion: $nick asked me to rehash in $channel"
-    global bMotion_testing bMotionRoot
-
-    if [matchattr $handle m] {
-      #check we're not going to die
-      catch {
-        bMotion_putloglev d * "bMotion: Testing new code..."
-        set bMotion_testing 1
-        source "$bMotionRoot/bMotion.tcl"
-      } msg
-
-      if {$msg != ""} {
-        putlog "bMotion: FATAL: Cannot rehash due to error: $msg"
-        putserv "NOTICE $nick :FATAL: Cannot rehash: $msg"
-        putchan $channel "A tremendous error occurred!"
-        return 0
-      } else {
-        bMotion_putloglev d * "bMotion: New code ok, rehashing..."
-                                bMotion_plugins_settings_set "system" "rehash" "" "" $channel
-        set bMotion_testing 0
-        if {[matchattr $handle m]} {
-          putchan $channel [bMotionDoInterpolation "%VAR{rehashes}" "" ""]
-          rehash
-          return 0
-        }
-      }
-    } else {
-                        #don't respond here because there's no flood protection
-      return 0
-    }
-  }
+        if [regexp -nocase "${botnicks},?:? re(hash|load)( your config files?)?" $text] {
+        #putlog "bMotion: $nick asked me to rehash in $channel"
+                global bMotion_testing bMotionRoot
+
+                if [matchattr $handle m] {
+                #check we're not going to die
+                catch {
+                bMotion_putloglev d * "bMotion: Testing new code..."
+                set bMotion_testing 1
+                source "$bMotionRoot/bMotion.tcl"
+                } msg
+
+                if {$msg != ""} {
+                        putlog "bMotion: FATAL: Cannot rehash due to error: $msg"
+                        putserv "NOTICE $nick :FATAL: Cannot rehash: $msg"
+                        putchan $channel "A tremendous error occurred!"
+                        return 0
+                } else {
+                        bMotion_putloglev d * "bMotion: New code ok, rehashing..."
+                        bMotion_plugins_settings_set "system" "rehash" "" "" $channel
+                        set bMotion_testing 0
+                        if {[matchattr $handle m]} {
+                                putchan $channel [bMotionDoInterpolation "%VAR{rehashes}" "" ""]
+                                rehash
+                                return 0
+                        }
+                }
+                } else {
+                #don't respond here because there's no flood protection
+                        return 0
+                }
+        }
 
         #tell the names we have 
         #TODO: move this into a plugin?
         if [regexp -nocase "${botnicks}:?,? say my names?(,? bitch)?" $text] {
-                if {($handle == "*") || ($handle == "")}  {
-                        #no handle = no saving IRL
+                if {($handle == "*") || ($handle == "")}        {
+                #no handle = no saving IRL
                         set lastnick [bMotion_plugins_settings_get "events" "last_irl_fail" $channel ""]
                         if {$lastnick == $nick} {
@@ -382 +384 @@
         }
 
-  #shut up 
+        #shut up 
         #TODO: move this into a plugin?
-  if [regexp -nocase "^${botnicks}:?,? (silence|shut up|be quiet|go away)" $text] {
-    driftFriendship $nick -10
-    bMotionSilence $nick $host $channel
-    return 0
-  }
-
-  if [regexp -nocase "(silence|shut up|be quiet|go away),?;? ${botnicks}" $text] {
-    driftFriendship $nick -10
-    bMotionSilence $nick $host $channel
-    return 0
-  }
+        if [regexp -nocase "^${botnicks}:?,? (silence|shut up|be quiet|go away)" $text] {
+                driftFriendship $nick -10
+                bMotionSilence $nick $host $channel
+                return 0
+        }
+
+        if [regexp -nocase "(silence|shut up|be quiet|go away),?;? ${botnicks}" $text] {
+                driftFriendship $nick -10
+                bMotionSilence $nick $host $channel
+                return 0
+        }
 
         #catch actions in stars 
-  #This is the clever bit. If the text is "*blah blah blah*" reinject it into bMotion as an action ##
-  if [regexp {^\*(.+)\*$} $text blah action] {
-    bMotion_putloglev 1 * "Unhandled *$action* by $nick in $channel... redirecting to action handler"
-    bMotion_event_action $nick $host $handle $channel "" $action
-    return 0
-  }
+        #This is the clever bit. If the text is "*blah blah blah*" reinject it into bMotion as an action ##
+        if [regexp {^\*(.+)\*$} $text blah action] {
+                bMotion_putloglev 1 * "Unhandled *$action* by $nick in $channel... redirecting to action handler"
+                bMotion_event_action $nick $host $handle $channel "" $action
+                return 0
+        }
 }
 
@@ -408 +410 @@
 proc bMotion_event_action {nick host handle dest keyword text} {
 
-  #check our global toggle
-  global bMotionGlobal
-  if {$bMotionGlobal == 0} {
-    return 0
-  }
-
-  global botnick mood rarrs smiles unsmiles botnicks bMotionCache bMotionSettings bMotionInfo
-  set dest [channame2dname $dest]
-  set channel $dest
-
-  if [matchattr $handle J] {
-    return 0
-  }
-
-  #ignore other bots
-  if {[matchattr $handle b]} {
-    return 0
-  }
+#check our global toggle
+        global bMotionGlobal
+        if {$bMotionGlobal == 0} {
+                return 0
+        }
+
+        global botnick mood rarrs smiles unsmiles botnicks bMotionCache bMotionSettings bMotionInfo
+        set dest [channame2dname $dest]
+        set channel $dest
+
+        if [matchattr $handle J] {
+                return 0
+        }
+
+        #ignore other bots
+        if {[matchattr $handle b]} {
+                return 0
+        }
 
         if {![channel get $channel bmotion]} {