X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=scripts%2Fmqr-xmpp-client.pl;h=63ce4d1dc662795bb5e3e5951edd9c43899dab24;hb=c57b73fbd7feb702147e275b2f1a133423ac2dd7;hp=f501940da44a619e4f3eabb37f105734256f5810;hpb=0813e346a6e32fafbf39d5223718e0358213dd87;p=MQR.git

diff --git a/scripts/mqr-xmpp-client.pl b/scripts/mqr-xmpp-client.pl
index f501940..63ce4d1 100755
--- a/scripts/mqr-xmpp-client.pl
+++ b/scripts/mqr-xmpp-client.pl
@@ -9,17 +9,19 @@ 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";
 my $pw  = $ENV{XMPP_PASSWD} || die "XMPP_PASSWD";
-my $room = $ENV{XMPP_ROOM} || die "XMPP_ROOM";
-my $subscribe  = $ENV{XMPP_SUBSCRIBE} || die 'XMPP_SUBSCRIBE';
+my $room = $ENV{XMPP_ROOM} || warn "no XMPP_ROOM - not joining any muc rooms!\n";
+my $subscribe  = $ENV{XMPP_SUBSCRIBE} || warn "no XMPP_SUBSCRIBE - pushing ALL MSG\n";
 
 my $j       = AnyEvent->condvar;
 my $cl      = AnyEvent::XMPP::Client->new (debug => 1);
@@ -36,37 +38,45 @@ $cl->set_presence(undef, 'I\'m a talking bot.', 1);
 $cl->add_account ($jid, $pw);
 warn "connecting to $jid...\n";
 
-my $sub = 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;
 our $muc_rooms;
 
-$sub->psubscribe( "MSG $subscribe", sub {
-	my ( $message, $from ) = @_;
-	return unless $from !~ m/\Q$jid\E/; # skip our messages
-	Encode::_utf8_on($message);
-	warn "#Q<< ", dump( $from, $message );
-	my ( undef, $gw, $user ) = split(/ /,$from,3);
+sub publish;
+
+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
-		warn "# $jid [$from] -> [$to] | $message\n";
-		$user =~ s{!.+}{};
-		$gw   =~ s{^.+\/#}{#};
-		my $body = "<$user$gw> $message"; # FIXME
-		$cl->send_message( $body, $to => $jid, defined $muc_rooms->{$to} ? 'groupchat' : 'chat' );
+		my $type = defined $muc_rooms->{$from} ? 'groupchat' : 'chat';
+		publish "SEND $jid $type $user $to" => $body;
 	}
+}) if $subscribe;
+
+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 "#Q>> ",dump($channel, $body);
+	MQR::Redis->publish( $channel, $body );
 }
 
 $cl->reg_cb (
@@ -83,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 ] => $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*$/) {
@@ -98,11 +111,15 @@ warn "# MUC message ",dump( $room->nick_jid, $msg->any_body, $is_echo );
    message => sub {
 		my ($cl, $acc, $msg) = @_;
 
+		my $from = $msg->from;
 		my $body = $msg->any_body;
 
-		$contacts->{ $msg->from }++;
+#		$contacts->{ $from }++; # don't push to anyone who sent message
+
+		my $user = $from;
+		$user =~ s{\@.+$}{};
 
-		publish [ 'MSG', $jid, $msg->from ] => $body;
+		publish "MSG $jid chat $user $from" => $body;
 
 #		my $repl = $msg->make_reply;
 #		$repl->add_body( $response );