--- trunk/irc-logger.pl	2006/03/12 14:36:12	14
+++ trunk/irc-logger.pl	2006/03/14 17:17:53	20
@@ -33,7 +33,7 @@
    ERROR => "/var/log/apache/error.log",
   );
 
-my $DSN = 'DBI:Pg:dbname=irc-logger';
+my $DSN = 'DBI:Pg:dbname=' . $NICK;
 
 my $ENCODING = 'ISO-8859-2';
 
@@ -45,17 +45,25 @@
 use HTTP::Status;
 use DBI;
 use Encode qw/from_to/;
+use Regexp::Common qw /URI/;
+use CGI::Simple;
 
 
 my $dbh = DBI->connect($DSN,"","", { RaiseError => 1, AutoCommit => 1 }) || die $DBI::errstr;
 
-=for SQL schema
+eval {
+	$dbh->do(qq{ select count(*) from log });
+};
+
+if ($@) {
+	warn "creating database table in $DSN\n";
+	$dbh->do(<<'_SQL_SCHEMA_');
 
-$dbh->do(qq{
 create table log (
 	id serial,
 	time timestamp default now(),
 	channel text not null,
+	me boolean default false,
 	nick text not null,
 	message text not null,
 	primary key(id)
@@ -65,14 +73,13 @@
 create index log_channel on log(channel);
 create index log_nick on log(nick);
 
-});
-
-=cut
+_SQL_SCHEMA_
+}
 
 my $sth = $dbh->prepare(qq{
 insert into log
-	(channel, nick, message)
-values (?,?,?)
+	(channel, me, nick, message)
+values (?,?,?,?)
 });
 
 =head2 get_from_log
@@ -84,10 +91,20 @@
 		time => '{%s} ',
 		time_channel => '{%s %s} ',
 		nick => '%s: ',
+		me_nick => '***%s ',
 		message => '%s',
 	},
+	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 {
@@ -99,6 +116,7 @@
 		time => '{%s} ',
 		time_channel => '{%s %s} ',
 		nick => '%s: ',
+		me_nick => '***%s ',
 		message => '%s',
 	};
 
@@ -107,6 +125,7 @@
 			time::date as date,
 			time::time as time,
 			channel,
+			me,
 			nick,
 			message
 		from log
@@ -117,7 +136,8 @@
 
 	my $sth = $dbh->prepare( $sql );
 	if ($args->{search}) {
-		$sth->execute( $args->{search} );
+		$sth->execute( '%' . $args->{search} . '%' );
+		warn "search for '$args->{search}' returned ", $sth->rows, " results\n";
 	} else {
 		$sth->execute();
 	}
@@ -134,7 +154,9 @@
 		unshift @rows, $row;
 	}
 
-	my @msgs;
+	my @msgs = (
+		"Showing " . ($#rows + 1) . " messages..."
+	);
 
 	foreach my $row (@rows) {
 
@@ -155,11 +177,27 @@
 		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;
 		}
 
-		$msg .= sprintf($args->{fmt}->{message}, $row->{message});
+		$args->{fmt}->{message} ||= '%s';
+		if (ref($args->{filter}->{message}) eq 'CODE') {
+			$msg .= sprintf($args->{fmt}->{message},
+				$args->{filter}->{message}->(
+					$row->{message}
+				)
+			);
+		} else {
+			$msg .= sprintf($args->{fmt}->{message}, $row->{message});
+		}
 
 		if ($append && @msgs) {
 			$msgs[$#msgs] .= " " . $msg;
@@ -201,7 +239,18 @@
 		from_to($msg, 'UTF-8', $ENCODING);
 
 		print "$channel: <$nick> $msg\n";
-		$sth->execute($channel, $nick, $msg);
+		$sth->execute($channel, 0, $nick, $msg);
+    },
+    irc_ctcp_action => sub {
+		my $kernel = $_[KERNEL];
+		my $nick = (split /!/, $_[ARG0])[0];
+		my $channel = $_[ARG1]->[0];
+		my $msg = $_[ARG2];
+
+		from_to($msg, 'UTF-8', $ENCODING);
+
+		print "$channel ***$nick $msg\n";
+		$sth->execute($channel, 1, $nick, $msg);
     },
 	irc_msg => sub {
 		my $kernel = $_[KERNEL];
@@ -252,7 +301,7 @@
 
 			my $what = $2;
 
-			foreach my $res (get_from_log( limit => 20, search => "%${what}%" )) {
+			foreach my $res (get_from_log( limit => 20, search => $what )) {
 				print "search [$what]: $res\n";
 				from_to($res, $ENCODING, 'UTF-8');
 				$_[KERNEL]->post( $IRC_ALIAS => privmsg => $nick, $res );
@@ -385,31 +434,83 @@
 	Headers        => { Server => 'irc-logger' },
 );
 
+my %escape = ('<'=>'&lt;', '>'=>'&gt;', '&'=>'&amp;', '"'=>'&quot;');
+my $escape_re  = join '|' => keys %escape;
+
 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);
 	$response->content_type("text/html; charset=$ENCODING");
+
+	my $q;
+
+	if ( $request->method eq 'POST' ) {
+		$q = new CGI::Simple( $request->content );
+	} elsif ( $request->uri =~ /\?(.+)$/ ) {
+		$q = new CGI::Simple( $1 );
+	} else {
+		$q = new CGI::Simple;
+	}
+
+	my $search = $q->param('search') || $q->param('grep') || '';
+
 	$response->content(
-		qq{<html><head><title>$NICK</title><style type="text/css">$style</style></head><body>} .
-	        "irc-logger url: " . $request->uri . '<br/>' .
-		join("<br/>",
+		qq{<html><head><title>$NICK</title><style type="text/css">$style</style></head><body>
+		<form method="post" class="search">
+		<input type="text" name="search" value="$search" size="10">
+		<input type="submit" value="search">
+		</form>
+		<p>
+		} .
+		join("</p><p>",
 			get_from_log(
-				limit => 100,
+				limit => $q->param('limit') || 100,
+				search => $q->param('search') || $q->param('grep') || undef,
 				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>',
 				},
+				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>';
+					},
+				},
 			)
 		) .
-		qq{</body></html>}
+		qq{</p></body></html>}
 	);
 	return RC_OK;
 }