--- trunk/bin/irc-logger.pl	2007/03/18 15:37:05	50
+++ trunk/bin/irc-logger.pl	2007/06/08 12:12:45	64
@@ -73,7 +73,13 @@
 use HTML::CalendarMonthSimple;
 use Getopt::Long;
 use DateTime;
+use URI::Escape;
 use Data::Dump qw/dump/;
+use DateTime::Format::ISO8601;
+
+my $use_twitter = 1;
+eval { require Net::Twitter; };
+$use_twitter = 0 if ($@);
 
 my $import_dircproxy;
 my $log_path;
@@ -256,7 +262,15 @@
 
 	$sql .= " where message ilike ? or nick ilike ? " if ($args->{search});
 	$sql .= " where id in (" . join(",", @{ $tags->{ $args->{tag} } }) . ") " if ($args->{tag} && $tags->{ $args->{tag} });
-	$sql .= " where date(time) = ? " if ($args->{date});
+	if ($args->{date}) {
+		my $date = eval { DateTime::Format::ISO8601->parse_datetime( $args->{date} )->ymd; };
+		if ( $@ ) {
+			warn "invalid date ", $args->{date}, $/;
+			$date = DateTime->now->ymd;
+		}
+		$sql .= " where date(time) = ? ";
+		$args->{date} = $date;
+	}
 	$sql .= " order by log.time desc";
 	$sql .= " limit " . $args->{limit} if ($args->{limit});
 
@@ -545,8 +559,13 @@
 
 		save_message( channel => $channel, me => 1, nick => $nick, msg => $msg);
 
-		if ( my $twitter = ( $nick, $channel, 'twitter' ) ) {
-			_log("FIXME: send twitter for $nick on $channel [$twitter]");
+		if ( $use_twitter ) {
+			if ( my $twitter = meta( $nick, $NICK, 'twitter' ) ) {
+				my ($login,$passwd) = split(/\s+/,$twitter,2);
+				_log("sending twitter for $nick/$login on $channel ");
+				my $bot = Net::Twitter->new( username=>$login, password=>$passwd );
+				$bot->update("<${channel}> $msg");
+			}
 		}
 
     },
@@ -593,11 +612,11 @@
 
 			my $sth = $dbh->prepare(qq{
 				select
-					nick,
+					trim(both '_' from nick) as nick,
 					count(*) as count,
 					sum(length(message)) as len
 				from log
-				group by nick
+				group by trim(both '_' from nick)
 				order by len desc,count desc
 				limit $nr
 			});
@@ -669,28 +688,35 @@
 
 		} elsif ($msg =~ m/^ping/) {
 			$res = "ping = " . dump( $ping );
-		} elsif ($msg =~ m/^(?:twitter)\s+(\S+)\s+(.*?)/) {
-			if ( defined( $2 ) ) {
-				meta($nick, $channel, 'twitter', "$1\t$2");
-				$res = "saved twitter auth for $1 -- /me on $channel will auto-update twitter status";
-			} else {
-				meta($nick, $channel, 'twitter', '' );
-				$res = "removed twitter status update for /me on $channel";
-			}
-		} elsif ($msg =~ m/^conf(?:ig)*\s*(last-size)*\s*(\d*)/) {
+		} elsif ($msg =~ m/^conf(?:ig)*\s*(last-size|twitter)*\s*(.*)/) {
 			if ( ! defined( $1 ) ) {
 				my $sth = $dbh->prepare(qq{ select name,value,changed from meta where nick = ? and channel = ? });
 				$sth->execute( $nick, $channel );
-				$res = "config for $nick ";
+				$res = "config for $nick on $channel";
 				while ( my ($n,$v) = $sth->fetchrow_array ) {
-					$res .= "| $n = $v";
+					$res .= " | $n = $v";
 				}
-			} elsif ( defined( $2 ) ) {
-				meta( $nick, $channel, $1, $2 );
-				$res = "saved $1 = $2";
-			} else {
+			} elsif ( ! $2 ) {
 				my $val = meta( $nick, $channel, $1 );
 				$res = "current $1 = " . ( $val ? $val : 'undefined' );
+			} else {
+				my $validate = {
+					'last-size' => qr/^\d+/,
+					'twitter' => qr/^\w+\s+\w+/,
+				};
+
+				my ( $op, $val ) = ( $1, $2 );
+
+				if ( my $regex = $validate->{$op} ) {
+					if ( $val =~ $regex ) {
+						meta( $nick, $channel, $op, $val );
+						$res = "saved $op = $val";
+					} else {
+						$res = "config option $op = $val doesn't validate against $regex";
+					}
+				} else {
+					$res = "config option $op doesn't exist";
+				}
 			}
 		}
 
