notice_favorite class

[quix0rs-gnu-social.git] / scripts / publicqueuehandler.php

diff --git a/scripts/publicqueuehandler.php b/scripts/publicqueuehandler.php
index b482d029a78b5d3097b516cd2dce2c328cdf08d2..5075c12df578aeeec4f45ce8db0bc430902dfe6f 100755 (executable)
--- a/scripts/publicqueuehandler.php
+++ b/scripts/publicqueuehandler.php
@@ -20,8 +20,8 @@
 
 # Abort if called from a web server
 if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
-       print "This script must be run from the command line\n";
-       exit();
+    print "This script must be run from the command line\n";
+    exit();
 }
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
@@ -29,65 +29,27 @@ 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 {
-       
-       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, NULL, -1);
-               $this->conn->addEventHandler('message', 'forward_message', $this);
-               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';
-               }
-       }
+class PublicQueueHandler extends XmppQueueHandler
+{
+    
+    function transport()
+    {
+        return 'public';
+    }
+    
+    function handle_notice($notice)
+    {
+        try {
+            return jabber_public_notice($notice);
+        } catch (XMPPHP_Exception $e) {
+            $this->log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
+            die($e->getMessage());
+        }
+    }
 }
 
 ini_set("max_execution_time", "0");
@@ -99,8 +61,4 @@ $resource = ($argc > 1) ? $argv[1] : (common_config('xmpp','resource') . '-publi
 
 $handler = new PublicQueueHandler($resource);
 
-if ($handler->start()) {
-       $handler->handle_queue();
-}
-
-$handler->finish();
+$handler->runOnce();