From 5f4c6ec626d3d641f0712b276deb32b218b7a330 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 3 Jun 2010 16:58:45 -0700
Subject: Skip enqueueing to outgoing bridges on incoming remote messages.
 Twitter, Facebook, RSSCloud, and OStatus checks were enqueued on these when
 they'd never do anything but churn the queue servers. Notice::isLocal() can
 replace a number of manual checks for $notice->is_local being LOCAL_PUBLIC or
 LOCAL_NONPUBLIC.

---
 lib/util.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'lib/util.php')

diff --git a/lib/util.php b/lib/util.php
index 59d5132ec..049001aba 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1235,9 +1235,8 @@ function common_enqueue_notice($notice)
         $transports[] = 'jabber';
     }
 
-    // @fixme move these checks into QueueManager and/or individual handlers
-    if ($notice->is_local == Notice::LOCAL_PUBLIC ||
-        $notice->is_local == Notice::LOCAL_NONPUBLIC) {
+    // We can skip these for gatewayed notices.
+    if ($notice->isLocal()) {
         $transports = array_merge($transports, $localTransports);
         if ($xmpp) {
             $transports[] = 'public';
-- 
cgit v1.2.3-54-g00ecf