@@ -819,18 +845,35 @@
 .nick { color: #000000; font-size: 80%; padding: 2px; font-family: courier, courier new, monospace ; }
 .message { color: #000000; font-size: 100%; }
 .search { float: right; }
+a:link.tag, a:visited.tag { border: 1px dashed #ccc; backgound: #ccc; text-decoration: none }
+a:hover.tag { border: 1px solid #eee }
+hr { border: 1px dashed #ccc; height: 1px; clear: both; }
+/*
 .col-0 { background: #ffff66 }
 .col-1 { background: #a0ffff }
 .col-2 { background: #99ff99 }
 .col-3 { background: #ff9999 }
 .col-4 { background: #ff66ff }
-a:link.tag, a:visited.tag { border: 1px dashed #ccc; backgound: #ccc; text-decoration: none }
-a:hover.tag { border: 1px solid #eee }
-hr { border: 1px dashed #ccc; height: 1px; clear: both; }
+*/
 _END_OF_STYLE_
 
 my $max_color = 4;
 
+my @cols = qw(
+	#ffcccc #ccffe6 #ccccff #e6ccff #ffccff #ffcce6 #ff9999 #ffcc99 #ffff99
+	#ccff99 #99ff99 #99ffcc #99ccff #9999ff #cc99ff #ff6666 #ffb366 #ffff66
+	#66ff66 #66ffb3 #66b3ff #6666ff #ff3333 #33ff33 #3399ff #3333ff #ff3399
+	#a0a0a0 #ff0000 #ffff00 #80ff00 #0000ff #8000ff #ff00ff #ff0080 #994d00
+	#999900 #009900 #cc0066 #c0c0c0 #ccff99 #99ff33 #808080 #660033 #ffffff
+);
+
+$max_color = 0;
+foreach my $c (@cols) {
+	$style .= ".col-${max_color} { background: $c }\n";
+	$max_color++;
+}
+warn "defined $max_color colors for users...\n";
+
 my %nick_enumerator;
 
 sub root_handler {
@@ -908,9 +951,21 @@
 				filter => {
 					message => sub {
 						my $m = shift || return;
+
+						# protect HTML from wiki modifications
+						sub e {
+							my $t = shift;
+							return 'uri_unescape{' . uri_escape($t) . '}';
+						}
+
 						$m =~ s/($escape_re)/$escape{$1}/gs;
-						$m =~ s#($RE{URI}{HTTP})#<a href="$1">$1</a>#gs;
-						$m =~ s#$tag_regex#<a href="?tag=$1" class="tag">$1</a>#g;
+						$m =~ s#($RE{URI}{HTTP})#e(qq{<a href="$1">$1</a>})#egs;
+						$m =~ s#$tag_regex#e(qq{<a href="?tag=$1" class="tag">$1</a>})#egs;
+						$m =~ s#\*(\w+)\*#<b>$1</b>#gs;
+						$m =~ s#_(\w+)_#<u>$1</u>#gs;
+						$m =~ s#\/(\w+)\/#<i>$1</i>#gs;
+
+						$m =~ s#uri_unescape{([^}]+)}#uri_unescape($1)#egs;
 						return $m;
 					},
 					nick => sub {