Changeset 1004

Timestamp:

04/28/09 19:23:31 (3 years ago)

Author:

james

Message:

Add new away admin plugin
Add some debug to randomstuff/away code
Include away status in .bmotion status
Fix .bmotion help being broken

Location:

trunk

Files:

• modules/plugins.tcl (modified) (1 diff)
• modules/system.tcl (modified) (12 diffs)
• plugins/admin_general.tcl (modified) (4 diffs)

trunk/modules/plugins.tcl

@@ -188 +188 @@
         foreach key [array names bMotion_plugins_management] {
                 if [string match -nocase $name $key] {
+                        set blah $bMotion_plugins_management($key)
                         set helpcallback [lindex $blah $BMOTION_PLUGIN_MANAGEMENT_HELPCALLBACK]
                         return $helpcallback

trunk/modules/system.tcl

@@ -166 +166 @@
         global bMotionChannels bMotionInfo
 
+        bMotion_putloglev 4 * "bMotion_random_away"
+
         set timeNow [clock seconds]
 
@@ -171 +173 @@
         if {[bMotion_setting_get "bitlbee"]} {
                 #never go away in bitlbee
+                bMotion_putloglev "going away is disabled in bitlbee mode"
                 return 0
         }
@@ -176 +179 @@
         #override if we should never go away
         if {[bMotion_setting_get "useAway"] != 1} {
+                bMotion_putloglev "going away is disabled"
                 return 0
         }
@@ -196 +200 @@
 
         if {($timeNow - $mostRecent) < $gapTime} {
+                bMotion_putloglev 1 * "most recent is busy enough, not going away"
                 return 0
         }
@@ -201 +206 @@
         if {$bMotionInfo(away) == 1} {
                 #away, don't do anything (and don't do randomstuff)
+                bMotion_putloglev d * "I'm already away, not going away again"
                 return 0
         }
@@ -208 +214 @@
                 bMotionSetRandomAway
                 return 1
+        } else {
+                bMotion_putloglev d * "All channels are idle, not going away though"
         }
 
@@ -220 +228 @@
         global BMOTION_SLEEP
 
+        bMotion_putloglev 4 * "doRandomStuff"
+
         set saidChannels [list]
         set silentChannels [list]
@@ -233 +243 @@
         set temp [expr [rand $upperLimit] + $bMotionInfo(minRandomDelay)]
         timer $temp doRandomStuff
-        bMotion_putloglev d * "bMotion: randomStuff next ($temp minutes)"
+        bMotion_putloglev d * "bMotion: randomStuff next in $temp minutes"
 
         # don't bother if we're asleep
@@ -244 +254 @@
 
         if [bMotion_random_away] {
-        # we went away, so stop here
+                # we went away, so stop here
+                bMotion_putloglev d * "we went away, returning from doRandomStuff"
                 return
         }
 
         if {$bMotionInfo(away) == 1} {
-        #away and busy again, return
+                #away and busy again, return
+                bMotion_putloglev d * "was away, setting myself back"
                 bMotionSetRandomBack
         }
 
         if {[bMotion_setting_get "bitlbee"] == "1"} {
+                bMotion_putloglev d * "aborting randomstuff, don't do it in bitlbee mode"
                 return 0
         }
@@ -329 +342 @@
 proc bMotionSetRandomAway {} {
         global randomAways bMotionInfo bMotionSettings bMotionChannels
+        bMotion_putloglev 4 * "bMotionSetRandomAway"
 
         set awayReason [bMotion_abstract_get "randomAways"]
@@ -348 +362 @@
         #set myself back
         global bMotionInfo bMotionSettings bMotionChannels
+        bMotion_putloglev 4 * "bMotionSetRandomBack"
 
         bMotion_update_chanlist
@@ -353 +368 @@
         set bMotionInfo(away) 0
         set bMotionInfo(silence) 0
+        bMotion_putloglev d * "No longer silent or away"
         foreach channel $bMotionChannels {
                 if {[lsearch $bMotionSettings(noAwayFor) $channel] == -1} {

trunk/plugins/admin_general.tcl

@@ -1 +1 @@
 # bMotion admin plugins
 #
-#
-# $Id$
-#
 
 ###############################################################################
 # This is a bMotion plugin
-# Copyright (C) James Michael Seward 2000-2002
+# Copyright (C) James Michael Seward 2000-2009
 #
 # This program is covered by the GPL, please refer the to LICENCE file in the
@@ -24 +21 @@
 bMotion_plugin_add_management "interbot" "^interbot" n bMotion_plugin_management_interbot "any" bMotion_plugin_management_interbot_help
 bMotion_plugin_add_management "flux" "^flux capacitors?" n bMotion_plugin_management_flux "any"
+bMotion_plugin_add_management "away" "^away" n bMotion_plugin_management_away "any" bMotion_plugin_management_away_help
 
 #################################################################################################################################
@@ -67 +65 @@
         bMotion_putadmin "Random stuff happens at least every [bMotion_setting_get minRandomDelay]min, at most every [bMotion_setting_get maxRandomDelay]min, and not if channel quiet for more than [bMotion_setting_get maxIdleGap]min. Active channels have a line in the last [bMotion_setting_get active_idle_sec]sec."
         if [bMotion_setting_get silence] {
-                bMotion_putadmin "Running silent"
+                bMotion_putadmin "I am silent."
+        }
+        if [bMotion_setting_get "away"] {
+                bMotion_putadmin "I am away."
         }
 
@@ -313 +314 @@
                 }
 }
+
+proc bMotion_plugin_management_away { handle { text "" } } {
+        global bMotionInfo
+
+        if {$text == ""} {
+                if {$bMotionInfo(away)} {
+                        bMotion_putadmin "I am currently away."
+                } else {
+                        bMotion_putadmin "I am not away."
+                        }
+                return
+        }
+
+        if {$text == "off"} {
+                bMotion_putadmin "Coming back from being away."
+                set bMotionInfo(away) 0
+                set bMotionInfo(silent) 0
+                return
+        }
+
+        bMotion_putadmin "Use: .bmotion away [off]"
+}
+
+proc bMotion_plugin_management_away_help { } {
+        bMotion_putadmin "Check and adjust the bot's away status"
+        bMotion_putadmin "  .bmotion away"
+        bMotion_putadmin "    Show if the bot is away or not"
+        bMotion_putadmin "  .bmotion away off"
+        bMotion_putadmin "    Make the bot be not-away"
+}
+