GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
James Walker 2010-08-02 14:06:14 -04:00
parent 517c7483d1
commit e603632f13
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
classes/Notice.php
View File

@ -1330,24 +1330,38 @@ class Notice extends Memcached_DataObject
foreach ($reply_ids as $id) { foreach ($reply_ids as $id) {
$profile = Profile::staticGet('id', $id); $profile = Profile::staticGet('id', $id);
if (!empty($profile)) { if (!empty($profile)) {
// XXX: Deprecate this for 'mentioned'
$xs->element( $xs->element(
'link', array( 'link', array(
'rel' => 'ostatus:attention', 'rel' => 'ostatus:attention',
'href' => $profile->getUri() 'href' => $profile->getUri()
) )
); );
$xs->element(
'link', array(
'rel' => 'mentioned',
'href' => $profile->getUri()
)
);
} }
} }
$groups = $this->getGroups(); $groups = $this->getGroups();
foreach ($groups as $group) { foreach ($groups as $group) {
// XXX: Deprecate this for 'mentioned'
$xs->element( $xs->element(
'link', array( 'link', array(
'rel' => 'ostatus:attention', 'rel' => 'ostatus:attention',
'href' => $group->permalink() 'href' => $group->permalink()
) )
); );
$xs->element(
'link', array(
'rel' => 'mentioned',
'href' => $group->permalink()
)
);
} }
if (!empty($this->repeat_of)) { if (!empty($this->repeat_of)) {

5
lib/activitycontext.php
View File

@ -51,6 +51,7 @@ class ActivityContext
const POINT = 'point'; const POINT = 'point';
const ATTENTION = 'ostatus:attention'; const ATTENTION = 'ostatus:attention';
const MENTIONED = 'mentioned';
const CONVERSATION = 'ostatus:conversation'; const CONVERSATION = 'ostatus:conversation';
function __construct($element) function __construct($element)
@ -76,8 +77,12 @@ class ActivityContext
$linkRel = $link->getAttribute(ActivityUtils::REL); $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) { if ($linkRel == self::ATTENTION) {
$this->attention[] = $link->getAttribute(self::HREF); $this->attention[] = $link->getAttribute(self::HREF);
} else if ($linkRel == self:MENTIONED) {
$this->attention[] = $link->getAttribute(self::HREF);
} }
} }
} }