limit rss streams to 100 items by default

[quix0rs-gnu-social.git] / xmppdaemon.php

diff --git a/xmppdaemon.php b/xmppdaemon.php
index c8204ba0e7dfdc1d858d0b32504a619db3eab3ae..afe248c8e4f2fa4394cef43d3325032a0a93dd8a 100755 (executable)
--- a/xmppdaemon.php
+++ b/xmppdaemon.php
@@ -30,6 +30,10 @@ define('LACONICA', true);
 require_once(INSTALLDIR . '/lib/common.php');
 require_once(INSTALLDIR . '/lib/jabber.php');
 
+# This is kind of clunky; we create a class to call the global functions
+# in jabber.php, which create a new XMPP class. A more elegant (?) solution
+# might be to use make this a subclass of XMPP.
+
 class XMPPDaemon {
 
        function XMPPDaemon($resource=NULL) {
@@ -68,6 +72,7 @@ class XMPPDaemon {
                                                                                                                'end_stream', 'session_start'));
                        foreach($payloads as $event) {
                                $pl = $event[1];
+                               $this->log(LOG_DEBUG, "Received '$event[0]': " . print_r($pl, TRUE));
                                switch($event[0]) {
                                 case 'message':
                                        $this->handle_message($pl);
@@ -83,6 +88,22 @@ class XMPPDaemon {
                }
        }
 
+       function get_user($from) {
+               $user = User::staticGet('jabber', jabber_normalize_jid($from));
+               return $user;
+       }
+
+       function get_confirmation($from) {
+               $confirm = new Confirm_address();
+               $confirm->address = $from;
+               $confirm->address_type = 'jabber';
+               if ($confirm->find(TRUE)) {
+                       return $confirm;
+               } else {
+                       return NULL;
+               }
+       }
+
        function handle_message(&$pl) {
                if ($pl['type'] != 'chat') {
                        return;
@@ -90,8 +111,10 @@ class XMPPDaemon {
                if (strlen($pl['body']) == 0) {
                        return;
                }
+
                $from = jabber_normalize_jid($pl['from']);
-               $user = User::staticGet('jabber', $from);
+               $user = $this->get_user($from);
+
                if (!$user) {
                        $this->log(LOG_WARNING, 'Message from unknown user ' . $from);
                        return;
@@ -171,11 +194,14 @@ class XMPPDaemon {
                        case 'subscribe':
                            # We let anyone subscribe
                                $this->subscribed($from);
+                               $this->log(LOG_INFO,
+                                  'Accepted subscription from ' . $from);
                                break;
                        case 'subscribed':
-                       case 'unsubscribe':
                        case 'unsubscribed':
-                               # XXX: do we care?
+                       case 'unsubscribe':
+                               $this->log(LOG_INFO,
+                                  'Ignoring  "' . $pl['type'] . '" from ' . $from);
                                break;
                        default:
                                if (!$pl['type']) {
@@ -185,6 +211,8 @@ class XMPPDaemon {
                                                return;
                                        }
                                        if ($user->updatefrompresence) {
+                                               $this->log(LOG_INFO, 'Updating ' . $user->nickname .
+                                                                                        ' status from presence.');
                                                $this->add_notice($user, $pl);
                                        }
                                }
@@ -201,6 +229,7 @@ class XMPPDaemon {
        }
 
        function set_status($status) {
+               $this->log(LOG_INFO, 'Setting status to "' . $status . '"');
                jabber_send_presence($status);
        }
 }
@@ -213,4 +242,5 @@ if ($daemon->connect()) {
        $daemon->set_status("Send me a message to post a notice");
        $daemon->handle();
 }
+
 ?>