OStatus sub/unsub updates:

- fix for PuSH unsub verification
- send Salmon notification on unsub

2 files changed, 8 insertions, 1 deletions

diff --git a/plugins/OStatus/lib/activity.php b/plugins/OStatus/lib/activity.php
index f137946ab..3ed613dc7 100644
--- a/plugins/OStatus/lib/activity.php
+++ b/plugins/OStatus/lib/activity.php
@@ -303,6 +303,12 @@ class ActivityVerb
     const FRIEND   = 'http://activitystrea.ms/schema/1.0/make-friend';
     const JOIN     = 'http://activitystrea.ms/schema/1.0/join';
     const TAG      = 'http://activitystrea.ms/schema/1.0/tag';
+
+    // Custom OStatus verbs for the flipside until they're standardized
+    const DELETE     = 'http://ostatus.org/schema/1.0/unfollow';
+    const UNFAVORITE = 'http://ostatus.org/schema/1.0/unfavorite';
+    const UNFOLLOW   = 'http://ostatus.org/schema/1.0/unfollow';
+    const LEAVE      = 'http://ostatus.org/schema/1.0/leave';
 }
 
 /**
diff --git a/plugins/OStatus/lib/hubverifyqueuehandler.php b/plugins/OStatus/lib/hubverifyqueuehandler.php
index 125d13a77..7ce9e1431 100644
--- a/plugins/OStatus/lib/hubverifyqueuehandler.php
+++ b/plugins/OStatus/lib/hubverifyqueuehandler.php
@@ -33,13 +33,14 @@ class HubVerifyQueueHandler extends QueueHandler
     {
         $sub = $data['sub'];
         $mode = $data['mode'];
+        $token = $data['token'];
 
         assert($sub instanceof HubSub);
         assert($mode === 'subscribe' || $mode === 'unsubscribe');
 
         common_log(LOG_INFO, __METHOD__ . ": $mode $sub->callback $sub->topic");
         try {
-            $sub->verify($mode);
+            $sub->verify($mode, $token);
         } catch (Exception $e) {
             common_log(LOG_ERR, "Failed PuSH $mode verify to $sub->callback for $sub->topic: " .
                                 $e->getMessage());