use AnyEvent::IRC::Util qw/mk_msg parse_irc_msg encode_ctcp/;
use AnyEvent::Redis;
use Data::Dump qw(dump);
+use Carp qw(confess);
my $nick = $ENV{IRC_NICK} || die "IRC_NICK";
my $room = $ENV{IRC_ROOM} || die "IRC_ROOM";
-
-warn "# $ENV{IRC_SERVER}:$ENV{IRC_PORT} $room $nick\n";
+my $subscribe = $ENV{IRC_SUBSCRIBE} || die 'IRC_SUBSCRIBE';
my $c = AnyEvent->condvar;
my $stdout = AnyEvent::Handle->new (fh => \*STDOUT);
my $con = new AnyEvent::IRC::Client;
-my $pub = AnyEvent::Redis->new( host => $ENV{REDIS_HOST}, port => $ENV{REDIS_PORT}, on_error => sub { warn @_ } );
-my $sub = AnyEvent::Redis->new( host => $ENV{REDIS_HOST}, port => $ENV{REDIS_PORT}, on_error => sub { warn @_ } );
+my $sub = AnyEvent::Redis->new( host => $ENV{REDIS_HOST}, port => $ENV{REDIS_PORT}, on_error => sub { confess @_ } );
+
+warn "# server:$ENV{IRC_SERVER}:$ENV{IRC_PORT} room:$room nick:$nick subscribe:$subscribe\n";
-$sub->psubscribe( 'channel *', sub {
+$sub->psubscribe( "MSG $subscribe", sub {
my ( $message, $from ) = @_;
- return unless $from !~ m/\Q$nick\E/; # skip our messages
- warn "#Q<< $from | $message\n";
- my ( undef, $channel, $user ) = split(/ /,$from,3);
- $con->send_msg( 'PRIVMSG', $room => join(' ',$channel, $user, $message) );
+ return unless $from !~ m/\Q($nick|$room)\E/; # FIXME: skip our messages
+ warn "#Q<< ",dump( $from, $message );
+ my ( undef, $gw, $user ) = split(/ /,$from,3);
+ $con->send_msg( 'PRIVMSG', $room => "<$user> $message" );
});
$con->reg_cb (
);
if ( $msg->{command} eq 'PRIVMSG' ) {
- my $channel = join(' ', 'channel', $msg->{params}->[0], $msg->{prefix});
- $pub->publish( $channel, $msg->{params}->[1] );
+ my ( $to, $body ) = @{ $msg->{params} };
+ my $channel = join(' ', 'MSG', "$nick/$to", $msg->{prefix});
+ warn "#Q>> $channel | $body\n";
+ my $pub = AnyEvent::Redis->new( host => $ENV{REDIS_HOST}, port => $ENV{REDIS_PORT}, on_error => sub { confess @_ } );
+ $pub->publish( $channel, $body );
} elsif ( $msg->{command} eq 'MODE' ) {
$con->send_srv( JOIN => $room );
}