Changeset 291

Timestamp:

09/22/03 09:45:17 (8 years ago)

Author:

jamesoff

Message:

unbroke ruser and rbot h4x0ring

File:

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

trunk/modules/output.tcl

@@ -202 +202 @@
     set newText [bMotion_abstract_get $BOOM]
     if {$newText == ""} {
+      #insert old style
       set var [subst $$BOOM]
       set line [bMotionInsertString $line "%VAR\{$BOOM\}" [pickRandom $var]]
-    } else {
-      #insert old style
+    } else {      
       set line [bMotionInsertString $line "%VAR\{$BOOM\}" $newText]
     }
@@ -295 +295 @@
   }
 
+  set ruser ""
+
   #choose a new user?
   if [regexp {^%PICKUSER\[(.+)?\]} $line matches conditions] {
@@ -306 +308 @@
   #try to get sensible names
   #set uhost [getchanhost $bMotionCache(randomUser)]
-  set ruser [bMotionGetRealName $bMotionCache(randomUser)]
-  set line [bMotionInsertString $line "%ruser" $ruser]
+
+  catch {
+    set ruser [bMotionGetRealName $bMotionCache(randomUser)]
+  }
+
+  if {$ruser != ""} {
+    set line [bMotionInsertString $line "%ruser" $ruser]
+  }
 
   #set uhost [getchanhost $bMotionCache(remoteBot)]
   #putloglev 3 * "bMotion: remote bothost = $uhost"
-  set rbot [bMotionGetRealName $bMotionCache(remoteBot)]
+  set rbot ""
+  catch {
+    set rbot [bMotionGetRealName $bMotionCache(remoteBot)]
   #putloglev 3 * "bMotion: remote bot nick = $rbot"
-  set line [bMotionInsertString $line "%rbot" $rbot]
+  }
+
+  if {$rbot != ""} {
+    set line [bMotionInsertString $line "%rbot" $rbot]
+  }
 
   set line [bMotionInterpolation2 $line]