eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Better job making an ActivityObject from an <atom:author>

Browse Source
This commit is contained in:
Evan Prodromou 2010-12-27 10:19:51 -08:00
parent ab92496ddc
commit c78170a275
1 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
lib/activityobject.php
View File

@ -172,10 +172,39 @@ class ActivityObject
private function _fromAuthor($element) private function _fromAuthor($element)
{ {
$this->type = self::PERSON; // XXX: is this fair? $this->type = $this->_childContent($element,
$this->title = $this->_childContent($element, self::NAME); Activity::OBJECTTYPE,
Activity::SPEC);
$this->id = $this->_childContent($element, self::URI); if (empty($this->type)) {
$this->type = self::PERSON; // XXX: is this fair?
}
// start with <atom:title>
$title = ActivityUtils::childHtmlContent($element, self::TITLE);
if (!empty($title)) {
$this->title = html_entity_decode(strip_tags($title), ENT_QUOTES, 'UTF-8');
}
// fall back to <atom:name>
if (empty($this->title)) {
$this->title = $this->_childContent($element, self::NAME);
}
// start with <atom:id>
$this->id = $this->_childContent($element, self::ID);
// fall back to <atom:uri>
if (empty($this->id)) {
$this->id = $this->_childContent($element, self::URI);
}
// fall further back to <atom:email>
if (empty($this->id)) { if (empty($this->id)) {
$email = $this->_childContent($element, self::EMAIL); $email = $this->_childContent($element, self::EMAIL);
@ -184,6 +213,14 @@ class ActivityObject
$this->id = 'mailto:'.$email; $this->id = 'mailto:'.$email;
} }
} }
$this->link = ActivityUtils::getPermalink($element);
// fall finally back to <link rel=alternate>
if (empty($this->id) && !empty($this->link)) { // fallback if there's no ID
$this->id = $this->link;
}
} }
private function _fromAtomEntry($element) private function _fromAtomEntry($element)