Mercurial > hg > skillbot

changeset 38:a8b60d2968b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Small tidy and removing useless skill time check
author Dominic Cleal <dominic@computerkb.co.uk>
date Sun, 07 Dec 2008 11:52:44 +0000
parents 5900a37101eb
children 4dd6009b0d2a
files skillbot.pl
diffstat 1 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/skillbot.pl	Sun Dec 07 11:40:11 2008 +0000
+++ b/skillbot.pl	Sun Dec 07 11:52:44 2008 +0000
@@ -231,8 +231,7 @@
 		for my $f (@friends) {
 			if ((defined $2 && lc($f->{char}->name) eq lc($2))
 					|| (!defined $2 && $f->{nick} eq $their_nick)) {
-				my $text = ((defined $f->{skill}
-						&& $f->{skill}->finish_time > time())
+				my $text = (defined $f->{skill}
 						? sprintf("Currently training %s %s (finish in %s)",
 								  $f->{skill}->name, $f->{skill}->level,
 								  $f->{skill}->time_remaining)
@@ -260,8 +259,12 @@
 	# lists the chars in order of shortest training time
 	elsif ($msg =~ /^\!next/i) {
 		my $nreply = "Training: ";
+
+		my @training = sort {
+				$a->{skill}->finish_time <=> $b->{skill}->finish_time
+			} grep { defined $_->{skill} } @friends;
 		
-		for my $f (sort { $a->{skill}->finish_time <=> $b->{skill}->finish_time } grep(defined $_->{skill}, @friends)) {
+		for my $f (@training) {
 			$nreply .= sprintf("\002%s\002 (%s) | ",
 							   $f->{char}->name, $f->{skill}->time_remaining);
 		}