# HG changeset patch # User Dominic Cleal # Date 1230561766 0 # Node ID 69d7a89d3adcafb20766e8db13a5576ec29d8044 # Parent 74213ea642da70cb2dbee8229fa949a540594aeb Timezone is UTC by default if left out of friends diff -r 74213ea642da -r 69d7a89d3adc skillbot.pl --- 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)));