add support for Salmon's new "mentioned" rel value

2 files changed, 19 insertions, 0 deletions

diff --git a/classes/Notice.php b/classes/Notice.php
index 3297c7a59..399879e79 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1330,24 +1330,38 @@ class Notice extends Memcached_DataObject
         foreach ($reply_ids as $id) {
             $profile = Profile::staticGet('id', $id);
            if (!empty($profile)) {
+               // XXX: Deprecate this for 'mentioned'
                 $xs->element(
                     'link', array(
                         'rel' => 'ostatus:attention',
                         'href' => $profile->getUri()
                     )
                 );
+                $xs->element(
+                    'link', array(
+                        'rel' => 'mentioned',
+                        'href' => $profile->getUri()
+                    )
+                );
             }
         }
 
         $groups = $this->getGroups();
 
         foreach ($groups as $group) {
+            // XXX: Deprecate this for 'mentioned'
             $xs->element(
                 'link', array(
                     'rel' => 'ostatus:attention',
                     'href' => $group->permalink()
                 )
             );
+            $xs->element(
+                'link', array(
+                    'rel' => 'mentioned',
+                    'href' => $group->permalink()
+                )
+            );
         }
 
         if (!empty($this->repeat_of)) {
diff --git a/lib/activitycontext.php b/lib/activitycontext.php
index 2df7613f7..4e97b2ab9 100644
--- a/lib/activitycontext.php
+++ b/lib/activitycontext.php
@@ -51,6 +51,7 @@ class ActivityContext
     const POINT     = 'point';
 
     const ATTENTION    = 'ostatus:attention';
+    const MENTIONED    = 'mentioned';
     const CONVERSATION = 'ostatus:conversation';
 
     function __construct($element)
@@ -76,8 +77,12 @@ class ActivityContext
 
             $linkRel = $link->getAttribute(ActivityUtils::REL);
 
+            // XXX: Deprecate this in favour of "mentioned" from Salmon spec
+            // http://salmon-protocol.googlecode.com/svn/trunk/draft-panzer-salmon-00.html#SALR
             if ($linkRel == self::ATTENTION) {
                 $this->attention[] = $link->getAttribute(self::HREF);
+            } else if ($linkRel == self:MENTIONED) {
+                $this->attention[] = $link->getAttribute(self::HREF);
             }
         }
     }