Changeset 886 for trunk

Timestamp:

02/16/08 20:05:22 (11 months ago)

Author:

james

Message:

partial fix for #153

Files:

• trunk/modules/system.tcl (modified) (3 diffs)

trunk/modules/system.tcl

@@ -147 +147 @@
         global bMotionLastEvent bMotionChannels bMotionInfo 
 
+        set timeNow [clock seconds]
+
         # check if it's worth doing anything
         if {[bMotion_setting_get "bitlbee"]} {
@@ -199 +201 @@
         global BMOTION_SLEEP
 
-        set timeNow [clock seconds]
         set saidChannels [list]
         set silentChannels [list]
@@ -348 +349 @@
         global botnicks
 
-        bMotion_putloglev 2 * "checking $text to see if they're talking to me"
-        if [regexp -nocase "^$botnicks\[ :,\]" $text] {
-                bMotion_putloglev 2 * "`- yes"  
-                return 1
+        bMotion_putloglev 4 * "bMotionTalkingToMe $text"
+
+        # look for a nick at the start of the line
+        if [regexp -nocase {^([^ :,]+)} $text matches nick] {
+                bMotion_putloglev 2 * "looks like they're talking to $nick"
+                if [regexp -nocase $botnicks $nick] {
+                        bMotion_putloglev 2 * "that's me!"
+                        return 1
+                }
         }
 
         if [regexp -nocase "$botnicks\[!?~\]*$" $text] {
-                bMotion_putloglev 2 * "`- yes"  
-                return 1
-        }
-
-        bMotion_putloglev 2 * "`- no"
+                bMotion_putloglev 2 * "found my name at the end of the line"
+                return 1
+        }
+
+        bMotion_putloglev 2 * "not talking to me"
         return 0
 }