public timeline only gets local notices

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

diff --git a/xmppdaemon.php b/xmppdaemon.php
index dd262282885294d18a9132c1e2ecc324f76c989c..d2e609b4407a31fdd2808523356e8e65bc113cfb 100755 (executable)
--- a/xmppdaemon.php
+++ b/xmppdaemon.php
@@ -18,6 +18,35 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+function xmppdaemon_error_handler($errno, $errstr, $errfile, $errline, $errcontext) {
+    switch ($errno) {
+     case E_USER_ERROR:
+       echo "ERROR: [$errno] $errstr\n";
+       echo "  Fatal error on line $errline in file $errfile";
+       echo ", PHP " . PHP_VERSION . " (" . PHP_OS . ")\n";
+       echo "Aborting...\n";
+       exit(1);
+       break;
+       
+     case E_USER_WARNING:
+       echo "WARNING [$errno] $errstr\n";
+       break;
+       
+     case E_USER_NOTICE:
+       echo "My NOTICE [$errno] $errstr\n";
+       break;
+       
+     default:
+       echo "Unknown error type: [$errno] $errstr\n";
+       break;
+    }
+    
+    /* Don't execute PHP internal error handler */
+    return true;
+}
+
+set_error_handler('xmppdaemon_error_handler');
+
 # 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";
@@ -98,7 +127,12 @@ class XMPPDaemon {
                        $this->confirmation_queue();
                }
        }
-
+       
+       function handle_session($pl) {
+               # XXX what to do here?
+               return true;
+       }
+       
        function get_user($from) {
                $user = User::staticGet('jabber', jabber_normalize_jid($from));
                return $user;
@@ -178,7 +212,7 @@ class XMPPDaemon {
                $result = $user->update($orig);
                if (!$id) {
                        $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
-                       $this->log(LOG_ERROR,
+                       $this->log(LOG_ERR,
                                           'Could not set notify flag to ' . $notify .
                                           ' for user ' . common_log_objstring($user) .
                                           ': ' . $last_error->message);
@@ -190,6 +224,7 @@ class XMPPDaemon {
 
        function add_notice(&$user, &$pl) {
                $notice = new Notice();
+               $notice->is_local = 1;
                $notice->profile_id = $user->id;
                $notice->content = trim(substr($pl['body'], 0, 140));
                $notice->rendered = common_render_content($notice->content, $notice);
@@ -198,7 +233,7 @@ class XMPPDaemon {
                $id = $notice->insert();
                if (!$id) {
                        $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
-                       $this->log(LOG_ERROR,
+                       $this->log(LOG_ERR,
                                           'Could not insert ' . common_log_objstring($notice) .
                                           ' for user ' . common_log_objstring($user) .
                                           ': ' . $last_error->message);
@@ -209,7 +244,7 @@ class XMPPDaemon {
                $result = $notice->update($orig);
                if (!$result) {
                        $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
-                       $this->log(LOG_ERROR,
+                       $this->log(LOG_ERR,
                                           'Could not add URI to ' . common_log_objstring($notice) .
                                           ' for user ' . common_log_objstring($user) .
                                           ': ' . $last_error->message);
@@ -241,7 +276,7 @@ class XMPPDaemon {
                        if (!$pl['type']) {
                                $user = User::staticGet('jabber', $from);
                                if (!$user) {
-                                       $this->log(LOG_WARNING, 'Message from unknown user ' . $from);
+                                       $this->log(LOG_WARNING, 'Presence from unknown user ' . $from);
                                        return;
                                }
                                if ($user->updatefrompresence) {
@@ -354,7 +389,7 @@ class XMPPDaemon {
                                                                  $user->nickname,
                                                                  $confirm->address);
                                if (!$success) {
-                                       $this->log(LOG_ERROR, 'Confirmation failed for ' . $confirm->address);
+                                       $this->log(LOG_ERR, 'Confirmation failed for ' . $confirm->address);
                                        # Just let the claim age out; hopefully things work then
                                        continue;
                                } else {
@@ -364,7 +399,7 @@ class XMPPDaemon {
                                        $confirm->sent = $confirm->claimed;
                                        $result = $confirm->update($original);
                                        if (!$result) {
-                                               $this->log(LOG_ERROR, 'Cannot mark sent for ' . $confirm->address);
+                                               $this->log(LOG_ERR, 'Cannot mark sent for ' . $confirm->address);
                                                # Just let the claim age out; hopefully things work then
                                                continue;
                                        }