--- trunk/irc-logger.pl 2006/03/12 14:19:00 13
+++ trunk/irc-logger.pl 2006/03/13 12:56:26 15
@@ -18,7 +18,7 @@
## CONFIG
-my $NICK = 'irc-logger-dev';
+my $NICK = 'irc-logger';
my $CONNECT =
{Server => 'irc.freenode.net',
Nick => $NICK,
@@ -35,6 +35,8 @@
my $DSN = 'DBI:Pg:dbname=irc-logger';
+my $ENCODING = 'ISO-8859-2';
+
## END CONFIG
@@ -43,6 +45,7 @@
use HTTP::Status;
use DBI;
use Encode qw/from_to/;
+use Regexp::Common qw /URI/;
my $dbh = DBI->connect($DSN,"","", { RaiseError => 1, AutoCommit => 1 }) || die $DBI::errstr;
@@ -84,6 +87,10 @@
nick => '%s: ',
message => '%s',
},
+ message_filter => sub {
+ # modify message content
+ return shift;
+ }
);
=cut
@@ -157,7 +164,15 @@
$append = 0;
}
- $msg .= sprintf($args->{fmt}->{message}, $row->{message});
+ if (ref($args->{message_filter}) eq 'CODE') {
+ $msg .= sprintf($args->{fmt}->{message},
+ $args->{message_filter}->(
+ $row->{message}
+ )
+ );
+ } else {
+ $msg .= sprintf($args->{fmt}->{message}, $row->{message});
+ }
if ($append && @msgs) {
$msgs[$#msgs] .= " " . $msg;
@@ -196,7 +211,7 @@
my $channel = $_[ARG1]->[0];
my $msg = $_[ARG2];
- from_to($msg, 'UTF-8', 'ISO-8859-2');
+ from_to($msg, 'UTF-8', $ENCODING);
print "$channel: <$nick> $msg\n";
$sth->execute($channel, $nick, $msg);
@@ -205,7 +220,7 @@
my $kernel = $_[KERNEL];
my $nick = (split /!/, $_[ARG0])[0];
my $msg = $_[ARG2];
- from_to($msg, 'UTF-8', 'ISO-8859-2');
+ from_to($msg, 'UTF-8', $ENCODING);
my $res = "unknown command '$msg', try /msg $NICK help!";
my @out;
@@ -240,7 +255,7 @@
foreach my $res (get_from_log( limit => $1 )) {
print "last: $res\n";
- from_to($res, 'ISO-8859-2', 'UTF-8');
+ from_to($res, $ENCODING, 'UTF-8');
$_[KERNEL]->post( $IRC_ALIAS => privmsg => $nick, $res );
}
@@ -252,7 +267,7 @@
foreach my $res (get_from_log( limit => 20, search => "%${what}%" )) {
print "search [$what]: $res\n";
- from_to($res, 'ISO-8859-2', 'UTF-8');
+ from_to($res, $ENCODING, 'UTF-8');
$_[KERNEL]->post( $IRC_ALIAS => privmsg => $nick, $res );
}
@@ -262,7 +277,7 @@
if ($res) {
print ">> [$nick] $res\n";
- from_to($res, 'ISO-8859-2', 'UTF-8');
+ from_to($res, $ENCODING, 'UTF-8');
$_[KERNEL]->post( $IRC_ALIAS => privmsg => $nick, $res );
}
@@ -378,7 +393,7 @@
# http server
my $httpd = POE::Component::Server::HTTP->new(
- Port => 8000,
+ Port => $NICK =~ m/-dev/ ? 8001 : 8000,
ContentHandler => { '/' => \&root_handler },
Headers => { Server => 'irc-logger' },
);
@@ -392,7 +407,7 @@
sub root_handler {
my ($request, $response) = @_;
$response->code(RC_OK);
- $response->content_type('text/html');
+ $response->content_type("text/html; charset=$ENCODING");
$response->content(
qq{$NICK} .
"irc-logger url: " . $request->uri . '
' .
@@ -405,6 +420,11 @@
nick => '%s: ',
message => '%s',
},
+ message_filter => sub {
+ my $m = shift || return;
+ $m =~ s#($RE{URI}{HTTP})#$1#gs;
+ return $m;
+ },
)
) .
qq{}