X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Factivity.php;h=a52f29e9ca64e06bdf317f995f4c597acc20559b;hb=a6e33bdd6a9c44e5fd06af3c3973c0112792d743;hp=12ea53a9fefdc02fddc6257c8876f1693dc66d5b;hpb=c86f0ffa2f7059089910b38aadd2fc018ce6d718;p=quix0rs-gnu-social.git
diff --git a/lib/activity.php b/lib/activity.php
index 12ea53a9fe..a52f29e9ca 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -100,12 +100,13 @@ class Activity
public $title; // title of the activity
public $categories = array(); // list of AtomCategory objects
public $enclosures = array(); // list of enclosure URL references
+ public $attachments = array(); // list of attachments
public $extra = array(); // extra elements as array(tag, attrs, content)
public $source; // ActivitySource object representing 'home feed'
public $selfLink; //
public $editLink; //
-
+ public $generator; // ActivityObject representing the generating application
/**
* Turns a regular old Atom into a magical activity
*
@@ -171,18 +172,15 @@ class Activity
// XXX: do other implied stuff here
}
- $objectEls = $entry->getElementsByTagNameNS(self::SPEC, self::OBJECT);
+ // get immediate object children
- if ($objectEls->length > 0) {
- for ($i = 0; $i < $objectEls->length; $i++) {
- $objectEl = $objectEls->item($i);
- // Only immediate children (don't slurp embedded activities' objects!)
- if ($objectEl->parentNode != $entry) {
- continue;
- }
+ $objectEls = ActivityUtils::children($entry, self::OBJECT, self::SPEC);
+
+ 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) {
+ if ((!empty($objectType) && $objectType == ActivityObject::ACTIVITY) || $this->verb == ActivityVerb::SHARE) {
$this->objects[] = new Activity($objectEl);
} else {
$this->objects[] = new ActivityObject($objectEl);
@@ -246,6 +244,9 @@ class Activity
if (!empty($targetEl)) {
$this->target = new ActivityObject($targetEl);
+ } elseif (ActivityUtils::compareVerbs($this->verb, array(ActivityVerb::FAVORITE))) {
+ // StatusNet didn't send a 'target' for their Favorite atom entries
+ $this->target = clone($this->objects[0]);
}
$this->summary = ActivityUtils::childContent($entry, 'summary');
@@ -266,7 +267,7 @@ class Activity
// From APP. Might be useful.
- $this->selfLink = ActivityUtils::getLink($entry, 'self', 'application/atom+xml');
+ $this->selfLink = ActivityUtils::getSelfLink($entry);
$this->editLink = ActivityUtils::getLink($entry, 'edit', 'application/atom+xml');
}
@@ -365,97 +366,100 @@ class Activity
// actor
$activity['actor'] = $this->actor->asArray();
- // body
- $activity['body'] = $this->content;
-
- // generator <-- We could use this when we know a notice is created
- // locally. Or if we know the upstream Generator.
+ // content
+ $activity['content'] = $this->content;
- // icon <-- I've decided to use the posting user's stream avatar here
- // for now (also included in the avatarLinks extension)
+ // generator
+ if (!empty($this->generator)) {
+ $activity['generator'] = $this->generator->asArray();
+ }
- // object
- if ($this->verb == ActivityVerb::POST && count($this->objects) == 1) {
- $activity['object'] = $this->objects[0]->asArray();
+ // icon <-- possibly a mini object representing verb?
- // Context stuff. For now I'm just sticking most of it
- // in a property called "context"
+ // id
+ $activity['id'] = $this->id;
- if (!empty($this->context)) {
+ // object
- if (!empty($this->context->location)) {
- $loc = $this->context->location;
+ if (count($this->objects) == 0) {
+ common_log(LOG_ERR, "Can't save " . $this->id);
+ } else {
+ if (count($this->objects) > 1) {
+ common_log(LOG_WARNING, "Ignoring " . (count($this->objects) - 1) . " extra objects in JSON output for activity " . $this->id);
+ }
+ $object = $this->objects[0];
+
+ if ($object instanceof Activity) {
+ // Sharing a post activity is more like sharing the original object
+ if (ActivityVerb::canonical($this->verb) == ActivityVerb::canonical(ActivityVerb::SHARE) &&
+ ActivityVerb::canonical($object->verb) == ActivityVerb::canonical(ActivityVerb::POST)) {
+ // XXX: Here's one for the obfuscation record books
+ $object = $object->objects[0];
+ }
+ }
- // GeoJSON
+ $activity['object'] = $object->asArray();
- $activity['geopoint'] = array(
- 'type' => 'Point',
- 'coordinates' => array($loc->lat, $loc->lon)
- );
+ if ($object instanceof Activity) {
+ $activity['object']['objectType'] = 'activity';
+ }
+ foreach ($this->attachments as $attachment) {
+ if (empty($activity['object']['attachments'])) {
+ $activity['object']['attachments'] = array();
}
-
- $activity['to'] = $this->context->getToArray();
- $activity['context'] = $this->context->asArray();
+ $activity['object']['attachments'][] = $attachment->asArray();
}
+ }
+
+ // Context stuff.
- // 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.
+ if (!empty($this->context)) {
- foreach ($this->enclosures as $enclosure) {
+ if (!empty($this->context->location)) {
+ $loc = $this->context->location;
- if (is_string($enclosure)) {
+ $activity['location'] = array(
+ 'objectType' => 'place',
+ 'position' => sprintf("%+02.5F%+03.5F/", $loc->lat, $loc->lon),
+ 'lat' => $loc->lat,
+ 'lon' => $loc->lon
+ );
- $attachedObjects[]['id'] = $enclosure;
+ $name = $loc->getName();
- } else {
+ if ($name) {
+ $activity['location']['displayName'] = $name;
+ }
+
+ $url = $loc->getURL();
- $attachedObjects[]['id'] = $enclosure->url;
+ if ($url) {
+ $activity['location']['url'] = $url;
+ }
+ }
- $mediaLink = new ActivityStreamsMediaLink(
- $enclosure->url,
- null,
- null,
- $enclosure->mimetype
- // XXX: Add 'size' as an extension to MediaLink?
- );
+ $activity['to'] = $this->context->getToArray();
- $attachedObjects[]['mediaLink'] = $mediaLink->asArray(); // extension
+ $ctxarr = $this->context->asArray();
- if ($enclosure->title) {
- $attachedObjects[]['displayName'] = $enclosure->title;
- }
- }
+ if (array_key_exists('inReplyTo', $ctxarr)) {
+ $activity['object']['inReplyTo'] = $ctxarr['inReplyTo'];
+ unset($ctxarr['inReplyTo']);
}
- if (!empty($attachedObjects)) {
- $activity['object']['attachedObjects'] = $attachedObjects;
+ if (!array_key_exists('status_net', $activity)) {
+ $activity['status_net'] = array();
}
- } else {
- $activity['object'] = array();
- foreach($this->objects as $object) {
- $oa = $object->asArray();
- if ($object instanceof Activity) {
- // throw in a type
- // XXX: hackety-hack
- $oa['objectType'] = 'activity';
- }
- $activity['object'][] = $oa;
+ foreach ($ctxarr as $key => $value) {
+ $activity['status_net'][$key] = $value;
}
}
- $activity['postedTime'] = self::iso8601Date($this->time); // Change to exactly be RFC3339?
+ // published
+ $activity['published'] = self::iso8601Date($this->time);
// provider
$provider = array(
@@ -474,25 +478,33 @@ class Activity
// title
$activity['title'] = $this->title;
- // updatedTime <-- Should we use this to indicate the time we received
- // a remote notice? Probably not.
+ // updated <-- Optional. Should we use this to indicate the time we r
+ // eceived a remote notice? Probably not.
// 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();
+ $activity['verb'] = ActivityVerb::canonical($this->verb);
- // Use an Activity Object for term? Which object? Note?
- foreach ($this->categories as $cat) {
- $tags[] = $cat->term;
+ // url
+ if ($this->link) {
+ $activity['url'] = $this->link;
}
- $activity['tags'] = $tags;
+ /* Purely extensions hereafter */
+
+ if ($activity['verb'] == 'post') {
+ $tags = array();
+ foreach ($this->categories as $cat) {
+ if (mb_strlen($cat->term) > 0) {
+ // Couldn't figure out which object type to use, so...
+ $tags[] = array('objectType' => 'http://activityschema.org/object/hashtag',
+ 'displayName' => $cat->term);
+ }
+ }
+ if (count($tags) > 0) {
+ $activity['object']['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
@@ -501,7 +513,15 @@ class Activity
foreach ($this->extra as $e) {
list($objectName, $props, $txt) = $e;
if (!empty($objectName)) {
- $activity[$objectName] = $props;
+ $parts = explode(":", $objectName);
+ if (count($parts) == 2 && $parts[0] == "statusnet") {
+ if (!array_key_exists('status_net', $activity)) {
+ $activity['status_net'] = array();
+ }
+ $activity['status_net'][$parts[1]] = $props;
+ } else {
+ $activity[$objectName] = $props;
+ }
}
}
@@ -543,7 +563,13 @@ class Activity
} else {
$xs->element('id', null, $this->id);
- $xs->element('title', null, $this->title);
+
+ if ($this->title) {
+ $xs->element('title', null, $this->title);
+ } else {
+ // Require element
+ $xs->element('title', null, "");
+ }
$xs->element('content', array('type' => 'html'), $this->content);
@@ -553,8 +579,8 @@ class Activity
if (!empty($this->link)) {
$xs->element('link', array('rel' => 'alternate',
- 'type' => 'text/html'),
- $this->link);
+ 'type' => 'text/html',
+ 'href' => $this->link));
}
}
@@ -568,18 +594,6 @@ class Activity
if ($author) {
$this->actor->outputTo($xs, 'author');
-
- // XXX: Remove ASAP! Author information
- // has been moved to the author element in the Activity
- // Streams spec. We're outputting actor only for backward
- // compatibility with clients that can only parse
- // activities based on older versions of the spec.
-
- $depMsg = 'Deprecation warning: activity:actor is present '
- . 'only for backward compatibility. It will be '
- . 'removed in the next version of StatusNet.';
- $xs->comment($depMsg);
- $this->actor->outputTo($xs, 'activity:actor');
}
if ($this->verb != ActivityVerb::POST || count($this->objects) != 1 || $tag != 'entry') {
@@ -611,28 +625,33 @@ class Activity
}
if (!empty($this->context->conversation)) {
- $xs->element('link', array('rel' => 'ostatus:conversation',
- 'href' => $this->context->conversation));
+ $convattr = [];
+ $conv = Conversation::getKV('uri', $this->context->conversation);
+ if ($conv instanceof Conversation) {
+ $convattr['href'] = $conv->getUrl();
+ $convattr['local_id'] = $conv->getID();
+ $convattr['ref'] = $conv->getUri();
+ $xs->element('link', array('rel' => ActivityContext::CONVERSATION,
+ 'href' => $convattr['href']));
+ } else {
+ $convattr['ref'] = $this->context->conversation;
+ }
+ $xs->element(ActivityContext::CONVERSATION,
+ $convattr,
+ $this->context->conversation);
+ /* Since we use XMLWriter we just use the previously hardcoded prefix for ostatus,
+ otherwise we should use something like this:
+ $xs->elementNS(array(ActivityContext::OSTATUS => 'ostatus'), // namespace
+ 'conversation', // tag (or the element name from ActivityContext::CONVERSATION)
+ null, // attributes
+ $this->context->conversation); // content
+ */
}
- foreach ($this->context->attention as $attnURI) {
- $xs->element('link', array('rel' => 'ostatus:attention',
+ foreach ($this->context->attention as $attnURI=>$type) {
+ $xs->element('link', array('rel' => ActivityContext::MENTIONED,
+ ActivityContext::OBJECTTYPE => $type, // FIXME: undocumented
'href' => $attnURI));
- $xs->element('link', array('rel' => 'mentioned',
- 'href' => $attnURI));
- }
-
- // XXX: shoulda used ActivityVerb::SHARE
-
- if (!empty($this->context->forwardID)) {
- if (!empty($this->context->forwardUrl)) {
- $xs->element('ostatus:forward',
- array('ref' => $this->context->forwardID,
- 'href' => $this->context->forwardUrl));
- } else {
- $xs->element('ostatus:forward',
- array('ref' => $this->context->forwardID));
- }
}
if (!empty($this->context->location)) {