X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Factivity.php;h=e352baf63956880d7e8fc21c1b58736ffaaec42b;hb=0b53b6768e03932f4beec6b6655763e6ecedc36d;hp=a8e6d25af955281c33244ab3be419a38fd73a96b;hpb=29ce5dd19a5f3d395aeddddaab0350f8818199b5;p=quix0rs-gnu-social.git

diff --git a/lib/activity.php b/lib/activity.php
index a8e6d25af9..e352baf639 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -135,6 +135,9 @@ class Activity
         } 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}");
@@ -168,14 +171,22 @@ class Activity
             // 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);
         }
 
@@ -351,24 +362,66 @@ class Activity
         // actor
         $activity['actor'] = $this->actor->asArray();
 
-        // body
-        $activity['body'] = $this->content;
+        // content
+        $activity['content'] = $this->content;
+
+        // generator <-- We could use this when we know a notice is created
+        //               locally. Or if we know the upstream Generator.
 
-        // generator <-- We should use this when we know a notice is created
-        //               locally
+        // icon <-- possibly a mini object representing verb?
 
-        // icon <-- Should we use this? Maybe a little bubble like we have
-        //          on Facebook posts?
+        // id
+        $activity['id'] = $this->id;
 
         // 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),
+                        'deprecated'  => true,
+                    );
+
+                    $activity['location'] = array(
+                        'objectType' => 'place',
+                        'position' => sprintf("%+02.5F%+03.5F/", $loc->lat, $loc->lon),
+                        'lat' => $loc->lat,
+                        'lon' => $loc->lon
+                    );
+
+                    $name = $loc->getName();
+
+                    if ($name) {
+                        $activity['location']['displayName'] = $name;
+                    }
+                    
+                    $url = $loc->getURL();
+
+                    if ($url) {
+                        $activity['location']['url'] = $url;
+                    }
+                }
+
+                $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
+            // attachements property of ActivityObject
 
-            $attachedObjects = array();
+            $attachments = array();
 
             // XXX: OK, this is kinda cheating. We should probably figure out
             // what kind of objects these are based on mime-type and then
@@ -380,11 +433,11 @@ class Activity
 
                 if (is_string($enclosure)) {
 
-                    $attachedObjects[]['id']  = $enclosure;
+                    $attachments[]['id']  = $enclosure;
 
                 } else {
 
-                    $attachedObjects[]['id']  = $enclosure->url;
+                    $attachments[]['id']  = $enclosure->url;
 
                     $mediaLink = new ActivityStreamsMediaLink(
                         $enclosure->url,
@@ -394,29 +447,42 @@ class Activity
                         // XXX: Add 'size' as an extension to MediaLink?
                     );
 
-                    $attachedObjects[]['mediaLink'] = $mediaLink->asArray(); // extension
+                    $attachments[]['mediaLink'] = $mediaLink->asArray(); // extension
 
                     if ($enclosure->title) {
-                        $attachedObjects[]['displayName'] = $enclosure->title;
+                        $attachments[]['displayName'] = $enclosure->title;
                     }
                }
             }
 
-            if (!empty($attachedObjects)) {
-                $activity['object']['attachedObjects'] = $attachedObjects;
+            if (!empty($attachments)) {
+                $activity['object']['attachments'] = $attachments;
             }
 
         } 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?
+        // published
+        $activity['published'] = self::iso8601Date($this->time);
+
+        // provider
+        $provider = array(
+            'objectType' => 'service',
+            'displayName' => common_config('site', 'name'),
+            'url' => common_root_url()
+        );
 
-        // provider <-- We should probably use this for showing the the source
-        //              of remote notices, if known
+        $activity['provider'] = $provider;
 
         // target
         if (!empty($this->target)) {
@@ -426,8 +492,8 @@ 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
         //
@@ -435,8 +501,25 @@ class Activity
         // relative simple name is easier to parse
         $activity['verb'] = substr($this->verb, strrpos($this->verb, '/') + 1);
 
+        // url
+        $activity['url'] = $this->id;
+
         /* 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
         // for the moment.
@@ -447,6 +530,7 @@ class Activity
                 $activity[$objectName] = $props;
             }
         }
+
         return array_filter($activity);
     }
 
@@ -457,7 +541,7 @@ class 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',
@@ -472,9 +556,13 @@ class Activity
             $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);
@@ -506,23 +594,15 @@ class Activity
 
         if ($author) {
             $this->actor->outputTo($xs, 'author');
-
-            // XXX: Remove <activity:actor> 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) {
+        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');
+                }
             }
         }
 
@@ -656,7 +736,7 @@ class Activity
             $xs->element($tag, $attrs, $content);
         }
 
-        $xs->elementEnd('entry');
+        $xs->elementEnd($tag);
 
         return;
     }
@@ -666,11 +746,18 @@ class Activity
         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');
     }
 }