# HG changeset patch
# User Dominic Cleal <dominic@computerkb.co.uk>
# Date 1229774749 0
# Node ID 0fa8fe61aca12fa24fb64b0d621b867bf1514c7d
# Parent  75b3b76a16434d3eefba18eae6c120a8289fee3b
Adding tz to !eta output, use UTC by default

diff -r 75b3b76a1643 -r 0fa8fe61aca1 skillbot.pl
--- a/skillbot.pl	Sat Dec 20 11:47:40 2008 +0000
+++ b/skillbot.pl	Sat Dec 20 12:05:49 2008 +0000
@@ -244,10 +244,12 @@
 							time_zone => $f->{tz});
 
 					$text = sprintf("Currently training %s %s ".
-									"(finish in %s, %s%s)",
+									"(finish in %s, %s %s%s)",
 									$f->{skill}->name, $f->{skill}->level,
 									$f->{skill}->time_remaining,
-									$finish->strftime("%A %R"), $downtime)
+									$finish->strftime("%A %R"),
+									$finish->time_zone_short_name(),
+									$downtime);
 				} else {
 					$text = "No skill currently training";
 				}
@@ -422,6 +424,13 @@
 			my $c = $6;
 
 			if (! $frienduids{$uid}) {
+				unless (DateTime::TimeZone->is_valid_name($tz))
+				{
+					irc_debug("Invalid timezone (%s) supplied for friend %s".
+							  ", using UTC", $tz, $nick);
+					$tz = 'UTC';
+				}
+
 				my $api = WebService::EveOnline->new( { user_id => $uid,
 														api_key => $key } );