Changeset 1026 for trunk/modules/output.tcl

Timestamp:

08/29/09 04:42:03 (3 years ago)

Author:

james

Message:

Add diagnostic to parse all abstracts and report any broken ones

File:

• trunk/modules/output.tcl (modified) (6 diffs)

trunk/modules/output.tcl

@@ -121 +121 @@
 }
 
-#
-# our magic output function
-proc bMotionDoAction {channel nick text {moreText ""} {noTypo 0} {urgent 0} } {
-        bMotion_putloglev 5 * "bMotionDoAction($channel,$nick,$text,$moreText,$noTypo,$urgent)"
-        global bMotionInfo bMotionCache bMotionOriginalInput
-        global bMotion_output_delay bMotionSettings BMOTION_SLEEP
-
-        set bMotion_output_delay 0
-
-        #check our global toggle
-        global bMotionGlobal
-        if {$bMotionGlobal == 0} {
-                return 0
-        }
-
-        set bMotionCache($channel,last) 1
-
-        # check if we're asleep
-        if {[bMotion_setting_get "asleep"] == $BMOTION_SLEEP(ASLEEP)} {
-                return 0
-        }
-
-        if [regexp "^\[#!\].+" $channel] {
-                set channel [string tolower $channel]
-                if {![channel get $channel bmotion]} {
-                        bMotion_putloglev d * "bMotion: aborting bMotionDoAction ... $channel not allowed"
-                        return 0
-                }
-        }
-
-        if {[bMotion_setting_get "silence"] == 1} { 
-                return 0 
-        }
-        catch {
-                if {$bMotionInfo(adminSilence,$channel) == 1} { 
-                        return 0 
-                }
-        }
-
-        switch [rand 3] {
-                0 { }
-                1 { set nick [string tolower $nick] }
-                2 { set nick "[string range $nick 0 0][string tolower [string range $nick 1 end]]" }
-        }
-
-        # Process macros
+proc bMotion_process_macros { channel text } {
 
         set done 0
@@ -174 +129 @@
                 set current_pos [string first "%" $text $current_pos]
                 if {$current_pos == -1} {
-                        # no more matches
+                # no more matches
                         set done 1
                         continue
@@ -180 +135 @@
                 bMotion_putloglev d * "macro: found a % at $current_pos"
                 if {$current_pos < [string length $text]} {
-                        # this isn't a % at the end of the line
+                # this isn't a % at the end of the line
                         if {[string index $text [expr $current_pos + 1]] == "|"} {
                                 set current_pos [expr $current_pos + 2]
@@ -192 +147 @@
                                 set plugin [bMotion_plugin_find_output "en" "" 0 10 $macro]
                                 if {[llength $plugin] == 1} {
-                                        # call plugin
+                                # call plugin
                                         bMotion_putloglev d * "macro: found matching plugin for macro [lindex $plugin 0]"
                                         set result ""
@@ -235 +190 @@
                 incr current_pos
         }
+
+        return $text
+}
+
+#
+# our magic output function
+proc bMotionDoAction {channel nick text {moreText ""} {noTypo 0} {urgent 0} } {
+        bMotion_putloglev 5 * "bMotionDoAction($channel,$nick,$text,$moreText,$noTypo,$urgent)"
+        global bMotionInfo bMotionCache bMotionOriginalInput
+        global bMotion_output_delay bMotionSettings BMOTION_SLEEP
+
+        set bMotion_output_delay 0
+
+        #check our global toggle
+        global bMotionGlobal
+        if {$bMotionGlobal == 0} {
+                return 0
+        }
+
+        set bMotionCache($channel,last) 1
+
+        # check if we're asleep
+        if {[bMotion_setting_get "asleep"] == $BMOTION_SLEEP(ASLEEP)} {
+                return 0
+        }
+
+        if [regexp "^\[#!\].+" $channel] {
+                set channel [string tolower $channel]
+                if {![channel get $channel bmotion]} {
+                        bMotion_putloglev d * "bMotion: aborting bMotionDoAction ... $channel not allowed"
+                        return 0
+                }
+        }
+
+        if {[bMotion_setting_get "silence"] == 1} { 
+                return 0 
+        }
+        catch {
+                if {$bMotionInfo(adminSilence,$channel) == 1} { 
+                        return 0 
+                }
+        }
+
+        switch [rand 3] {
+                0 { }
+                1 { set nick [string tolower $nick] }
+                2 { set nick "[string range $nick 0 0][string tolower [string range $nick 1 end]]" }
+        }
+
+        # Process macros
+
+        set text [bMotion_process_macros $channel $text]
 
         # Run the plugins :D
@@ -482 +489 @@
         }
 
-        regsub -all "%%" $line "%percent" line
+        regsub -all "%" $line "%percent" line
 
         return $line