X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Factivity.php;h=3458c76b9a6d3ef61f33659abde74011d226a61d;hb=9a6ceb3303a98d1c5fba3587f32d0377e55062cc;hp=8e2da99bb3afe46cb559a97178bc9e970178b86d;hpb=53f14ddde6d3c48063c2419916f6961580bb66c3;p=quix0rs-gnu-social.git

diff --git a/lib/activity.php b/lib/activity.php
index 8e2da99bb3..3458c76b9a 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -48,7 +48,6 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
  * @link      http://status.net/
  */
-
 class Activity
 {
     const SPEC   = 'http://activitystrea.ms/spec/1.0/';
@@ -102,13 +101,17 @@ class Activity
     public $categories = array(); // list of AtomCategory objects
     public $enclosures = array(); // list of enclosure URL references
 
+    public $extra = array(); // extra elements as array(tag, attrs, content)
+    public $source;  // ActivitySource object representing 'home feed'
+    public $selfLink; // <link rel='self' type='application/atom+xml'>
+    public $editLink; // <link rel='edit' type='application/atom+xml'>
+
     /**
      * Turns a regular old Atom <entry> into a magical activity
      *
      * @param DOMElement $entry Atom entry to poke at
      * @param DOMElement $feed  Atom feed, for context
      */
-
     function __construct($entry = null, $feed = null)
     {
         if (is_null($entry)) {
@@ -133,6 +136,7 @@ class Activity
                    $entry->localName == 'item') {
             $this->_fromRssItem($entry, $feed);
         } else {
+            // Low level exception. No need for i18n.
             throw new Exception("Unknown DOM element: {$entry->namespaceURI} {$entry->localName}");
         }
     }
@@ -236,6 +240,11 @@ class Activity
         foreach (ActivityUtils::getLinks($entry, 'enclosure') as $link) {
             $this->enclosures[] = $link->getAttribute('href');
         }
+
+        // From APP. Might be useful.
+
+        $this->selfLink = ActivityUtils::getLink($entry, 'self', 'application/atom+xml');
+        $this->editLink = ActivityUtils::getLink($entry, 'edit', 'application/atom+xml');
     }
 
     function _fromRssItem($item, $channel)
@@ -313,78 +322,223 @@ class Activity
      *
      * @return DOMElement Atom entry
      */
-
     function toAtomEntry()
     {
         return null;
     }
 
-    function asString($namespace=false)
+    function asString($namespace=false, $author=true, $source=false)
     {
         $xs = new XMLStringer(true);
 
         if ($namespace) {
             $attrs = array('xmlns' => 'http://www.w3.org/2005/Atom',
+                           'xmlns:thr' => 'http://purl.org/syndication/thread/1.0',
                            'xmlns:activity' => 'http://activitystrea.ms/spec/1.0/',
                            'xmlns:georss' => 'http://www.georss.org/georss',
                            'xmlns:ostatus' => 'http://ostatus.org/schema/1.0',
                            'xmlns:poco' => 'http://portablecontacts.net/spec/1.0',
-                           'xmlns:media' => 'http://purl.org/syndication/atommedia');
+                           'xmlns:media' => 'http://purl.org/syndication/atommedia',
+                           'xmlns:statusnet' => 'http://status.net/schema/api/1/');
         } else {
             $attrs = array();
         }
 
         $xs->elementStart('entry', $attrs);
 
