From 3532cd0490a70b54a92108549de6042459fd8469 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 28 May 2009 18:19:22 -0400
Subject: Only enqueue inbox-dependent transports after inboxes have been
 filled

---
 lib/util.php | 54 ++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 36 insertions(+), 18 deletions(-)

(limited to 'lib')

diff --git a/lib/util.php b/lib/util.php
index f862d7fcc..214c33279 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -879,7 +879,27 @@ function common_broadcast_notice($notice, $remote=false)
 
 function common_enqueue_notice($notice)
 {
-    $transports = array('omb', 'sms', 'twitter', 'facebook', 'ping');
+    $transports = array('twitter', 'facebook', 'ping');
+
+    // If inboxes are enabled, wait till inboxes are filled
+    // before doing inbox-dependent broadcasts
+
+    if (common_config('inboxes', 'enabled') === true ||
+        common_config('inboxes', 'enabled') === 'transitional') {
+        $transports[] = 'inbox';
+    } else {
+        $transports = array_merge($transports, common_post_inbox_transports());
+    }
+
+    foreach ($transports as $transport) {
+        common_enqueue_notice_transport($notice, $transport);
+    }
+    return $result;
+}
+
+function common_post_inbox_transports()
+{
+    $transports = array('omb', 'sms');
 
     if (common_config('xmpp', 'enabled')) {
         $transports = array_merge($transports, array('jabber', 'public'));
@@ -890,25 +910,23 @@ function common_enqueue_notice($notice)
         $transports[] = 'memcache';
     }
 
-    if (common_config('inboxes', 'enabled') === true ||
-        common_config('inboxes', 'enabled') === 'transitional') {
-        $transports[] = 'inbox';
-    }
+    return $transports;
+}
 
-    foreach ($transports as $transport) {
-        $qi = new Queue_item();
-        $qi->notice_id = $notice->id;
-        $qi->transport = $transport;
-        $qi->created = $notice->created;
-        $result = $qi->insert();
-        if (!$result) {
-            $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
-            common_log(LOG_ERR, 'DB error inserting queue item: ' . $last_error->message);
-            return false;
-        }
-        common_log(LOG_DEBUG, 'complete queueing notice ID = ' . $notice->id . ' for ' . $transport);
+function common_enqueue_notice_transport($notice, $transport)
+{
+    $qi = new Queue_item();
+    $qi->notice_id = $notice->id;
+    $qi->transport = $transport;
+    $qi->created = $notice->created;
+    $result = $qi->insert();
+    if (!$result) {
+        $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
+        common_log(LOG_ERR, 'DB error inserting queue item: ' . $last_error->message);
+        throw new ServerException('DB error inserting queue item: ' . $last_error->message);
     }
-    return $result;
+    common_log(LOG_DEBUG, 'complete queueing notice ID = ' . $notice->id . ' for ' . $transport);
+    return true;
 }
 
 function common_real_broadcast($notice, $remote=false)
-- 
cgit v1.2.3-54-g00ecf