cleanup SEND output

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

diff --git a/scripts/mqr-xmpp-client.pl b/scripts/mqr-xmpp-client.pl
index 7c2e89f..63ce4d1 100755 (executable)
--- a/scripts/mqr-xmpp-client.pl
+++ b/scripts/mqr-xmpp-client.pl
@@ -9,11 +9,13 @@ use AnyEvent::XMPP::Ext::Version;
 use AnyEvent::XMPP::Namespaces qw/xmpp_ns/;
 use AnyEvent::XMPP::Ext::MUC;
 use AnyEvent::XMPP::Util qw/node_jid res_jid/;
-use AnyEvent::Redis;
 use Data::Dump qw(dump);
 use Encode;
 use Carp qw(confess);
 
+use lib 'lib';
+use MQR::Redis;
+
 binmode STDOUT, ":utf8";
 
 my $jid = $ENV{XMPP_JID} || die "XMPP_JID";
@@ -36,10 +38,6 @@ $cl->set_presence(undef, 'I\'m a talking bot.', 1);
 $cl->add_account ($jid, $pw);
 warn "connecting to $jid...\n";
 
-sub redis {
-       AnyEvent::Redis->new( host => $ENV{REDIS_HOST}, port => $ENV{REDIS_PORT}, on_error => sub { confess @_ } );
-}
-
 warn "# jid:$jid root:$room subscribe:$subscribe\n";
 
 our $contacts;
@@ -47,37 +45,38 @@ our $muc_rooms;
 
 sub publish;
 
-redis->psubscribe( "MSG $subscribe", sub {
-       my ( $message, $from ) = @_;
-       return unless $from !~ m/\Q$jid\E/; # skip our messages
-       Encode::_utf8_on($message);
-       warn "<<<< ", dump( $from, $message );
-       my ( undef, $gw, $user, $type ) = split(/ /,$from,3);
+MQR::Redis->redis->psubscribe( "MSG $subscribe", sub {
+       my ( $body, $channel ) = @_;
+       warn "<<<< ", dump( $channel, $body );
+       Encode::_utf8_on($body);
+
+       my ( undef, $gw, $room, $user, $from ) = split(/\s/,$channel);
+
+       return if $from eq $jid; # FIXME skip own
+
        foreach my $to ( keys %$contacts, keys %$muc_rooms ) {
-warn "XXX send to $to\n";
                next if $from =~ m/\Q$to\E/; # FIXME
-               $user =~ s{!.+}{};
-               my $body = "<$user> $message"; # FIXME
-               publish [ 'SEND', $jid, $to, $type ] => $body;
+               my $type = defined $muc_rooms->{$from} ? 'groupchat' : 'chat';
+               publish "SEND $jid $type $user $to" => $body;
        }
-});
+}) if $subscribe;
 
-redis->psubscribe( "SEND $jid *", sub {
-       my ( $body, $from ) = @_;
-       my ( undef, undef, $to, $type ) = split(/\s/, $from);
-       warn "SEND $jid -> $to $type | $body\n";
-       $cl->send_message( $body, $to => $jid, $type );
+MQR::Redis->redis->psubscribe( "SEND $jid *", sub {
+       my ( $body, $channel ) = @_;
+       warn "<<<< ",dump( $channel, $body );
+       Encode::_utf8_on($body);
+
+       my ( undef, $gw, $type, $user, $to ) = split(/\s/, $channel);
+       warn "SEND $jid $type $to <$user> $body\n";
+       $cl->send_message( "<$user> $body", $to => $jid, $type );
 });
 
 #redis->psubscribe( '*' => sub { warn @_, $/ };
 
 sub publish {
        my ( $channel, $body ) = @_;
-       $channel = join(' ', @$channel) if ref $channel eq 'ARRAY';
        Encode::_utf8_off($body);
-       my $pub = AnyEvent::Redis->new( host => $ENV{REDIS_HOST}, port => $ENV{REDIS_PORT}, on_error => sub { confess @_ } );
-       $pub->publish( $channel, $body );
-       warn ">>>> ",dump($channel, $body);
+       MQR::Redis->publish( $channel, $body );
 }
 
 $cl->reg_cb (
@@ -94,7 +93,10 @@ warn "# MUC message ",dump( $room->nick_jid, $msg->any_body, $is_echo );
             return if $is_echo;
             return if $msg->is_delayed;
 
-               publish [ 'MSG', $jid, $msg->from, 'groupchat' ] => $msg->any_body;
+                       my $from = $msg->from;
+                       my $user = $from;
+                       $user =~ s{^.+/}{};
+                       publish "MSG $jid groupchat $user $from" => $msg->any_body;
 
             my $mynick = res_jid ($room->nick_jid);
             if ($msg->any_body =~ /^\s*\Q$mynick\E:\s+(.*?)\s*$/) {
@@ -109,13 +111,15 @@ warn "# MUC message ",dump( $room->nick_jid, $msg->any_body, $is_echo );
    message => sub {
                my ($cl, $acc, $msg) = @_;
 
-               my $to   = $msg->from;
+               my $from = $msg->from;
                my $body = $msg->any_body;
 
-               $contacts->{ $to }++;
+#              $contacts->{ $from }++; # don't push to anyone who sent message
+
+               my $user = $from;
+               $user =~ s{\@.+$}{};
 
-               publish [ 'MSG',  $jid, $to, 'chat' ] => $body;
-               publish [ 'SEND', $jid, $to, 'chat' ] => "ECHO: $body";
+               publish "MSG $jid chat $user $from" => $body;
 
 #              my $repl = $msg->make_reply;
 #              $repl->add_body( $response );