changeset 60:69d7a89d3adc

Timezone is UTC by default if left out of friends
author Dominic Cleal <dominic@computerkb.co.uk>
date Mon, 29 Dec 2008 14:42:46 +0000
parents 74213ea642da
children 2328f73e25a8
files skillbot.pl
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/skillbot.pl	Sun Dec 28 18:57:40 2008 +0000
+++ b/skillbot.pl	Mon Dec 29 14:42:46 2008 +0000
@@ -414,12 +414,12 @@
 		chomp;
 		next if (/^#/);
 
-		if (/^([0-9]+)\s+([a-z0-9]{64})\s+(\S+)\s+(\S+)(\s+(.+))?/i) {
+		if (/^([0-9]+)\s+([a-z0-9]{64})\s+(\S+)(\s+(\S+))?(\s+(.+))?/i) {
 			my $uid = $1;
 			my $key = $2;
 			my $nick = $3;
-			my $tz = $4;
-			my $c = $6;
+			my $tz = $5 || 'UTC';
+			my $c = $7;
 
 			if (! $frienduids{$uid}) {
 				unless (DateTime::TimeZone->is_valid_name($tz))
@@ -557,7 +557,7 @@
 		});
 	}
 
-	$f->{timer} = add_one_shot_timer($skill->finish_time - time(), sub {
+	$f->{timer} = add_one_shot_timer($finish, sub {
 		$self->privmsg('#' . $config{channel}, sprintf(
 					   "\002%s:\002 %s", $f->{nick},
 					   encode("utf8", $text)));