Merge branch 'master' of /var/www/trunk

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

diff --git a/lib/jabber.php b/lib/jabber.php
index 099ded9ebd53395b09765733539e07c86530b259..84d2a562cecccbb64791a158f1f88ec3ff66d4da 100644 (file)
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -392,6 +392,29 @@ function jabber_broadcast_notice($notice)
             // To keep the incoming queue from filling up,
             // we service it after each send.
             $conn->processTime(0);
+            $sent_to[$user->id] = 1;
+        }
+    }
+
+    // Now, get users who have it in their inbox because of groups
+
+    $user = new User();
+    $user->query('SELECT user.id, user.jabber ' .
+                 'FROM user JOIN notice_inbox ' .
+                 'ON user.id = notice_inbox.user_id ' .
+                 'WHERE notice_inbox.notice_id = ' . $notice->id . ' ' .
+                 'AND notice_inbox.source = 2 ');
+
+    while ($user->fetch()) {
+        if (!array_key_exists($user->id, $sent_to)) {
+            common_log(LOG_INFO,
+                       'Sending notice ' . $notice->id . ' to ' . $user->jabber,
+                       __FILE__);
+            $conn->message($user->jabber, $msg, 'chat', null, $entry);
+            // To keep the incoming queue from filling up,
+            // we service it after each send.
+            $conn->processTime(0);
+            $sent_to[$user->id] = 1;
         }
     }