} else if ($entry->namespaceURI == Activity::RSS &&
$entry->localName == 'item') {
$this->_fromRssItem($entry, $feed);
+ } else if ($entry->namespaceURI == Activity::SPEC &&
+ $entry->localName == 'object') {
+ $this->_fromAtomEntry($entry, $feed);
} else {
// Low level exception. No need for i18n.
throw new Exception("Unknown DOM element: {$entry->namespaceURI} {$entry->localName}");
// XXX: do other implied stuff here
}
- $objectEls = $entry->getElementsByTagNameNS(self::SPEC, self::OBJECT);
+ // get immediate object children
+
+ $objectEls = ActivityUtils::children($entry, self::OBJECT, self::SPEC);
- if ($objectEls->length > 0) {
- for ($i = 0; $i < $objectEls->length; $i++) {
- $objectEl = $objectEls->item($i);
- $this->objects[] = new ActivityObject($objectEl);
+ if (count($objectEls) > 0) {
+ foreach ($objectEls as $objectEl) {
+ // Special case for embedded activities
+ $objectType = ActivityUtils::childContent($objectEl, self::OBJECTTYPE, self::SPEC);
+ if (!empty($objectType) && $objectType == ActivityObject::ACTIVITY) {
+ $this->objects[] = new Activity($objectEl);
+ } else {
+ $this->objects[] = new ActivityObject($objectEl);
+ }
}
} else {
+ // XXX: really?
$this->objects[] = new ActivityObject($entry);
}
// body
$activity['body'] = $this->content;
- // generator <--- might be useful; might be too much junk
+ // generator <-- We could use this when we know a notice is created
+ // locally. Or if we know the upstream Generator.
+
+ // icon <-- I've decided to use the posting user's stream avatar here
+ // for now (also included in the avatarLinks extension)
- // icon <-- should we use this?
// object
if ($this->verb == ActivityVerb::POST && count($this->objects) == 1) {
$activity['object'] = $this->objects[0]->asArray();
+
+ // Context stuff. For now I'm just sticking most of it
+ // in a property called "context"
+
+ if (!empty($this->context)) {
+
+ if (!empty($this->context->location)) {
+ $loc = $this->context->location;
+
+ // GeoJSON
+
+ $activity['geopoint'] = array(
+ 'type' => 'Point',
+ 'coordinates' => array($loc->lat, $loc->lon)
+ );
+
+ }
+
+ $activity['to'] = $this->context->getToArray();
+ $activity['context'] = $this->context->asArray();
+ }
+
+ // Instead of adding enclosures as an extension to JSON
+ // Activities, it seems like we should be using the
+ // attachedObjects property of ActivityObject
+
+ $attachedObjects = array();
+
+ // XXX: OK, this is kinda cheating. We should probably figure out
+ // what kind of objects these are based on mime-type and then
+ // create specific object types. Right now this rely on
+ // duck-typing. Also, we should include an embed code for
+ // video attachments.
+
+ foreach ($this->enclosures as $enclosure) {
+
+ if (is_string($enclosure)) {
+
+ $attachedObjects[]['id'] = $enclosure;
+
+ } else {
+
+ $attachedObjects[]['id'] = $enclosure->url;
+
+ $mediaLink = new ActivityStreamsMediaLink(
+ $enclosure->url,
+ null,
+ null,
+ $enclosure->mimetype
+ // XXX: Add 'size' as an extension to MediaLink?
+ );
+
+ $attachedObjects[]['mediaLink'] = $mediaLink->asArray(); // extension
+
+ if ($enclosure->title) {
+ $attachedObjects[]['displayName'] = $enclosure->title;
+ }
+ }
+ }
+
+ if (!empty($attachedObjects)) {
+ $activity['object']['attachedObjects'] = $attachedObjects;
+ }
+
} else {
$activity['object'] = array();
foreach($this->objects as $object) {
- $activity['object'][] = $object->asArray();
+ $oa = $object->asArray();
+ if ($object instanceof Activity) {
+ // throw in a type
+ // XXX: hackety-hack
+ $oa['objectType'] = 'activity';
+ }
+ $activity['object'][] = $oa;
}
}
$activity['postedTime'] = self::iso8601Date($this->time); // Change to exactly be RFC3339?
- // provider <--- again not sure we should use this
+ // provider
+ $provider = array(
+ 'objectType' => 'service',
+ 'displayName' => common_config('site', 'name'),
+ 'url' => common_root_url()
+ );
+
+ $activity['provider'] = $provider;
// target
if (!empty($this->target)) {
// title
$activity['title'] = $this->title;
- // updatedTime <-- should we use? spec says activity MAY have this
+ // updatedTime <-- Should we use this to indicate the time we received
+ // a remote notice? Probably not.
// verb
- $activity['verb'] = $this->verb;
+ //
+ // We can probably use the whole schema URL here but probably the
+ // relative simple name is easier to parse
+ $activity['verb'] = substr($this->verb, strrpos($this->verb, '/') + 1);
+
+ /* Purely extensions hereafter */
+
+ $tags = array();
+
+ // Use an Activity Object for term? Which object? Note?
+ foreach ($this->categories as $cat) {
+ $tags[] = $cat->term;
+ }
- // TODO: extensions (ActivityContext, OStatus stuff, etc.)
+ $activity['tags'] = $tags;
+
+ // XXX: a bit of a hack... Since JSON isn't namespaced we probably
+ // shouldn't be using 'statusnet:notice_info', but this will work
+ // for the moment.
+
+ foreach ($this->extra as $e) {
+ list($objectName, $props, $txt) = $e;
+ if (!empty($objectName)) {
+ $activity[$objectName] = $props;
+ }
+ }
return array_filter($activity);
}
return $xs->getString();
}
- function outputTo($xs, $namespace=false, $author=true, $source=false)
+ function outputTo($xs, $namespace=false, $author=true, $source=false, $tag='entry')
{
if ($namespace) {
$attrs = array('xmlns' => 'http://www.w3.org/2005/Atom',
$attrs = array();
}
- $xs->elementStart('entry', $attrs);
+ $xs->elementStart($tag, $attrs);
- if ($this->verb == ActivityVerb::POST && count($this->objects) == 1) {
+ if ($tag != 'entry') {
+ $xs->element('activity:object-type', null, ActivityObject::ACTIVITY);
+ }
+
+ if ($this->verb == ActivityVerb::POST && count($this->objects) == 1 && $tag == 'entry') {
$obj = $this->objects[0];
$obj->outputTo($xs, null);
$this->actor->outputTo($xs, 'activity:actor');
}
- if ($this->verb != ActivityVerb::POST || count($this->objects) != 1) {
+ if ($this->verb != ActivityVerb::POST || count($this->objects) != 1 || $tag != 'entry') {
foreach($this->objects as $object) {
- $object->outputTo($xs, 'activity:object');
+ if ($object instanceof Activity) {
+ $object->outputTo($xs, false, true, true, 'activity:object');
+ } else {
+ $object->outputTo($xs, 'activity:object');
+ }
}
}
$xs->element($tag, $attrs, $content);
}
- $xs->elementEnd('entry');
+ $xs->elementEnd($tag);
return;
}
return ActivityUtils::child($element, $tag, $namespace);
}
+ /**
+ * For consistency, we'll always output UTC rather than local time.
+ * Note that clients *should* accept any timezone we give them as long
+ * as it's properly formatted.
+ *
+ * @param int $tm Unix timestamp
+ * @return string
+ */
static function iso8601Date($tm)
{
$dateStr = date('d F Y H:i:s', $tm);
$d = new DateTime($dateStr, new DateTimeZone('UTC'));
- $d->setTimezone(new DateTimeZone(common_timezone()));
return $d->format('c');
}
}