eliminate loops in forwarding

[quix0rs-gnu-social.git] / scripts / ombqueuehandler.php

diff --git a/scripts/ombqueuehandler.php b/scripts/ombqueuehandler.php
index 75e04dd19b53c3ca73d9d83824ee778ea1fd317d..292d1395634491e71c8b03d51e03d23a9602cf5b 100755 (executable)
--- a/scripts/ombqueuehandler.php
+++ b/scripts/ombqueuehandler.php
@@ -33,7 +33,7 @@ require_once(INSTALLDIR . '/lib/queuehandler.php');
 
 set_error_handler('common_error_handler');
 
-class OmbQueueHandler {
+class OmbQueueHandler extends QueueHandler {
        
        function transport() {
                return 'omb';
@@ -44,8 +44,11 @@ class OmbQueueHandler {
        }
 
        function handle_notice($notice) {
-               if (!$this->is_remote($notice)) {
-                       omb_broadcast_remote_subscribers($notice);
+               if ($this->is_remote($notice)) {
+                       $this->log(LOG_DEBUG, 'Ignoring remote notice ' . $notice->id);
+                       return true;
+               } else {
+                       return omb_broadcast_remote_subscribers($notice);
                }
        }
        
@@ -54,7 +57,7 @@ class OmbQueueHandler {
 
        function is_remote($notice) {
                $user = User::staticGet($notice->profile_id);
-               return !$user;
+               return is_null($user);
        }
 }