From 800484930554781a8646380667521fa5a89f2c6c Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Mon, 21 Oct 2013 18:42:15 +0200 Subject: [PATCH] Removing rel='ostatus:attention' in favor of Salmon's rel='mentioned' This was introduced in StatusNet 0.9.x, which is the oldest branch on the web today as far as I know. --- lib/activity.php | 2 -- lib/activitycontext.php | 7 +------ tests/ActivityGenerationTests.php | 6 ++---- tests/ActivityParseTests.php | 3 +-- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/lib/activity.php b/lib/activity.php index 051993ddff..870ece13ad 100644 --- a/lib/activity.php +++ b/lib/activity.php @@ -627,8 +627,6 @@ class Activity } foreach ($this->context->attention as $attnURI) { - $xs->element('link', array('rel' => ActivityContext::ATTENTION, - 'href' => $attnURI)); $xs->element('link', array('rel' => ActivityContext::MENTIONED, 'href' => $attnURI)); } diff --git a/lib/activitycontext.php b/lib/activitycontext.php index e383b05734..bd5bb5f76e 100644 --- a/lib/activitycontext.php +++ b/lib/activitycontext.php @@ -54,7 +54,6 @@ class ActivityContext const POINT = 'point'; - const ATTENTION = 'ostatus:attention'; const MENTIONED = 'mentioned'; const CONVERSATION = 'ostatus:conversation'; @@ -85,11 +84,7 @@ 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) { - $attention[] = $link->getAttribute(self::HREF); - } elseif ($linkRel == self::MENTIONED) { + if ($linkRel == self::MENTIONED) { $attention[] = $link->getAttribute(self::HREF); } } diff --git a/tests/ActivityGenerationTests.php b/tests/ActivityGenerationTests.php index 30e400e77b..4c4db6148a 100644 --- a/tests/ActivityGenerationTests.php +++ b/tests/ActivityGenerationTests.php @@ -263,7 +263,6 @@ class ActivityGenerationTests extends PHPUnit_Framework_TestCase $element = $this->_entryToElement($entry, true); - $this->assertEquals($this->targetUser1->uri, ActivityUtils::getLink($element, 'ostatus:attention')); $this->assertEquals($this->targetUser1->uri, ActivityUtils::getLink($element, 'mentioned')); } @@ -283,7 +282,7 @@ class ActivityGenerationTests extends PHPUnit_Framework_TestCase $element = $this->_entryToElement($entry, true); - $links = ActivityUtils::getLinks($element, 'ostatus:attention'); + $links = ActivityUtils::getLinks($element, 'mentioned'); $this->assertEquals(2, count($links)); @@ -320,7 +319,6 @@ class ActivityGenerationTests extends PHPUnit_Framework_TestCase $element = $this->_entryToElement($entry, true); - $this->assertEquals($this->targetGroup1->uri, ActivityUtils::getLink($element, 'ostatus:attention')); $this->assertEquals($this->targetGroup1->uri, ActivityUtils::getLink($element, 'mentioned')); } @@ -334,7 +332,7 @@ class ActivityGenerationTests extends PHPUnit_Framework_TestCase $element = $this->_entryToElement($entry, true); - $links = ActivityUtils::getLinks($element, 'ostatus:attention'); + $links = ActivityUtils::getLinks($element, 'mentioned'); $this->assertEquals(2, count($links)); diff --git a/tests/ActivityParseTests.php b/tests/ActivityParseTests.php index 801cc22c26..71b90aadb6 100644 --- a/tests/ActivityParseTests.php +++ b/tests/ActivityParseTests.php @@ -533,7 +533,7 @@ $_example4 = << - + @<span class="vcard"><a href="http://example.net/user/1" class="url"><span class="fn nickname">evan</span></a></span> now is the time for all good men to come to the aid of their country. #<span class="tag"><a href="http://example.net/tag/thetime" rel="tag">thetime</a></span> @@ -910,7 +910,6 @@ $_example10 = << - -- 2.39.5