summaryrefslogtreecommitdiff
path: root/scripts/publicqueuehandler.php
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/publicqueuehandler.php')
-rwxr-xr-xscripts/publicqueuehandler.php61
1 files changed, 7 insertions, 54 deletions
diff --git a/scripts/publicqueuehandler.php b/scripts/publicqueuehandler.php
index 62e60b858..dde6a3427 100755
--- a/scripts/publicqueuehandler.php
+++ b/scripts/publicqueuehandler.php
@@ -29,69 +29,22 @@ define('LACONICA', true);
require_once(INSTALLDIR . '/lib/common.php');
require_once(INSTALLDIR . '/lib/jabber.php');
-require_once(INSTALLDIR . '/lib/queuehandler.php');
+require_once(INSTALLDIR . '/lib/xmppqueuehandler.php');
set_error_handler('common_error_handler');
-class PublicQueueHandler extends QueueHandler {
+class PublicQueueHandler extends XmppQueueHandler {
function transport() {
return 'public';
}
- function start() {
- $this->log(LOG_INFO, "INITIALIZE");
- # Low priority; we don't want to receive messages
-
- $this->conn = jabber_connect($this->_id);
- if ($this->conn) {
- $this->conn->addEventHandler('message', 'forward_message', $this);
- $this->conn->addEventHandler('reconnect', 'handle_reconnect', $this);
- $this->conn->setReconnectTimeout(600);
- jabber_send_presence("Send me a message to post a notice", 'available', NULL, 'available', -1);
- }
- return !is_null($this->conn);
- }
-
- function handle_reconnect(&$pl) {
- $this->conn->processUntil('session_start');
- $this->conn->presence(NULL, 'available', NULL, 'available', -1);
- }
-
function handle_notice($notice) {
- return jabber_public_notice($notice);
- }
-
- function idle($timeout=0) {
- $this->conn->processTime($timeout);
- }
-
- function forward_message(&$pl) {
- if ($pl['type'] != 'chat') {
- $this->log(LOG_DEBUG, 'Ignoring message of type ' . $pl['type'] . ' from ' . $pl['from']);
- return;
- }
- $listener = $this->listener();
- if (strtolower($listener) == strtolower($pl['from'])) {
- $this->log(LOG_WARNING, 'Ignoring loop message.');
- return;
- }
- $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';
+ try {
+ return jabber_public_notice($notice);
+ } catch (XMPPHP_Exception $e) {
+ $this->log(LOG_ERROR, "Got an XMPPHP_Exception: " . $e->getMessage());
+ exit(1);
}
}
}