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

Bookmark:addNew did not add a proper rel=related

Browse Source
This commit is contained in:
Mikael Nordfeldth 2015-10-13 12:31:35 +02:00
parent 3f4d4cb7a0
commit c8a907c828
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/ActivityVerbPost/ActivityVerbPostPlugin.php
View File

@ -114,7 +114,7 @@ class ActivityVerbPostPlugin extends ActivityVerbHandlerPlugin
protected function doActionPost(ManagedAction $action, $verb, Notice $target, Profile $scoped)
{
// handle repeat POST
// handle POST
}
protected function getActivityForm(ManagedAction $action, $verb, Notice $target, Profile $scoped)

23
plugins/Bookmark/classes/Bookmark.php
View File

@ -159,15 +159,26 @@ class Bookmark extends Managed_DataObject
*/
static function saveActivityObject(ActivityObject $actobj, Notice $stored)
{
$relLinkEls = ActivityUtils::getLinks($actobj->element, 'related');
if (count($relLinkEls) !== 1) {
common_debug('saving bookmark activity object: '.var_export($actobj,true));
$url = null;
// each extra element is array('tagname', array('attr'=>'val', ...), 'content')
foreach ($actobj->extra as $extra) {
common_debug('bookmark extra: '.var_export($extra,true));
if ($extra[1]['rel'] !== 'related') {
continue;
}
if ($url===null && strlen($extra[1]['href'])>0) {
$url = $extra[1]['href'];
} elseif ($url !== null) {
// TRANS: Client exception thrown when a bookmark is formatted incorrectly.
throw new ClientException(sprintf(_m('Expected exactly 1 link rel=related in a Bookmark, got %1$d.'), count($relLinkEls)));
}
}
if (is_null($url)) {
// TRANS: Client exception thrown when a bookmark is formatted incorrectly.
throw new ClientException(sprintf(_m('Expected exactly 1 link rel=related in a Bookmark, got %1$d.'), count($relLinkEls)));
}
$url = $relLinkEls[0]->getAttribute('href');
if (!strlen($actobj->title)) {
throw new ClientException(_m('You must provide a non-empty title.'));
}
@ -279,7 +290,7 @@ class Bookmark extends Managed_DataObject
$actobj->type = ActivityObject::BOOKMARK;
$actobj->title = $title;
$actobj->summary = $description;
$actobj->extra[] = array('link', $attrs, null);
$actobj->extra[] = array('link', array('rel'=>'related', 'href'=>$url), null);
$act->objects[] = $actobj;
$act->enclosures[] = $url;