-        $xs->element('id', null, $this->id);
-        $xs->element('title', null, $this->title);
-        $xs->element('published', null, common_date_iso8601($this->time));
-        $xs->element('content', array('type' => 'html'), $this->content);
+        if ($this->verb == ActivityVerb::POST && count($this->objects) == 1) {
 
-        if (!empty($this->summary)) {
-            $xs->element('summary', null, $this->summary);
-        }
+            $obj = $this->objects[0];
+			$obj->outputTo($xs, null);
 
-        if (!empty($this->link)) {
-            $xs->element('link', array('rel' => 'alternate',
-                                       'type' => 'text/html'),
-                         $this->link);
-        }
+        } else {
+            $xs->element('id', null, $this->id);
+            $xs->element('title', null, $this->title);
 
-        // XXX: add context
+            $xs->element('content', array('type' => 'html'), $this->content);
+            
+            if (!empty($this->summary)) {
+                $xs->element('summary', null, $this->summary);
+            }
+            
+            if (!empty($this->link)) {
+                $xs->element('link', array('rel' => 'alternate',
+                                           'type' => 'text/html'),
+                             $this->link);
+            }
 
-        $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'));
 
         $xs->element('activity:verb', null, $this->verb);
 
-        if (!empty($this->objects)) {
+        $published = self::iso8601Date($this->time);
+            
+        $xs->element('published', null, $published);
+        $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');
+            $this->actor->outputTo($xs, 'activity:actor');
+        }
+
+        if ($this->verb != ActivityVerb::POST || count($this->objects) != 1) {
             foreach($this->objects as $object) {
-                $xs->raw($object->asString());
+                $object->outputTo($xs, 'activity:object');
+            }
+        }
+
+        if (!empty($this->context)) {
+
+            if (!empty($this->context->replyToID)) {
+                if (!empty($this->context->replyToUrl)) {
+                    $xs->element('thr:in-reply-to',
+                                 array('ref' => $this->context->replyToID,
+                                       'href' => $this->context->replyToUrl));
+                } else {
+                    $xs->element('thr:in-reply-to',
+                                 array('ref' => $this->context->replyToID));
+                }
+            }
+
+            if (!empty($this->context->replyToUrl)) {
+                $xs->element('link', array('rel' => 'related',
+                                           'href' => $this->context->replyToUrl));
+            }
+
+            if (!empty($this->context->conversation)) {
+                $xs->element('link', array('rel' => 'ostatus:conversation',
+                                           'href' => $this->context->conversation));
+            }
+
+            foreach ($this->context->attention as $attnURI) {
+                $xs->element('link', array('rel' => 'ostatus:attention',
+                                           '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)) {
+                $loc = $this->context->location;
+                $xs->element('georss:point', null, $loc->lat . ' ' . $loc->lon);
             }
         }
 
         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());
         }
 
+        // can be either URLs or enclosure objects
+        
+        foreach ($this->enclosures as $enclosure) {
+            if (is_string($enclosure)) {
+                $xs->element('link', array('rel' => 'enclosure',
+                                           'href' => $enclosure));
+            } else {
+                $attributes = array('rel' => 'enclosure',
+                                    'href' => $enclosure->url,
+                                    'type' => $enclosure->mimetype,
+                                    'length' => $enclosure->size);
+                if ($enclosure->title) {
+                    $attributes['title'] = $enclosure->title;
+                }
+                $xs->element('link', $attributes);
+            }
+        }
+
+        // Info on the source feed
+
+        if ($source && !empty($this->source)) {
+            $xs->elementStart('source');
+	    
+            $xs->element('id', null, $this->source->id);
+            $xs->element('title', null, $this->source->title);
+
+            if (array_key_exists('alternate', $this->source->links)) {
+                $xs->element('link', array('rel' => 'alternate',
+                                           'type' => 'text/html',
+                                           'href' => $this->source->links['alternate']));
+            }
+	    
+            if (array_key_exists('self', $this->source->links)) {
+                $xs->element('link', array('rel' => 'self',
+                                           'type' => 'application/atom+xml',
+                                           'href' => $this->source->links['self']));
+            }
+
+            if (array_key_exists('license', $this->source->links)) {
+                $xs->element('link', array('rel' => 'license',
+                                           'href' => $this->source->links['license']));
+            }
+
+            if (!empty($this->source->icon)) {
+                $xs->element('icon', null, $this->source->icon);
+            }
+
+            if (!empty($this->source->updated)) {
+                $xs->element('updated', null, $this->source->updated);
+            }
+	    
+            $xs->elementEnd('source');
+        }
+
+        if (!empty($this->selfLink)) {
+            $xs->element('link', array('rel' => 'self',
+                                       'type' => 'application/atom+xml',
+                                       'href' => $this->selfLink));
+        }
+
+        if (!empty($this->editLink)) {
+            $xs->element('link', array('rel' => 'edit',
+                                       'type' => 'application/atom+xml',
+                                       'href' => $this->editLink));
+        }
+
+        // For throwing in extra elements; used for statusnet:notice_info
+	
+        foreach ($this->extra as $el) {
+            list($tag, $attrs, $content) = $el;
+            $xs->element($tag, $attrs, $content);
+        }
+
         $xs->elementEnd('entry');
 
-        return $xs->getString();
+        $str = $xs->getString();
+	
+        return $str;
     }
 
     private function _child($element, $tag, $namespace=self::SPEC)
     {
         return ActivityUtils::child($element, $tag, $namespace);
     }
-}
 
+    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');
+    }
+}