# HG changeset patch
# User Dominic Cleal <dominic@computerkb.co.uk>
# Date 1228650764 0
# Node ID a8b60d2968b2774f42e806c5492c19424becb751
# Parent  5900a37101ebb47875a3732f12afc7db82a56038
Small tidy and removing useless skill time check

diff -r 5900a37101eb -r a8b60d2968b2 skillbot.pl
--- 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);
 		}