--- trunk/irc-logger.pl	2006/03/13 21:02:16	19
+++ trunk/irc-logger.pl	2006/03/14 17:17:53	20
@@ -18,7 +18,7 @@
 
 ## CONFIG
 
-my $NICK = 'irc-logger-dev';
+my $NICK = 'irc-logger';
 my $CONNECT =
   {Server => 'irc.freenode.net',
    Nick => $NICK,
@@ -91,14 +91,20 @@
 		time => '{%s} ',
 		time_channel => '{%s %s} ',
 		nick => '%s: ',
+		me_nick => '***%s ',
 		message => '%s',
 	},
-	message_filter => sub {
-		# modify message content
-		return shift;
+	filter => {
+		message => sub {
+			# modify message content
+			return shift;
+		}
 	}
  );
 
+Order is important. Fields are first passed through C<filter> (if available) and
+then throgh C<< sprintf($fmt->{message}, $message >> if available.
+
 =cut
 
 sub get_from_log {
@@ -110,6 +116,7 @@
 		time => '{%s} ',
 		time_channel => '{%s %s} ',
 		nick => '%s: ',
+		me_nick => '***%s ',
 		message => '%s',
 	};
 
@@ -118,6 +125,7 @@
 			time::date as date,
 			time::time as time,
 			channel,
+			me,
 			nick,
 			message
 		from log
@@ -169,13 +177,21 @@
 		my $append = 1;
 
 		if ($last_row->{nick} ne $row->{nick}) {
-			$msg .= sprintf($args->{fmt}->{nick}, $row->{nick});
+			# obfu way to find format for me_nick if needed or fallback to default
+			my $fmt = $row->{me} ? ( $args->{fmt}->{me_nick} || $args->{fmt}->{nick} ) : $args->{fmt}->{nick};
+			$fmt ||= '%s';
+
+			my $nick = $row->{nick};
+			$nick = $args->{filter}->{nick}->($nick) if (ref($args->{filter}->{nick}) eq 'CODE');
+
+			$msg .= sprintf( $fmt, $nick );
 			$append = 0;
 		}
 
-		if (ref($args->{message_filter}) eq 'CODE') {
+		$args->{fmt}->{message} ||= '%s';
+		if (ref($args->{filter}->{message}) eq 'CODE') {
 			$msg .= sprintf($args->{fmt}->{message},
-				$args->{message_filter}->(
+				$args->{filter}->{message}->(
 					$row->{message}
 				)
 			);
@@ -424,11 +440,20 @@
 my $style = <<'_END_OF_STYLE_';
 p { margin: 0; padding: 0.1em; }
 .time, .channel { color: #808080; font-size: 60%; }
-.nick { color: #0000ff; font-size: 80%; }
+.nick { color: #000000; font-size: 80%; padding: 2px; font-family: courier, courier new, monospace ; }
 .message { color: #000000; font-size: 100%; }
 .search { float: right; }
+.col-0 { background: #ffff66 }
+.col-1 { background: #a0ffff }
+.col-2 { background: #99ff99 }
+.col-3 { background: #ff9999 }
+.col-4 { background: #ff66ff }
 _END_OF_STYLE_
 
+my $max_color = 4;
+
+my %nick_enumerator;
+
 sub root_handler {
 	my ($request, $response) = @_;
 	$response->code(RC_OK);
@@ -461,14 +486,27 @@
 				fmt => {
 					time => '<span class="time">%s</span> ',
 					time_channel => '<span class="channel">%s %s</span> ',
-					nick => '<span class="nick">%s:</span> ',
+					nick => '%s:&nbsp;',
+					me_nick => '***%s&nbsp;',
 					message => '<span class="message">%s</span>',
 				},
-				message_filter => sub {
-					my $m = shift || return;
-					$m =~ s/($escape_re)/$escape{$1}/gs;
-					$m =~ s#($RE{URI}{HTTP})#<a href="$1">$1</a>#gs;
-					return $m;
+				filter => {
+					message => sub {
+						my $m = shift || return;
+						$m =~ s/($escape_re)/$escape{$1}/gs;
+						$m =~ s#($RE{URI}{HTTP})#<a href="$1">$1</a>#gs;
+						return $m;
+					},
+					nick => sub {
+						my $n = shift || return;
+						if (! $nick_enumerator{$n})  {
+							my $max = scalar keys %nick_enumerator;
+							$nick_enumerator{$n} = $max + 1;
+						}
+						return '<span class="nick col-' .
+							( $nick_enumerator{$n} % $max_color ) .
+							'">' . $n . '</span>';
+					},
 				},
 			)
 		) .