X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapitimelinegroup.php;h=3fc930fa08664630a01972676875ba7888d5a466;hb=776c2c99ea3cd57866789ca1953f733783adb668;hp=d0af49844c64957dadd3cc0902d192051b9e8088;hpb=097e3f89b630b7a28f27c96f5e9a036df3ed7710;p=quix0rs-gnu-social.git

diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index d0af49844c..3fc930fa08 100644
--- a/actions/apitimelinegroup.php
+++ b/actions/apitimelinegroup.php
@@ -25,7 +25,8 @@
  * @author    Evan Prodromou <evan@status.net>
  * @author    Jeffery To <jeffery.to@gmail.com>
  * @author    Zach Copley <zach@status.net>
- * @copyright 2009 StatusNet, Inc.
+ * @copyright 2009-2010 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -48,10 +49,8 @@ require_once INSTALLDIR . '/lib/apiprivateauth.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class ApiTimelineGroupAction extends ApiPrivateAuthAction
 {
-
     var $group   = null;
     var $notices = null;
 
@@ -63,7 +62,6 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
      * @return boolean success flag
      *
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -82,13 +80,13 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
 
         if (empty($this->group)) {
-            $this->clientError(_('Group not found!'), 404, $this->format);
+            // TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
+            $this->clientError(_('Group not found.'), 404, $this->format);
             return false;
         }
 
@@ -101,87 +99,52 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
      *
      * @return void
      */
-
     function showTimeline()
     {
-        $sitename   = common_config('site', 'name');
-        $avatar     = $this->group->homepage_logo;
-        $title      = sprintf(_("%s timeline"), $this->group->nickname);
+        // We'll pull common formatting out of this for other formats
+        $atom = new AtomGroupNoticeFeed($this->group, $this->auth_user);
 
-        $subtitle   = sprintf(
-            _('Updates from %1$s on %2$s!'),
-            $this->group->nickname,
-            $sitename
-        );
+        $self = $this->getSelfUri();
 
-        $logo = ($avatar) ? $avatar : User_group::defaultLogo(AVATAR_PROFILE_SIZE);
+        $link = common_local_url(
+            'ApiTimelineGroup',
+            array('nickname' => $this->group->nickname)
+        );
 
         switch($this->format) {
         case 'xml':
             $this->showXmlTimeline($this->notices);
             break;
         case 'rss':
-                $this->showRssTimeline(
+            $this->showRssTimeline(
                 $this->notices,
-                $title,
+                $atom->title,
                 $this->group->homeUrl(),
-                $subtitle,
+                $atom->subtitle,
                 null,
-                $logo
+                $atom->logo,
+                $self
             );
             break;
         case 'atom':
-
             header('Content-Type: application/atom+xml; charset=utf-8');
-
-            try {
-
-                $atom = new AtomGroupNoticeFeed($this->group);
-
-                // @todo set all this Atom junk up inside the feed class
-
-                $atom->setId($id);
-                $atom->setTitle($title);
-                $atom->setSubtitle($subtitle);
-                $atom->setLogo($logo);
-                $atom->setUpdated('now');
-
-                $atom->addAuthorRaw($this->group->asAtomAuthor());
-                $atom->setActivitySubject($this->group->asActivitySubject());
-
-                $atom->addLink($this->group->homeUrl());
-
-                $id = $this->arg('id');
-                $aargs = array('format' => 'atom');
-                if (!empty($id)) {
-                    $aargs['id'] = $id;
-                }
-
-                $atom->setId($this->getSelfUri('ApiTimelineGroup', $aargs));
-
-                $atom->addLink(
-                    $this->getSelfUri('ApiTimelineGroup', $aargs),
-                    array('rel' => 'self', 'type' => 'application/atom+xml')
-                );
-
                 $atom->addEntryFromNotices($this->notices);
-
-                //$this->raw($atom->getString());
-                print $atom->getString(); // temp hack until PuSH feeds are redone cleanly
-
-            } catch (Atom10FeedException $e) {
-                $this->serverError(
-                    'Could not generate feed for group - ' . $e->getMessage()
-                );
-                return;
-            }
-
+                $this->raw($atom->getString());
             break;
         case 'json':
             $this->showJsonTimeline($this->notices);
             break;
+        case 'as':
+            header('Content-Type: application/json; charset=utf-8');
+            $doc = new ActivityStreamJSONDocument($this->auth_user);
+            $doc->setTitle($atom->title);
+            $doc->addLink($link, 'alternate', 'text/html');
+            $doc->addItemsFromNotices($this->notices);
+            $this->raw($doc->asString());
+            break;
         default:
             $this->clientError(
+                // TRANS: Client error displayed when trying to handle an unknown API method.
                 _('API method not found.'),
                 404,
                 $this->format
@@ -195,7 +158,6 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
      *
      * @return array notices
      */
-
     function getNotices()
     {
         $notices = array();
@@ -221,7 +183,6 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
      *
      * @return boolean true
      */
-
     function isReadOnly($args)
     {
         return true;
@@ -232,7 +193,6 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
      *
      * @return string datestamp of the latest notice in the stream
      */
-
     function lastModified()
     {
         if (!empty($this->notices) && (count($this->notices) > 0)) {
@@ -250,7 +210,6 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
      *
      * @return string etag
      */
-
     function etag()
     {
         if (!empty($this->notices) && (count($this->notices) > 0)) {
@@ -260,6 +219,7 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
             return '"' . implode(
                 ':',
                 array($this->arg('action'),
+                      common_user_cache_hash($this->auth_user),
                       common_language(),
                       $this->group->id,
                       strtotime($this->notices[0]->created),
@@ -270,5 +230,4 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
 
         return null;
     }
-
 }