$actorEl = $this->_child($entry, self::ACTOR);
if (!empty($actorEl)) {
+ // Standalone <activity:actor> elements are a holdover from older
+ // versions of ActivityStreams. Newer feeds should have this data
+ // integrated straight into <atom:author>.
$this->actor = new ActivityObject($actorEl);
$this->actor->id = $authorObj->id;
}
}
- } else if (!empty($feed) &&
- $subjectEl = $this->_child($feed, self::SUBJECT)) {
-
- $this->actor = new ActivityObject($subjectEl);
-
} else if ($authorEl = $this->_child($entry, self::AUTHOR, self::ATOM)) {
+ // An <atom:author> in the entry overrides any author info on
+ // the surrounding feed.
$this->actor = new ActivityObject($authorEl);
} else if (!empty($feed) && $authorEl = $this->_child($feed, self::AUTHOR,
self::ATOM)) {
+ // If there's no <atom:author> on the entry, it's safe to assume
+ // the containing feed's authorship info applies.
$this->actor = new ActivityObject($authorEl);
+ } else if (!empty($feed) &&
+ $subjectEl = $this->_child($feed, self::SUBJECT)) {
+
+ // Feed subject is used for things like groups.
+ // Should actually possibly not be interpreted as an actor...?
+ $this->actor = new ActivityObject($subjectEl);
}
$contextEl = $this->_child($entry, self::CONTEXT);
return null;
}
- function asString($namespace=false, $author=true)
+ function asString($namespace=false, $author=true, $source=false)
{
$xs = new XMLStringer(true);
if ($this->verb == ActivityVerb::POST && count($this->objects) == 1) {
$obj = $this->objects[0];
-
- $xs->element('id', null, $obj->id);
- $xs->element('activity:object-type', null, $obj->type);
-
- if (!empty($obj->title)) {
- $xs->element('title', null, $obj->title);
- } else {
- // XXX need a better default title
- $xs->element('title', null, _('Post'));
- }
-
- if (!empty($obj->content)) {
- $xs->element('content', array('type' => 'html'), $obj->content);
- }
-
- if (!empty($obj->summary)) {
- $xs->element('summary', null, $obj->summary);
- }
-
- if (!empty($obj->link)) {
- $xs->element('link', array('rel' => 'alternate',
- 'type' => 'text/html'),
- $obj->link);
- }
-
- // XXX: some object types might have other values here.
+ $obj->outputTo($xs, null);
} else {
$xs->element('id', null, $this->id);
$xs->element('updated', null, $published);
if ($author) {
- $xs->elementStart('author');
- $xs->element('uri', array(), $this->actor->id);
- if ($this->actor->title) {
- $xs->element('name', array(), $this->actor->title);
- }
- $xs->elementEnd('author');
- $xs->raw($this->actor->asString('activity:actor'));
+ $this->actor->outputTo($xs, 'author');
}
if ($this->verb != ActivityVerb::POST || count($this->objects) != 1) {
foreach($this->objects as $object) {
- $xs->raw($object->asString());
+ $object->outputTo($xs, 'activity:object');
}
}
}
if ($this->target) {
- $xs->raw($this->target->asString('activity:target'));
+ $this->target->outputTo($xs, 'activity:target');
}
foreach ($this->categories as $cat) {
- $xs->raw($cat->asString());
+ $cat->outputTo($xs);
}
// can be either URLs or enclosure objects
// Info on the source feed
- if (!empty($this->source)) {
+ if ($source && !empty($this->source)) {
$xs->elementStart('source');
$xs->element('id', null, $this->source->id);
$xs->elementEnd('entry');
- return $xs->getString();
+ $str = $xs->getString();
+
+ return $str;
}
private function _child($element, $tag, $namespace=self::SPEC)