Changeset 961

Timestamp:

27/09/2008 18:31:43 (2 months ago)

Author:

james

Message:

new output plugin arrangement!

Location:

trunk

Files:

• modules/abstracts/en/abstracts.tcl (modified) (5 diffs)
• modules/abstracts/en/randomstuff.tcl (modified) (2 diffs)
• modules/events.tcl (modified) (1 diff)
• modules/output.tcl (modified) (6 diffs)
• modules/plugins.tcl (modified) (3 diffs)
• modules/system.tcl (modified) (1 diff)
• plugins/admin_plugin.tcl (modified) (1 diff)
• plugins/en/action_complex_failsafe.tcl (modified) (1 diff)
• plugins/en/action_complex_smacks.tcl (modified) (2 diffs)
• plugins/en/complex_fuckoff.tcl (modified) (1 diff)
• plugins/en/complex_hello.tcl (modified) (1 diff)
• plugins/en/irc_join.tcl (modified) (2 diffs)
• plugins/en/output_NUMBER.tcl (added)
• plugins/en/output_OWNER.tcl (added)
• plugins/en/output_PLURAL.tcl (added)
• plugins/en/output_REPEAT.tcl (added)
• plugins/en/output_SETTING.tcl (added)
• plugins/en/output_TIME.tcl (added)
• plugins/en/output_VAR.tcl (added)
• plugins/en/output_VERB.tcl (added)
• plugins/en/output_append.tcl (modified) (1 diff)
• plugins/en/output_colloquial.tcl (modified) (1 diff)
• plugins/en/output_demon.tcl (modified) (1 diff)
• plugins/en/output_diddlydots.tcl (modified) (1 diff)
• plugins/en/output_ebonics.tcl (modified) (1 diff)
• plugins/en/output_english.tcl (modified) (1 diff)
• plugins/en/output_fix.tcl (modified) (1 diff)
• plugins/en/output_general.tcl (modified) (1 diff)
• plugins/en/output_jeffk.tcl (modified) (1 diff)
• plugins/en/output_preprocess.tcl (added)
• plugins/en/output_scots.tcl (modified) (1 diff)
• plugins/en/output_synonym.tcl (modified) (1 diff)
• plugins/en/output_typos.tcl (modified) (1 diff)
• plugins/en/output_welsh.tcl (modified) (1 diff)

trunk/modules/abstracts/en/abstracts.tcl

@@ -3263 +3263 @@
         "middle earth"
         "the heart of the world"
-        "bree"
+        "behind the fridge"
+        "down the back of the sofa"
+        "up my cavernous arse"
+        "up your cavernous arse"
+        "up %OWNER{%ruser} cavernous arse"
 }
 
@@ -3292 +3296 @@
         "\[%%\] I love %ruser%|%VAR{wrong_infoline}"
         "\[%%\] Just call me %VAR{sillyThings}%|%VAR{wrong_infoline}"
+}
+
+# someone we don't know joins the channel
+bMotion_abstract_register "unknown_joins" {
+        "%VAR{ranjoins}"
 }
 
@@ -4068 +4077 @@
         "Day %NUMBER{500} %VAR{bb_time}: %ruser is in the diary room, talking to Big Brother about %VAR{bb_diary}"
         "Day %NUMBER{500} %VAR{bb_time}: %ruser has hidden %OWNER{%ruser} %VAR{bb_posession} in %VAR{bb_hide}"
-}
+        "Day %NUMBER{500} %VAR{bb_time}: %ruser has been crying in the %VAR{bb_room} for %NUMBER{100} minutes"
+        "Day %NUMBER{500} %VAR{bb_time}: %ruser had a dream about %VAR{nightmare}. %ruser hides in the %VAR{bb_room}"
+}
+
+bMotion_abstract_register "bb_room" {
+        "diary room"
+        "kitchen"
+        "dining area"
+        "lounge"
+        "garden"
+        "roof"
+}
+
 bMotion_abstract_register "bb_time" {
         "%TIME{now}"
@@ -4241 +4262 @@
         "%daytime!%|%VAR{todays_episode}"
         "%daytime%|%VAR{todays_episode}"
+        "%VAR{bb_stuff}"
 }
 
