remove tag URI stuff; unused and confusing

[quix0rs-gnu-social.git] / lib / jabber.php
diff --git a/lib/jabber.php b/lib/jabber.php

index 74e51d71a7c134774f3600832ef20457615302be..d772cd92c49749acfac8032f4e468a9454724ca8 100644 (file)
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -21,6 +21,30 @@ if (!defined('LACONICA')) { exit(1); }
  
  require_once('XMPPHP/XMPP.php');
  
+# XXX: something of a hack to work around problems with the XMPPHP lib
+
+class Laconica_XMPP extends XMPPHP_XMPP {
+    
+    function messageplus($to, $body, $type = 'chat', $subject = null, $payload = null) {
+       $to       = htmlspecialchars($to);
+       $body   = htmlspecialchars($body);
+       $subject = htmlspecialchars($subject);
+
+       $jid = jabber_daemon_address();
+       
+       $out = "<message from='$jid' to='$to' type='$type'>";
+       if($subject) $out .= "<subject>$subject</subject>";
+       $out .= "<body>$body</body>";
+       if($payload) $out .= $payload;
+       $out .= "</message>";
+
+               $cnt = strlen($out);
+               common_log(LOG_DEBUG, "Sending $cnt chars to $to");
+       $this->send($out);
+               common_log(LOG_DEBUG, 'Done.');
+    }
+}
+
  function jabber_valid_base_jid($jid) {
         # Cheap but effective
         return Validate::email($jid);
@@ -44,7 +68,7 @@ function jabber_daemon_address() {
  function jabber_connect($resource=NULL) {
         static $conn = NULL;
         if (!$conn) {
-               $conn = new XMPPHP_XMPP(common_config('xmpp', 'host') ?
+               $conn = new Laconica_XMPP(common_config('xmpp', 'host') ?
                                                                 common_config('xmpp', 'host') :
                                                                 common_config('xmpp', 'server'),
                                                                 common_config('xmpp', 'port'),
@@ -86,8 +110,7 @@ function jabber_send_notice($to, $notice) {
         }
         $msg = jabber_format_notice($profile, $notice);
         $entry = jabber_format_entry($profile, $notice);
-       common_log(LOG_DEBUG, 'special entry = ' . $entry, __FILE__);
-       $conn->message($to, $msg, 'chat', NULL, $entry);
+       $conn->messageplus($to, $msg, 'chat', NULL, $entry);
         return true;
  }
  
@@ -174,8 +197,6 @@ function jabber_special_presence($type, $to=NULL, $show=NULL, $status=NULL) {
  }
  
  function jabber_broadcast_notice($notice) {
-       # First, get users subscribed to this profile
-       # XXX: use a join here rather than looping through results
         $profile = Profile::staticGet($notice->profile_id);
         if (!$profile) {
                 common_log(LOG_WARNING, 'Refusing to broadcast notice with ' .
@@ -183,23 +204,57 @@ function jabber_broadcast_notice($notice) {
                            __FILE__);
                 return false;
         }
+       $sent_to = array();
+       # First, get users who this is a direct reply to
+       $reply = new Reply();
+       $reply->notice_id = $notice->id;
+       if ($reply->find()) {
+               while ($reply->fetch()) {
+                       $user = User::staticGet($reply->profile_id);
+                       if ($user && $user->jabber && $user->jabbernotify && $user->jabberreplies) {
+                               common_log(LOG_INFO,
+                                                  'Sending reply notice ' . $notice->id . ' to ' . $user->jabber,
+                                                  __FILE__);
+                               $success = jabber_send_notice($user->jabber, $notice);
+                               if ($success) {
+                                       # Remember so we don't send twice
+                                       $sent_to[$user->id] = true;
+                               } else {
+                                       # XXX: Not sure, but I think that's the right thing to do
+                                       common_log(LOG_WARNING,
+                                                          'Sending reply notice ' . $notice->id . ' to ' . $user->jabber . ' FAILED, cancelling.',
+                                                          __FILE__);
+                                       return false;
+                               }
+                       }
+               }
+       }
+    # Now, get users subscribed to this profile
+       # XXX: use a join here rather than looping through results
         $sub = new Subscription();
         $sub->subscribed = $notice->profile_id;
+        
         if ($sub->find()) {
                 while ($sub->fetch()) {
                         $user = User::staticGet($sub->subscriber);
-                       if ($user && $user->jabber && $user->jabbernotify) {
+                       if ($user && $user->jabber && $user->jabbernotify && !$sent_to[$user->id]) {
                                 common_log(LOG_INFO,
                                                    'Sending notice ' . $notice->id . ' to ' . $user->jabber,
                                                    __FILE__);
                                 $success = jabber_send_notice($user->jabber, $notice);
-                               if (!$success) {
+                               if ($success) {
+                                       $sent_to[$user->id] = true;
+                               } else {
                                         # XXX: Not sure, but I think that's the right thing to do
+                                       common_log(LOG_WARNING,
+                                                          'Sending notice ' . $notice->id . ' to ' . $user->jabber . ' FAILED, cancelling.',
+                                                          __FILE__);
                                         return false;
                                 }
                         }
                 }
         }
+
         return true;
  }