Changeset 868

Timestamp:

11/03/07 19:31:06 (14 months ago)

Author:

james

Message:

add option to disable/enable interbot stuff
update interbot manangement plugin for enable/disable
write help for interbot plugin
add default interbot enable setting to settings

Location:

trunk

Files:

• modules/interbot.tcl (modified) (9 diffs)
• modules/settings.sample.tcl (modified) (1 diff)
• plugins/admin_general.tcl (modified) (2 diffs)

trunk/modules/interbot.tcl

@@ -22 +22 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ###############################################################################
+
+# allow people to turn off the interbot stuff if they don't want it
+# these values should be set in the settings file, but we'll define
+# some defaults here
+
+if {![info exists bMotion_interbot_enable]} {
+        set bMotion_interbot_enable 1
+}
 
 # Elect a new bot to speak for each channel
@@ -31 +39 @@
 
   global bMotionInfo bMotion_interbot_timer bMotionChannels
+        global bMotion_interbot_enable
+
+        if {!$bMotion_interbot_enable} {
+                return
+        }
+
   catch {
     foreach chan $bMotionChannels {
@@ -112 +126 @@
   #another bot is forcing an election
   global bMotion_interbot_nextbot_score bMotion_interbot_nextbot_nick botnick bMotionInfo
-        global BMOTION_SLEEP bMotionSettings
+        global BMOTION_SLEEP bMotionSettings bMotion_interbot_enable
+
+        if {![info exists bMotion_interbot_enable]} {
+                return
+        }
+
   bMotion_putloglev 1 * "bMotion: Incoming election from $bot"
 
@@ -167 +186 @@
 proc bMotionSendSayChan { channel text thisBot} {
   #replace all ¬ with %
+        global bMotion_interbot_enable
+
+        if {!$bMotion_interbot_enable} {
+                return ""
+        }
+
   set text [bMotionInsertString $text "¬" "%"]
   bMotion_putloglev 1 * "bMotion: pushing command say ($channel $text) to $thisBot"
@@ -208 +233 @@
 proc bMotion_interbot_me_next { channel } {
   global bMotion_interbot_nextbot_nick bMotion_interbot_nextbot_score botnick
+        global bMotion_interbot_enable
 
   set channel [string tolower $channel]
+
+        if {!$bMotion_interbot_enable} {
+                # if interbot stuff is turned off, we'll have to assume we should respond
+                # else we'd never say anything...
+                return 1
+        }
 
         bMotion_putloglev 2 * "checking interbot_me_next for $channel"
@@ -287 +319 @@
 proc bMotion_interbot_hay { bot channels } {
   #we've met another bmotion bot, we need to tell it what channels we're on
-  global bMotion_interbot_otherbots network bMotionChannels
+  global bMotion_interbot_otherbots network bMotionChannels bMotion_interbot_enable
+
+        if {!$bMotion_interbot_enable} {
+                return
+        }
+
         bMotion_update_chanlist
         if [regexp -nocase {(.+) network:(.+)} $channels matches chans nw] {
@@ -307 +344 @@
 proc bMotion_interbot_sup { bot channels } {
   #we've met another bmotion bot
-  global bMotion_interbot_otherbots
+  global bMotion_interbot_otherbots bMotion_interbot_enable
+
+        if {!$bMotion_interbot_enable} {
+                return
+        }
+
   set bMotion_interbot_otherbots($bot) $channels
   bMotion_putloglev d * "bMotion: bMotion bot $bot on channels $channels"
@@ -320 +362 @@
 proc bMotion_interbot_resync { } {
   #let's find out who's on the botnet
-  global bMotion_interbot_otherbots network bMotionChannels
+  global bMotion_interbot_otherbots network bMotionChannels bMotion_interbot_enable
+
+  utimer [expr [rand 900] + 300] bMotion_interbot_resync
+
+        if {$bMotion_interbot_enable != 1} {
+                return
+        }
+
         bMotion_update_chanlist
   unset bMotion_interbot_otherbots
@@ -327 +376 @@
   putloglev d * "bMotion: Resyncing with botnet for bMotion bots"
   putallbots "bmotion HAY $bMotionChannels ($network)"
-  utimer [expr [rand 900] + 300] bMotion_interbot_resync
 }
 

trunk/modules/settings.sample.tcl

@@ -142 +142 @@
 set bMotionSettings(typingSpeed) 0.05
 
+# use the interbot stuff?
+# by default, bMotion will broadcast on the botnet to find other bMotions
+# so that it can talk to them (when they're in the same channel)
+set bMotion_interbot_enable 1
 
 

trunk/plugins/admin_general.tcl

@@ -22 +22 @@
 bMotion_plugin_add_management "settings" "^settings" n bMotion_plugin_management_settings "any"
 bMotion_plugin_add_management "global" "^global" n bMotion_plugin_management_global "any"
-bMotion_plugin_add_management "interbot" "^interbot" n bMotion_plugin_management_interbot "any"
+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"
 
@@ -244 +244 @@
                 bMotion_putadmin [bMotion_interbot_otherbots $chan]
         }
+
+        if [regexp -nocase "enable" $text] {
+                global bMotion_interbot_enable
+
+                if {$bMotion_interbot_enable} {
+                        bMotion_putadmin "Interbot stuff is already enabled."
+                        return
+                } else {
+                        set bMotion_interbot_enable 1
+                        bMotion_putadmin "Interbot stuff enabled."
+                        return
+                }
+        }
+
+        if [regexp -nocase "disable" $text] {
+                global bMotion_interbot_enable
+
+                if {!$bMotion_interbot_enable} {
+                        bMotion_putadmin "Interbot stuff is already disabled."
+                        return
+                } else {
+                        set bMotion_interbot_enable 0
+                        bMotion_putadmin "Interbot stuff disabled."
+                        return
+                }
+        }
+}
+
+proc bMotion_plugin_management_interbot_help { } {
+        bMotion_putadmin "Manage the interbot communication stuff."
+        bMotion_putadmin "  .bmotion interbot next #channel"
+        bMotion_putadmin "    Report the next bot for #channel"
+        bMotion_putadmin "  .bmotion interbot elect #channel"
+        bMotion_putadmin "    Force an election for #channel"
+        bMotion_putadmin "  .bmotion interbot bots #channel"
+        bMotion_putadmin "    Report bots discovered in #channel"
+        bMotion_putadmin "  .bmotion interbot enable"
+        bMotion_putadmin "  .bmotion interbot disable"
+        bMotion_putadmin "    Enable/disable interbot stuff entirely"
 }