remove 'nudge' -- it won't be in this release

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

diff --git a/scripts/xmppconfirmhandler.php b/scripts/xmppconfirmhandler.php
index 1a1c550013e5e393382d3398baae9735b12984b3..8961b0b6e38f6a54a62cdc3782b79ae9a93dadae 100755 (executable)
--- a/scripts/xmppconfirmhandler.php
+++ b/scripts/xmppconfirmhandler.php
@@ -29,34 +29,24 @@ 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');
 
 define('CLAIM_TIMEOUT', 1200);
 
-class XmppConfirmHandler {
+class XmppConfirmHandler extends XmppQueueHandler {
 
        var $_id = 'confirm';
        
-       function XmppConfirmHandler($id=NULL) {
-               if ($id) {
-                       $this->_id = $id;
-               }
-       }
-
-       function start() {
-               # Low priority; we don't want to receive messages
-               $this->log(LOG_INFO, "INITIALIZE");
-               $this->conn = jabber_connect($this->_id);
-               if ($this->conn) {
-                       $this->conn->addEventHandler('message', 'forward_message', $this);
-                       jabber_send_presence("Send me a message to post an notice", 'dnd', NULL, 'available', -1);
-               }
-               return !is_null($this->conn);
+       function class_name() {
+               return 'XmppConfirmHandler';
        }
        
-       function handle_queue() {
+       function run() {
+               if (!$this->start()) {
+                       return false;
+               }
                $this->log(LOG_INFO, 'checking for queued confirmations');
                do {
                        $confirm = $this->next_confirm();
@@ -76,28 +66,37 @@ class XmppConfirmHandler {
                                        continue;
                                } else {
                                        $this->log(LOG_INFO, 'Confirmation sent for ' . $confirm->address);
-                                       # Mark confirmation sent
-                                       $original = clone($confirm);
-                                       $confirm->sent = $confirm->claimed;
-                                       $result = $confirm->update($original);
+                                       # Mark confirmation sent; need a dupe so we don't have the WHERE clause
+                                       $dupe = Confirm_address::staticGet('code', $confirm->code);
+                                       if (!$dupe) {
+                                               common_log(LOG_WARNING, 'Could not refetch confirm', __FILE__);
+                                               continue;
+                                       }
+                                       $orig = clone($dupe);
+                                       $dupe->sent = $dupe->claimed;
+                                       $result = $dupe->update($orig);
                                        if (!$result) {
-                                               $this->log(LOG_ERR, 'Cannot mark sent for ' . $confirm->address);
+                                               common_log_db_error($dupe, 'UPDATE', __FILE__);
                                                # Just let the claim age out; hopefully things work then
                                                continue;
                                        }
+                                       $dupe->free();
+                                       unset($dupe);
                                }
-                               $this->idle();
+                               $user->free();
+                               unset($user);
+                               $confirm->free();
+                               unset($confirm);
+                               $this->idle(0);
                        } else {
 #                              $this->clear_old_confirm_claims();
-                               $start = microtime();
-                               $this->idle();
-                               $used = microtime() - $start;
-                               if ($used < 10000000) {
-                                       usleep(10000000 - $used);
-                               }
-                               sleep(10);
+                               $this->idle(10);
                        }
                } while (true);
+               if (!$this->finish()) {
+                       return false;
+               }
+               return true;
        }
 
        function next_confirm() {
@@ -131,51 +130,8 @@ class XmppConfirmHandler {
                $confirm->claimed = NULL;
                $confirm->whereAdd('now() - claimed > '.CLAIM_TIMEOUT);
                $confirm->update(DB_DATAOBJECT_WHEREADD_ONLY);
-       }
-       
-       function log($level, $msg) {
-               common_log($level, 'XmppConfirmHandler ('. $this->_id .'): '.$msg);
-       }
-       
-       function idle() {
-           $this->log(LOG_DEBUG, 'Checking the incoming message queue.');
-               # Process the queue for a second
-               if ($this->conn->readyToProcess()) {
-                       $this->log(LOG_DEBUG, 'Something in the incoming message queue; processing it.');
-                       $this->conn->processTime(1);
-                       $this->log(LOG_DEBUG, 'Done processing incoming message queue.');
-               } else {
-                       $this->log(LOG_DEBUG, 'Nothing in the incoming message queue; skipping it.');
-               }
-       }
-
-       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';
-               }
+               $confirm->free();
+               unset($confirm);
        }
 }
 
@@ -188,8 +144,5 @@ $resource = ($argc > 1) ? $argv[1] : (common_config('xmpp', 'resource').'-confir
 
 $handler = new XmppConfirmHandler($resource);
 
-if ($handler->start()) {
-       $handler->handle_queue();
-}
+$handler->runOnce();
 
-$handler->finish();