SVN: toys/stbr/stbr.tcl

[shadzik]

Author: shadzik
Date: Sun Feb  7 02:06:42 2010
New Revision: 11129

Modified:
   toys/stbr/stbr.tcl
Log:
- timer fixed(?)


Modified: toys/stbr/stbr.tcl
==============================================================================
--- toys/stbr/stbr.tcl	(original)
+++ toys/stbr/stbr.tcl	Sun Feb  7 02:06:42 2010
@@ -22,7 +22,7 @@
 set actconfig "stbr.conf"
 set bindedmh 0
 
-############ DO NOT CHANGE ANYTHING BELOW UNLESS YOU KNOW WHAT YOU"RE DOING ##############
+############ DO NOT CHANGE ANYTHING BELOW UNLESS YOU KNOW WHAT YOU"RE DOING ###############
 
 bind notc - "*This nickname is owned by someone else*" identify
 bind dcc n identify man_identify 
@@ -113,7 +113,7 @@
 }
 
 proc rthx {} {
-	set answer {"y/w" "luz" "luzik" "nie ma sprawy" "spoko" "no problem" "n/p" "dla ciebie zawsze z mila checia"}
+	set answer {"luz" "luzik" "nie ma sprawy" "spoko" "no problem" "n/p" "dla ciebie zawsze z mila checia"}
 	set range [llength $answer]
 	set whichone [expr {int(rand()*$range)}]
 	return [lindex $answer $whichone]
@@ -301,6 +301,7 @@
 	putserv "privmsg $chan :$nick: $usage"; return 0
 }
 if {([string length $third]<2)} {putserv "privmsg $chan :$nick: $usage"; return 0}
+if {$cntr<1} {incr cntr} {utimer 30 "set cntr 0"; putserv "privmsg $chan :$nick: I reached my STBR time limit (30sec). Please try later."; return 0}
 if {([string match noupgrade $second])} {set second "test-build"}
 foreach spec $specs {
 if {([string match */* $spec])} {
@@ -386,15 +387,6 @@
 lappend rspecs $spec; append rspecs ":$branch (to $towho, options: $bconds_with $bconds_without $defines)"
 lappend tspecs $spec; append tspecs ":$branch (options: $bconds_with $bconds_without $defines)"
 }
-
-if {$cntr<3} {
-	incr cntr
-	utimer 60 "incr cntr -1"
-} {
-	putserv "privmsg $chan :$nick: I reached my STBR time limit (3 requests in 60sec). Please try later."
-	return 0
-}
-
 if {([string match test-build $second])} {
 	if {[utimer 5 "exec $makereq -d $dist -t $bconds_with $bconds_without $defines $spec:$branch >/dev/null 2>&1"]==0} {putserv "privmsg $chan :$nick: An error occured. Couldn't send test-build request for $spec to builders."; return 1}
 	exec sqlite $logfile "INSERT INTO application VALUES('$date','$spec','$branch','stbr','$second','$dist');"