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

diff --git a/scripts/mqr-xmpp-client.pl b/scripts/mqr-xmpp-client.pl
index 4981d07..63ce4d1 100755
--- a/scripts/mqr-xmpp-client.pl
+++ b/scripts/mqr-xmpp-client.pl
@@ -7,52 +7,125 @@ use AnyEvent::XMPP::Client;
 use AnyEvent::XMPP::Ext::Disco;
 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 Data::Dump qw(dump);
+use Encode;
+use Carp qw(confess);
 
-my @msgs;
-
-sub read_messages {
-   my ($msgs_file) = @_;
-   open my $f, $msgs_file
-      or die "Couldn't open messages file: '$msgs_file'\n";
-   (@msgs) = map { chomp; $_ } <$f>;
-   close $f;
-}
+use lib 'lib';
+use MQR::Redis;
 
 binmode STDOUT, ":utf8";
 
-our ($jid, $pw, $inputfile);
-require 'config.pl';
-
-warn "# $jid <- $inputfile\n";
-
-read_messages ($inputfile);
+my $jid = $ENV{XMPP_JID} || die "XMPP_JID";
+my $pw  = $ENV{XMPP_PASSWD} || die "XMPP_PASSWD";
+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);
 my $disco   = AnyEvent::XMPP::Ext::Disco->new;
 my $version = AnyEvent::XMPP::Ext::Version->new;
+my $muc     = AnyEvent::XMPP::Ext::MUC->new (disco => $disco);
 
 $cl->add_extension ($disco);
 $cl->add_extension ($version);
+$cl->add_extension ($muc);
 
-$cl->set_presence (undef, 'I\'m a talking bot.', 1);
+$cl->set_presence(undef, 'I\'m a talking bot.', 1);
 
 $cl->add_account ($jid, $pw);
 warn "connecting to $jid...\n";
 
+warn "# jid:$jid root:$room subscribe:$subscribe\n";
+
+our $contacts;
+our $muc_rooms;
+
+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 ) {
+		next if $from =~ m/\Q$to\E/; # FIXME
+		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 ) = @_;
+	Encode::_utf8_off($body);
+	MQR::Redis->publish( $channel, $body );
+}
+
 $cl->reg_cb (
    session_ready => sub {
       my ($cl, $acc) = @_;
       warn "connected!\n";
+      $muc->join_room ($acc->connection, $room, node_jid ($acc->jid));
+      $muc->reg_cb (
+         message => sub {
+            my ($cl, $room, $msg, $is_echo) = @_;
+		$muc_rooms->{ $room->nick_jid }++;
+warn "# MUC message ",dump( $room->nick_jid, $msg->any_body, $is_echo );
+
+            return if $is_echo;
+            return if $msg->is_delayed;
+
+			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*$/) {
+               my $ans = answer_to ($1);
+               my $repl = $msg->make_reply;
+               $repl->add_body ($ans);
+               $repl->send;
+            }
+         }
+      );
    },
    message => sub {
-      my ($cl, $acc, $msg) = @_;
-      my $talkmsg = $msgs[int (rand (@msgs))];
-      my $repl = $msg->make_reply;
-      $repl->add_body ("You said '".$msg->any_body."' but... " . $talkmsg);
-      warn "Got message: '".$msg->any_body."' from ".$msg->from."\n";
-      warn "Answered: $talkmsg\n";
-      $repl->send;
+		my ($cl, $acc, $msg) = @_;
+
+		my $from = $msg->from;
+		my $body = $msg->any_body;
+
+#		$contacts->{ $from }++; # don't push to anyone who sent message
+
+		my $user = $from;
+		$user =~ s{\@.+$}{};
+
+		publish "MSG $jid chat $user $from" => $body;
+
+#		my $repl = $msg->make_reply;
+#		$repl->add_body( $response );
+#		$repl->send;
+#		warn "#>>> $response\n";
+
    },
    contact_request_subscribe => sub {
       my ($cl, $acc, $roster, $contact) = @_;
@@ -68,6 +141,15 @@ $cl->reg_cb (
       warn "Got disconnected: [@_]\n";
       $j->broadcast;
    },
+	roster_update => sub {
+		my ($con,$account,$roster) = @_;
+warn "XXXXX", ref($account), " | ", ref($roster);
+		foreach my $contact ( $roster->get_contacts ) {
+			$contacts->{ $contact->{jid} }++;
+			warn "# contacts ",dump($contacts);
+		}
+		warn "# contacts ",dump($contacts);
+	},
 );
 
 $cl->start;