4 files changed, 11 insertions, 23 deletions
diff --git a/plugins/OStatus/lib/hubverifyqueuehandler.php b/plugins/OStatus/lib/hubconfqueuehandler.php
index 7ce9e1431..c8e0b72fe 100644
--- a/plugins/OStatus/lib/hubverifyqueuehandler.php
+++ b/plugins/OStatus/lib/hubconfqueuehandler.php
@@ -22,11 +22,11 @@
  * @package Hub
  * @author Brion Vibber <brion@status.net>
  */
-class HubVerifyQueueHandler extends QueueHandler
+class HubConfQueueHandler extends QueueHandler
 {
     function transport()
     {
-        return 'hubverify';
+        return 'hubconf';
     }
 
     function handle($data)
diff --git a/plugins/OStatus/lib/ostatusqueuehandler.php b/plugins/OStatus/lib/ostatusqueuehandler.php
index c1e50bffa..0da85600f 100644
--- a/plugins/OStatus/lib/ostatusqueuehandler.php
+++ b/plugins/OStatus/lib/ostatusqueuehandler.php
@@ -83,23 +83,11 @@ class OStatusQueueHandler extends QueueHandler
     function pingReply($oprofile)
     {
         if ($this->user) {
-            if (!empty($oprofile->salmonuri)) {
-                // For local posts, send a Salmon ping to the mentioned
-                // remote user or group.
-                // @fixme as an optimization we can skip this if the
-                // remote profile is subscribed to the author.
-
-                common_log(LOG_INFO, "Prepping to send notice '{$this->notice->uri}' to remote profile '{$oprofile->uri}'.");
-
-                $xml = '<?xml version="1.0" encoding="UTF-8" ?' . '>';
-                $xml .= $this->notice->asAtomEntry(true, true);
-
-                $data = array('salmonuri' => $oprofile->salmonuri,
-                              'entry' => $xml);
-
-                $qm = QueueManager::get();
-                $qm->enqueue($data, 'salmonout');
-            }
+            // For local posts, send a Salmon ping to the mentioned
+            // remote user or group.
+            // @fixme as an optimization we can skip this if the
+            // remote profile is subscribed to the author.
+            $oprofile->notifyDeferred($this->notice);
         }
     }
 
diff --git a/plugins/OStatus/lib/pushinputqueuehandler.php b/plugins/OStatus/lib/pushinqueuehandler.php
index cbd9139b5..a90f52df2 100644
--- a/plugins/OStatus/lib/pushinputqueuehandler.php
+++ b/plugins/OStatus/lib/pushinqueuehandler.php
@@ -23,11 +23,11 @@
  * @author Brion Vibber <brion@status.net>
  */
 
-class PushInputQueueHandler extends QueueHandler
+class PushInQueueHandler extends QueueHandler
 {
     function transport()
     {
-        return 'pushinput';
+        return 'pushin';
     }
 
     function handle($data)
diff --git a/plugins/OStatus/lib/salmonoutqueuehandler.php b/plugins/OStatus/lib/salmonqueuehandler.php
index 536ff94af..aa97018dc 100644
--- a/plugins/OStatus/lib/salmonoutqueuehandler.php
+++ b/plugins/OStatus/lib/salmonqueuehandler.php
@@ -22,11 +22,11 @@
  * @package OStatusPlugin
  * @author Brion Vibber <brion@status.net>
  */
-class SalmonOutQueueHandler extends QueueHandler
+class SalmonQueueHandler extends QueueHandler
 {
     function transport()
     {
-        return 'salmonout';
+        return 'salmon';
     }
 
     function handle($data)