@@ -4346 +4368 @@
 }
 
+bMotion_abstract_register "noun_prefix" {
+        "space"
+        "surprise"
+        "lovely"
+        "minging"
+        "nice"
+        "horrible"
+}
+
 source "$bMotionModules/abstracts/en/randomstuff.tcl"

trunk/modules/abstracts/en/randomstuff.tcl

@@ -6 +6 @@
 ### Used when the channel is not 'active' (default > 300s since last line)
 bMotion_abstract_register "randomStuff" {
+        "/washes %hisher %VAR{bodypart}"
         "%BOT\[<%me> good news everyone, I'm a horse's butt!\]%|i am? that doesn't sound like good news at all %VAR{unsmiles}"
         "too bad %ruser's not around... i'll have to eat this raw dripping ham by myself"
@@ -454 +455 @@
 ### Used when the channel is 'active' (default < 300 sec since last line)
 bMotion_abstract_register "activeRandomStuff" {
+        "that's nice dear"
         "very good, give me surprised and pleased"
         "impossible%|you are already at full cock now"

trunk/modules/events.tcl

@@ -348 +348 @@
                         set bMotion_testing 0
                         if {[matchattr $handle m]} {
-                                putchan $channel [bMotionDoInterpolation "%VAR{rehashes}" "" ""]
+                                putchan $channel [bMotion_abstract_get "rehashes"]
                                 rehash
                                 return 0

trunk/modules/output.tcl

@@ -163 +163 @@
         }
 
-        #do this first now
+
+        # Run the plugins :D
+
+        # First run the core plugins
+        set plugins [bMotion_plugin_find_output $bMotionInfo(language) $channel 0 10]
+        if {[llength $plugins] > 0} {
+                foreach callback $plugins {
+                        bMotion_putloglev 1 * "bMotion: output plugin: $callback..."
+                        set result ""
+                        catch {
+                                set result [$callback $channel $text]
+                        } err
+                        bMotion_putloglev 3 * "bMotion: returned from output $callback ($result)"
+                        # TODO: Still used?
+                        if {$result == ""} {
+                                return 0
+                        }
+                        set text $result
+                }
+        }
+
         set text [bMotionDoInterpolation $text $nick $moreText $channel]
 
-        set multiPart 0
-        if [string match "*%|*" $text] {
-                set multiPart 1
-                # we have many things to do
-                set thingsToSay ""
-                set loopCount 0
-                set blah 0
-
-                #make sure we get the last section
-                set text "$text%|"
-
-                while {[string match "*%|*" $text]} {
-                        set origtext $text
-                        set sentence [string range $text 0 [expr [string first "%|" $text] -1]]
-                        if {$sentence != ""} {
-                                if {$blah == 0} {
-                                        set thingsToSay [list $sentence]
-                                        set blah 1
-                                } else {
-                                        lappend thingsToSay $sentence
+        # now the rest
+        if {$noTypo == 0} {
+                set plugins [bMotion_plugin_find_output $bMotionInfo(language) $channel 11]
+                if {[llength $plugins] > 0} {
+                        foreach callback $plugins {
+                                bMotion_putloglev 1 * "bMotion: output plugin: $callback..."
+                                set result ""
+                                catch {
+                                        set result [$callback $channel $text]
+                                } err
+                                bMotion_putloglev 3 * "bMotion: returned from output $callback ($result)"
+                                if {$result == ""} {
+                                        return 0
                                 }
-                        }
-                        set text [string range $text [expr [string first "%|" $text] + 2] end]
-                        if {$text == $origtext} {
-                                putlog "bMotion ALERT! Bailed in bMotionDoAction with $text. Lost output."
-                                return 0
-                        }
-                }
-        }
-
-        if {$multiPart == 1} {
-                foreach lineIn $thingsToSay {
-                        set temp [bMotionSayLine $channel $nick $lineIn $moreText $noTypo $urgent]
-                        if {$temp == 1} {
-                                bMotion_putloglev 1 * "bMotion: bMotionSayLine returned 1, skipping rest of output"
-                                #1 stops continuation after a failed %bot[n,]
-                                break
-                        }
-                        set typosDone [bMotion_plugins_settings_get "output:typos" "typosDone" "" ""]
-                        bMotion_putloglev 2 * "bMotion: typosDone (multipart) is !$typosDone!"
-                        if {$typosDone != ""} {
-                                bMotion_plugins_settings_set "output:typos" "typosDone" "" "" ""
-                                if [rand 2] {
-                                        bMotionDoAction $channel "" "%VAR{typoFix}" "" 1
-                                }
-                                bMotion_plugins_settings_set "output:typos" "typos" "" "" ""
-                        }
-                }
+                                set text $result
+                        }
+                }
+        }
+
+        #make sure the line wasn't set to blank by a plugin (may be trying to block output)
+        set line [string trim $text]
+        if {$line == ""} {
                 return 0
         }
 
-        bMotionSayLine $channel $nick $text $moreText $noTypo $urgent
-        set typosDone [bMotion_plugins_settings_get "output:typos" "typosDone" "" ""]
-        bMotion_putloglev 2 * "bMotion: typosDone is !$typosDone!"
-        if {$typosDone != ""} {
-                bMotion_plugins_settings_set "output:typos" "typosDone" "" "" ""
-                if [rand 2] {
-                        bMotionDoAction $channel "" "%VAR{typoFix}" "" 1
-                }
-                bMotion_plugins_settings_set "output:typos" "typos" "" "" ""
-        }
-
+        # Explode line into lines
+        # We map %| to NUL and split on that, since [split] can't
+        # handle multichar boundaries
+        set lines [split [string map [list "%|" \x00] $line] \x00]
+
+        foreach lineIn $lines {
+                set temp [bMotionSayLine $channel $nick $lineIn $moreText $noTypo $urgent]
+                if {$temp == 1} {
+                        bMotion_putloglev 1 * "bMotion: bMotionSayLine returned 1, skipping rest of output"
+                        #1 stops continuation after a failed %bot[n,]
+                        break
+                }
+                #set typosDone [bMotion_plugins_settings_get "output:typos" "typosDone" "" ""]
+                #bMotion_putloglev 2 * "bMotion: typosDone is !$typosDone!"
+                ## TODO: fix this
+                #if {$typosDone != ""} {
+                #       bMotion_plugins_settings_set "output:typos" "typosDone" "" "" ""
+                #       if [rand 2] {
+                #               bMotionDoAction $channel "" "%VAR{typoFix}" "" 1
+                #       }
+                #       bMotion_plugins_settings_set "output:typos" "typos" "" "" ""
+                #}
+        }
         return 0
 }
@@ -238 +244 @@
         global botnick bMotionCache
 
-        if [string match "*%noun*" $line] {
-                set line [bMotionInsertString $line "%noun" "%VAR{sillyThings}"]
-        }
-
-        #set loops 0
-        bMotion_putloglev 4 * "doing VAR processing"
-        set lastloop ""
-        while {[regexp -nocase {%VAR\{([^\}]+)\}(\{strip\})?} $line matches BOOM clean]} {
-                global $BOOM
-                #see if we have a new-style abstract available
-                set newText [bMotion_abstract_get $BOOM]
-                set replacement ""
-                if {$newText == ""} {
-                        bMotion_putloglev d * "abstract '$BOOM' doesn't exist in new abstracts system!"
-                        #insert old style
-                        set var [subst $$BOOM]
-                        set replacement [pickRandom $var]
-                } else {
-                        set replacement $newText
-                }
-                if {$clean != ""} {
-                        set replacement [bMotion_strip_article $replacement]
-                }
-                regsub -nocase "%VAR\{$BOOM\}$clean" $line $replacement line
-                if [string match "*%noun*" $line] {
-                        set line [bMotionInsertString $line "%noun" "%VAR{sillyThings}"]
-                }
-                if {$lastloop == $line} {
-                        putlog "bMotion: ALERT! looping too much in %VAR code with $line (no change since last parse)"
-                        set line "/has a tremendous error while trying to sort something out :("
-                        break
-                }
-                set lastloop $line
-        }
-
-        set loops 0
-        bMotion_putloglev 4 * "doing SETTING processing"
-        while {[regexp "%SETTING\{(.+?)\}" $line matches settingString]} {
-                set var ""
-                if [regexp {([^:]+:[^:]+):([^:]+):([^:]+):([^:]+)} $settingString matches plugin setting ch ni] {
-                        set var [bMotion_plugins_settings_get $plugin $setting $ch $ni]
-                }
-                incr loops
-                if {$loops > 10} {
-                        putlog "bMotion: ALERT! looping too much in %SETTING code with $line"
-                        set line "/has a tremendous error while trying to infer the meaning of life :("
-                }
-                if {$var == ""} {
-                        putlog "bMotion: ALERT! couldn't find setting $settingString (dropping output)"
-                        return ""
-                }
-                set line [bMotionInsertString $line "%SETTING{$settingString}" $var]
-        }
-
-        set loops 0
-        bMotion_putloglev 4 * "doing NUMBER processing"
-        set padding 0
-        while {[regexp "%NUMBER\{(\[0-9\]+)\}(\{(\[0-9\]+)\})?" $line matches numberString paddingOpt padding]} {
-                set var [bMotion_get_number [bMotion_rand_nonzero $numberString]]
-                if {$padding > 0} {
-                        set fmt "%0$padding"
-                        append fmt "u"
-                        set var [format $fmt $var]
-                }
-                incr loops
-                if {$loops > 10} {
-                        putlog "bMotion: ALERT! looping too much in %NUMBER code with $line"
-                        set line "/has a tremendous error while trying to think of a number :("
-                }
-                set line [bMotionInsertString $line "%NUMBER\\{$numberString\\}(\\{\[0-9\]+\\})?" $var]
-                set padding 0
-        }
-
-        set loops 0
-        bMotion_putloglev 4 * "doing TIME processing"
-        while {[regexp "%TIME\{(\[a-zA-Z0-9 -\]+)\}" $line matches timeString]} {
-                bMotion_putloglev 2 * "found timestring $timeString"
-                set origtime $timeString
-                regsub -nocase {^-([0-9]) minutes?$} $timeString "\\1 minutes ago" timeString
-                set var [clock scan $timeString]
-                set var [clock format $var -format "%I:%M %p"]
-                bMotion_putloglev 2 * "using time $var"
-                incr loops
-                if {$loops > 10} {
-                        putlog "bMotion: ALERT! looping too much in %TIME code with %line"
-                        set line "/has a tremendous error while trying to do complex time mathematics :("
-                }
-                set line [bMotionInsertString $line "%TIME\\{$origtime\\}" $var]
-        }
-
         bMotion_putloglev 4 * "doing misc interpolation processing for $line"
         set line [bMotionInsertString $line "%%" $nick]
-        set line [bMotionInsertString $line "%pronoun" [getPronoun]]
-        set line [bMotionInsertString $line "%himherself" [getPronoun]]
-        set line [bMotionInsertString $line "%me" $botnick]
-        set line [bMotionInsertString $line "%colen" [bMotionGetColenChars]]
-        set line [bMotionInsertString $line "%hishers" [getHisHers]]
-        set line [bMotionInsertString $line "%heshe" [getHeShe]]
-        set line [bMotionInsertString $line "%hisher" [getHisHer]]
         set line [bMotionInsertString $line "%2" $moreText]
         set line [bMotionInsertString $line "%percent" "%"]
-        set line [bMotionInsertString $line "%daytime" [bMotion_get_daytime]]
-
 
         bMotion_putloglev 4 * "done misc"
@@ -387 +294 @@
 proc bMotionInterpolation2 { line } {
         bMotion_putloglev 5 * "bMotionInterpolation2 ($line)"
-        #owners
-        set loops 0
-
-        while {[regexp -nocase "%OWNER\{(.*?)\}" $line matches BOOM]} {
-                set BOOM [string map {\\ \\\\ [ \\\[ ] \\\] \{ \\\{ \} \\\} $ \\\$ \" \\\" | \\\|} $BOOM]
-
-                incr loops
-                if {$loops > 10} {
-                        putlog "bMotion: ALERT! looping too much in %OWNER code with $line"
-                        set line "/has a tremendous error while trying to sort something out :("
-                }
-                # set line [bMotionInsertString $line "%OWNER\{$BOOM\}" [bMotionMakePossessive $BOOM]]
-                regsub -nocase "%OWNER\{$BOOM\}" $line [bMotionMakePossessive $BOOM] line
-                regsub -all "\\\\" $line "" line
-        }
-
-        set loops 0
-        while {[regexp -nocase "%VERB\{(.*?)\}" $line matches BOOM]} {
-                incr loops
-                if {$loops > 10} {
-                        putlog "bMotion: ALERT! looping too much in %VERB code with $line"
-                        set line "/has a tremendous error while trying to sort something out :("
-                }
-                # set line [bMotionInsertString $line "%VERB\{$BOOM\}" [bMotionMakeVerb $BOOM]]
-                regsub -nocase "%VERB\{$BOOM\}" $line [bMotionMakeVerb $BOOM] line
-        }
-
-        set loops 0
-        while {[regexp -nocase "%PLURAL\{(.*?)\}" $line matches BOOM]} {
-                incr loops
-                if {$loops > 10} {
-                        putlog "bMotion: ALERT! looping too much in %PLURAL code with $line"
-                        set line "/has a tremendous error while trying to sort something out :("
-                }
-                # set line [bMotionInsertString $line "%PLURAL\{$BOOM\}" [bMotionMakePlural $BOOM]]
-                regsub -nocase "%PLURAL\{$BOOM\}" $line [bMotionMakePlural $BOOM] line
-        }
-
-        set loops 0
-        while {[regexp -nocase "%REPEAT\{(.+?)\}" $line matches BOOM]} {
-                incr loops
-                if {$loops > 10} {
-                        putlog "bMotion: ALERT! looping too much in %REPEAT code with $line"
-                        set line "/has a tremendous error while trying to sort something out :("
-                }
-                set replacement [bMotionMakeRepeat $BOOM]
-                regsub -nocase "%REPEAT\\{$BOOM\\}" $line $replacement line
-        }
 
         return $line
@@ -446 +305 @@
         global mood botnick bMotionInfo bMotionCache bMotionOriginalInput
         global bMotion_output_delay
-
-        set line [bMotionInterpolation2 $line]
 
         #TODO: Put %ruser and %rbot back in here
@@ -470 +327 @@
                 } else {
                 #non-random
-                regexp {%BOT\[(@[^,]+,)?(.+)\]} $line matches condition cmd
+                        regexp {%BOT\[(@[^,]+,)?(.+)\]} $line matches condition cmd
                 }
 
@@ -514 +371 @@
                         }
                 }
-        }
-
-        # Run the plugins :D
-
-        if {$noTypo == 0} {
-                set plugins [bMotion_plugin_find_output $bMotionInfo(language) $channel]
-                if {[llength $plugins] > 0} {
-                        foreach callback $plugins {
-                                bMotion_putloglev 1 * "bMotion: output plugin: $callback..."
-                                set result ""
-                                catch {
-                                        set result [$callback $channel $line]
-                                } err
-                                bMotion_putloglev 3 * "bMotion: returned from output $callback ($result)"
-                                if [regexp "1Š(.+)" $result matches line] {
-                                        break
-                                }
-                                if {$result == ""} {
-                                        return 0
-                                }
-                                set line $result
-                        }
-                }
-        }
-
-        #make sure the line wasn't set to blank by a plugin (may be trying to block output)
-        if {($line == "") || [regexp "^ +$" $line]} {
-                return 0
         }
 

trunk/modules/plugins.tcl

@@ -258 +258 @@
 #
 # Load an output plugin
-proc bMotion_plugin_add_output { id callback enabled language { priority 2 } } {
+proc bMotion_plugin_add_output { id callback enabled language { priority 11 } } {
         global bMotion_plugins_output plugins bMotion_testing bMotion_noplugins
 
@@ -283 +283 @@
 # Sorted by priority then name
 # Includes plugins only enabled for the given channel
-proc bMotion_plugin_find_output { lang { channel "" } } {
+proc bMotion_plugin_find_output { lang { channel "" } { min_priority 0} { max_priority 100 } } {
         global bMotion_plugins_output botnicks
         global bMotion_plugins_output_perchan
@@ -295 +295 @@
                 set language [lindex $val $BMOTION_PLUGIN_OUTPUT_LANGUAGE]
                 set priority [lindex $val $BMOTION_PLUGIN_OUTPUT_PRIORITY]
-                if {[string match $lang $language] || ($language == "any")|| ($language == "all")} {
-                        if {$enabled == 1} {
-                                lappend result [list $callback $priority]
-                        } else {
-                                bMotion_putloglev 1 * "Searching $key for channel $channel"
-                                if {$channel != ""} {
-                                        catch {
-                                                set chanlist $bMotion_plugins_output_perchan($key)
-                                                if {[lsearch $chanlist $channel] > -1} {
-                                                        lappend result [list $callback $priority]
-                                                        bMotion_putloglev d * "Plugin $key is enabled for $channel"
+                if {($priority >= $min_priority) && ($priority <= $max_priority)} {
+                        if {[string match $lang $language] || ($language == "any")|| ($language == "all")} {
+                                if {$enabled == 1} {
+                                        lappend result [list $callback $priority]
+                                } else {
+                                        bMotion_putloglev 1 * "Searching $key for channel $channel"
+                                        if {$channel != ""} {
+                                                catch {
+                                                        set chanlist $bMotion_plugins_output_perchan($key)
+                                                        if {[lsearch $chanlist $channel] > -1} {
+                                                                lappend result [list $callback $priority]
+                                                                bMotion_putloglev d * "Plugin $key is enabled for $channel"
+                                                        }
                                                 }
                                         }

trunk/modules/system.tcl

@@ -239 +239 @@
                         if [bMotion_is_active_enough $channel $active_idle_sec] {
                         #channel is fairly busy
-                        if [bMotionSaySomethingRandom $channel 1] {
-                        lappend saidChannels "$channel/active"
-                        } else {
-                        lappend silentChannels $channel
-                        }
+                                if [bMotionSaySomethingRandom $channel 1] {
+                                        lappend saidChannels "$channel/active"
+                                } else {
+                                        lappend silentChannels $channel
+                                }
                         } else {
                         #use a more idle randomstuff
-                        if [bMotionSaySomethingRandom $channel 0] {
-                        lappend saidChannels $channel
-                        } else {
-                        lappend silentChannels $channel
-                        }
+                                if [bMotionSaySomethingRandom $channel 0] {
+                                        lappend saidChannels $channel
+                                } else {
+                                        lappend silentChannels $channel
+                                }
                         }
                 } else {

trunk/plugins/admin_plugin.tcl

@@ -54 +54 @@
         if [regexp -nocase {disable ([^ ]+) (.+?)( .+)?} $arg matches t id channel] {
                 if {$t == "output"} {
-                        bMotion_putadmin "Disabling output plugin $id..."
                         if {$channel != ""} {
                                 set channel [string trim $channel]