Changeset 941 for trunk/modules/events.tcl

Timestamp:

02/07/2008 10:26:11 (5 months ago)

Author:

james

Message:

filter out more smilies

Files:

• trunk/modules/events.tcl (modified) (27 diffs)

trunk/modules/events.tcl

@@ -21 +21 @@
 ###############################################################################
 
-### bMotionDoEventResponse <<<1
+### bMotionDoEventResponse 
 proc bMotionDoEventResponse { type nick host handle channel text } {
         #check our global toggle
@@ -68 +68 @@
 }
 
-### bMotion_event_onjoin <<<1
+### bMotion_event_onjoin 
 proc bMotion_event_onjoin {nick host handle channel} {
   #ignore me
@@ -93 +93 @@
 
 
-### bMotion_event_onpart <<<1
+### bMotion_event_onpart 
 proc bMotion_event_onpart {nick host handle channel {msg ""}} {
   #check our global toggle
@@ -120 +120 @@
 }
 
-### bMotion_event_onquit <<<1
+### bMotion_event_onquit 
 proc bMotion_event_onquit {nick host handle channel reason} {
   global bMotionSettings bMotionInfo
@@ -155 +155 @@
 }
 
-### bMotion_event_main <<<1
+### bMotion_event_main 
 proc bMotion_event_main {nick host handle channel text} {
   #check our global toggle
@@ -176 +176 @@
   set channel [string tolower $channel]
 
-  #ignore other bots <<<2
+  #ignore other bots 
   if {[matchattr $handle b] && (![matchattr $handle I])} {
     set bMotionCache($channel,last) 0
@@ -182 +182 @@
   }
 
-        #make sure we're allowed to talk in here <<<2
+        #make sure we're allowed to talk in here 
   if {![channel get $channel bmotion]} {
     return 0
   }
 
-        #don't trigger on !seen etc <<<2
+        #don't trigger on !seen etc 
         if [regexp -nocase "^!(last)?seen" $text] {
                 return 0
@@ -197 +197 @@
         }
         
-        #>>>
-
   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 <<<2
+  #filter bold, etc codes out 
   regsub -all "\002" $text "" text
   regsub -all "\022" $text "" text
@@ -218 +216 @@
         bMotion_check_botnicks
 
-  #does this look like a paste? <<<2
+  #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 <<<2
+  #don't let people break us 
   if {![matchattr $handle n]} {
     if [regexp -nocase "%(pronoun|me|noun|colen|percent|VAR|\\|)" $text] {
@@ -235 +232 @@
   regsub -all "\</" $text "%slash" text
         
-  #If this isn't just a smiley of some kind, trim smilies <<<2
+  #If this isn't just a smiley of some kind, trim smilies 
   if {[string length $text] >= ([string length $botnick] + 4)} {
-    regsub -all -nocase {[;:=]-?[)D>/]} $text "" text
+    regsub -all -nocase {[;:=]-?[()d<>/sp9x]} $text "" text
     regsub -all {([\-^])_*[\-^];*} $text "" text
                 regsub -all {\\o/} $text "" text
   }
 
-  #Trim stuff <<<2
+  #Trim stuff 
   set text [string trim $text]
 
-  ## Dump double+ spaces #
+  ## Dump double+ spaces 
   regsub -all "  +" $text " " text
-        #>>>
 
   ## Update the last-talked flag for the join system
@@ -254 +250 @@
   set bMotionThisText $text
 
-  #if we spoke last, add "$botnick: " if it's not in the line <<<2
+  #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"])} {
         if [regexp {^[^:]+:.+} $text] {
@@ -262 +258 @@
     set text "${botnick}: $text"
   }
-        #>>>
  
   if [bMotion_setting_get "bitlbee"] {
@@ -268 +263 @@
   }
 
-  #check for someone breaking the loop of lastSpoke <<<2
+  #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"
@@ -275 +270 @@
   }
   set bMotionCache($channel,last) 0
-        #>>>
-
-  #Run the simple plugins <<<2
+
+  #Run the simple plugins 
   set response [bMotion_plugin_find_simple $text $bMotionInfo(language)]
   if {$response != ""} {
@@ -287 +281 @@
   }
 
-  #Run the complex plugins <<<2
+  #Run the complex plugins 
   set response [bMotion_plugin_find_complex $text $bMotionInfo(language)]
   if {[llength $response] > 0} {
@@ -316 +310 @@
   }
 
-  #Check for all caps <<<2
+  #Check for all caps 
   regsub -all {[^A-Za-z]} $text "" textChars
   regsub -all {[a-z]} $textChars "" textLowerChars
@@ -327 +321 @@
     }
   }
-        #>>>
-
-  #Reload config files <<<2
+
+  #Reload config files 
         #TODO: move this into a plugin?
   if [regexp -nocase "${botnicks},?:? re(hash|load)( your config files?)?" $text] {
@@ -364 +357 @@
   }
 
-        #tell the names we have <<<2
+        #tell the names we have 
         #TODO: move this into a plugin?
         if [regexp -nocase "${botnicks}:?,? say my names?(,? bitch)?" $text] {
@@ -389 +382 @@
         }
 
-  #shut up <<<2
+  #shut up 
         #TODO: move this into a plugin?
   if [regexp -nocase "^${botnicks}:?,? (silence|shut up|be quiet|go away)" $text] {
@@ -403 +396 @@
   }
 
-        #catch actions in stars <<<2
+        #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] {
@@ -412 +405 @@
 }
 
-### bMotion_event_action <<<1
+### bMotion_event_action 
 proc bMotion_event_action {nick host handle dest keyword text} {
 
@@ -442 +435 @@
   set nick [bMotion_cleanNick $nick $handle]
 
-  #Trim <<<2
+  #Trim 
   set text [string trim $text]
 
@@ -454 +447 @@
         bMotion_check_botnicks
 
-  #Run the simple plugins <<<2
+  #Run the simple plugins 
   set response [bMotion_plugin_find_action_simple $text $bMotionInfo(language)]
   if {$response != ""} {
@@ -464 +457 @@
   }
 
-  #Run the complex plugins <<<2
+  #Run the complex plugins 
   set response [bMotion_plugin_find_action_complex $text $bMotionInfo(language)]
   if {[llength $response] > 0} {
@@ -485 +478 @@
     return 0
   }
-        #>>>
-}
-
-### bMotion_event_mode <<<1
+}
+
+### bMotion_event_mode 
 proc bMotion_event_mode {nick host handle channel mode victim} {
   #check our global toggle
@@ -530 +522 @@
 }
 
-### bMotion_event_nick <<<1
+### bMotion_event_nick 
 proc bMotion_event_nick { nick host handle channel newnick } {
 
@@ -553 +545 @@
 }
 
-# >>>
 bMotion_putloglev d * "bMotion: events module loaded"