activity notification in Ostatus_profile

diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index d9cb7a6e1be704a0ef302ebe0c4aa5f22d2b43bc..55f347a02904e47d3c6a7ccc8a96b278d4c648ff 100644 (file)
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -305,9 +305,9 @@ class Ostatus_profile extends Memcached_DataObject
      * Send an Activity Streams notification to the remote Salmon endpoint,
      * if so configured.
      *
-     * @param Profile $actor
-     * @param $verb eg Activity::SUBSCRIBE or Activity::JOIN
-     * @param string $object object of the action; if null, the remote entity itself is assumed
+     * @param Profile $actor  Actor who did the activity
+     * @param string  $verb   Activity::SUBSCRIBE or Activity::JOIN
+     * @param Object  $object object of the action; must define asActivityNoun($tag)
      */
     public function notify($actor, $verb, $object=null)
     {
@@ -322,11 +322,12 @@ class Ostatus_profile extends Memcached_DataObject
             $object = $this;
         }
         if ($this->salmonuri) {
-            $text = 'update'; // @fixme
-            $id = 'tag:' . common_config('site', 'server') .
-                ':' . $verb .
-                ':' . $actor->id .
-                ':' . time(); // @fixme
+
+            $text = 'update';
+            $id = TagURI::mint('%s:%s:%s',
+                               $verb,
+                               $actor->getURI(),
+                               common_date_iso8601(date()));
 
             // @fixme consolidate all these NS settings somewhere
             $attributes = array('xmlns' => Activity::ATOM,
@@ -356,6 +357,20 @@ class Ostatus_profile extends Memcached_DataObject
         }
     }
 
+    public function notifyActivity($activity)
+    {
+        if ($this->salmonuri) {
+
+            $xml = $activity->asString();
+
+            $salmon = new Salmon(); // ?
+
+            $salmon->post($this->salmonuri, $xml);
+        }
+
+        return;
+    }
+
     function getBestName()
     {
         if ($this->isGroup()) {