massive routing cleanup

[MQR.git] / scripts / mqr-irc-client.pl

diff --git a/scripts/mqr-irc-client.pl b/scripts/mqr-irc-client.pl
index 63f8fee..5e491be 100755 (executable)
--- a/scripts/mqr-irc-client.pl
+++ b/scripts/mqr-irc-client.pl
@@ -11,16 +11,28 @@ use AnyEvent::IRC::Client;
 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 $pub = AnyEvent::Redis->new( host => $ENV{REDIS_HOST}, port => $ENV{REDIS_PORT} );
-my $sub = AnyEvent::Redis->new( host => $ENV{REDIS_HOST}, port => $ENV{REDIS_PORT} );
+my $room = $ENV{IRC_ROOM} || die "IRC_ROOM";
+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 $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( "MSG $subscribe", sub {
+       my ( $message, $from ) = @_;
+       return unless $from !~ m/\Q($nick|$room)\E/; # FIXME: skip our messages
+       warn "#Q<< ",dump( $from, $message );
+       my ( undef, $channel, $user ) = split(/ /,$from,3);
+       $con->send_msg( 'PRIVMSG', $room => join(' ',$channel, $user, $message) );
+});
+
 $con->reg_cb (
    connect => sub {
       my ($con, $err) = @_;
@@ -43,8 +55,13 @@ $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 );
                }
    },
    debug_send => sub {