GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

forward messages from queuehandler to listener

Browse Source 
The queuehandler sends messages to the user. If the user replies, the
messages are typically sent directly to the queuehandler (including
resource), not the default bot JID.

We add a little code for the xmppqueuehandler to periodically service
its queue of received messages. Received messages are forwarded to the
listener to deal with. We use XEP 33, 'addresses', to note the
original sender.

The xmppdaemon checks to see if the 'from' on a message is the daemon
address. If so, it looks for a XEP 33 'addresses' stanza, with an
'ofrom' address, which shows who it was originally is from.

This should let us send from one resource ID and still process
incoming messages in a different connection.

darcs-hash:20080830040717-84dde-59c75bfb107a1dd5fd531106751b4544bfd15656.gz
This commit is contained in:
Evan Prodromou 2008-08-30 00:07:17 -04:00
parent 9907a2101d
commit 4cdd90283b
2 changed files with 54 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
scripts/xmppdaemon.php
View File

@ -73,7 +73,7 @@ class XMPPDaemon {
function handle() { function handle() {
$this->conn->addEventHandler('message', 'handle_message', $this); $this->conn->addEventHandler('message', 'handle_message', $this);
$this->conn->addEventHandler('presence', 'handle_presence', $this); $this->conn->addEventHandler('presence', 'handle_presence', $this);
$this->conn->process(); $this->conn->process();
} }
@ -91,6 +91,17 @@ class XMPPDaemon {
} }
$from = jabber_normalize_jid($pl['from']); $from = jabber_normalize_jid($pl['from']);
# Forwarded from another daemon (probably a broadcaster) for
# us to handle
if (preg_match('/^'.jabber_daemon_address().'/', $from)) {
$from = $this->get_ofrom($pl);
if (is_null($from)) {
return;
}
}
$user = $this->get_user($from); $user = $this->get_user($from);
if (!$user) { if (!$user) {
@ -118,6 +129,26 @@ class XMPPDaemon {
} }
} }
function get_ofrom($pl) {
$xml = $pl['raw'];
$addresses = $xml->sub('adddresses');
if (!$addresses) {
$this->log(LOG_WARNING, 'Forwarded message without addresses');
return NULL;
}
$address = $xml->sub('address');
if (!$address) {
$this->log(LOG_WARNING, 'Forwarded message without address');
return NULL;
}
$type = $address->attr('type');
if ($type != 'ofrom') {
$this->log(LOG_WARNING, 'Type of forwarded message is not ofrom');
return NULL;
}
return $address->attr('jid');
}
function is_autoreply($txt) { function is_autoreply($txt) {
if (preg_match('/[\[\(]?[Aa]uto-?[Rr]eply[\]\)]/', $txt)) { if (preg_match('/[\[\(]?[Aa]uto-?[Rr]eply[\]\)]/', $txt)) {
return true; return true;

26
scripts/xmppqueuehandler.php
View File

@ -36,11 +36,11 @@ set_error_handler('common_error_handler');
class XmppQueueHandler extends QueueHandler { class XmppQueueHandler extends QueueHandler {
var $conn = NULL; var $conn = NULL;
function transport() { function transport() {
return 'jabber'; return 'jabber';
} }
function start() { function start() {
# Low priority; we don't want to receive messages # Low priority; we don't want to receive messages
$this->conn = jabber_connect($this->_id, NULL, -1); $this->conn = jabber_connect($this->_id, NULL, -1);
@ -56,11 +56,29 @@ class XmppQueueHandler extends QueueHandler {
# Process the queue for a second # Process the queue for a second
$this->conn->processTime(1); $this->conn->processTime(1);
} }
function finish() { function finish() {
} }
function forward_message(&$pl) { function forward_message(&$pl) {
$listener = $this->listener();
$this->log(LOG_INFO, 'Forwarding message from ' . $pl['from'] . ' to ' . $listener);
$this->conn->message($this->listener(), $pl['body'], 'chat', NULL, $this->ofrom($pl['from']));
}
function ofrom($from) {
$address = "<addresses xmlns='http://jabber.org/protocol/address'>\n";
$address .= "<address type='ofrom' jid='$from' />\n";
$address .= "</addresses>\n";
return $address;
}
function listener() {
if (common_config('xmpp', 'listener')) {
return common_config('xmpp', 'listener');
} else {
return jabber_daemon_address() . '/' . common_config('xmpp','resource') . '-listener';
}
} }
} }