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

diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index 5d05429185..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/
  */
@@ -34,7 +35,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/api.php';
+require_once INSTALLDIR . '/lib/apiprivateauth.php';
 
 /**
  * Returns the most recent notices (default 20) posted to the group specified by ID
@@ -48,10 +49,8 @@ require_once INSTALLDIR . '/lib/api.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 ApiAction
+class ApiTimelineGroupAction extends ApiPrivateAuthAction
 {
-
     var $group   = null;
     var $notices = null;
 
@@ -63,13 +62,11 @@ class ApiTimelineGroupAction extends ApiAction
      * @return boolean success flag
      *
      */
-
     function prepare($args)
     {
         parent::prepare($args);
 
         $this->group   = $this->getTargetGroup($this->arg('id'));
-        $this->notices = $this->getNotices();
 
         return true;
     }
@@ -83,10 +80,17 @@ class ApiTimelineGroupAction extends ApiAction
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
+
+        if (empty($this->group)) {
+            // 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;
+        }
+
+        $this->notices = $this->getNotices();
         $this->showTimeline();
     }
 
@@ -95,50 +99,53 @@ class ApiTimelineGroupAction extends ApiAction
      *
      * @return void
      */
-
     function showTimeline()
     {
-        $sitename   = common_config('site', 'name');
-        $title      = sprintf(_("%s timeline"), $this->group->nickname);
-        $taguribase = common_config('integration', 'taguri');
-        $id         = "tag:$taguribase:GroupTimeline:" . $this->group->id;
-        $link       = common_local_url(
-            'showgroup',
+        // We'll pull common formatting out of this for other formats
+        $atom = new AtomGroupNoticeFeed($this->group, $this->auth_user);
+
+        $self = $this->getSelfUri();
+
+        $link = common_local_url(
+            'ApiTimelineGroup',
             array('nickname' => $this->group->nickname)
         );
-        $subtitle   = sprintf(
-            _('Updates from %1$s on %2$s!'),
-            $this->group->nickname,
-            $sitename
-        );
 
         switch($this->format) {
         case 'xml':
             $this->showXmlTimeline($this->notices);
             break;
         case 'rss':
-            $this->showRssTimeline($this->notices, $title, $link, $subtitle);
-            break;
-        case 'atom':
-            $selfuri = common_root_url() .
-                'api/statusnet/groups/timeline/' .
-                    $this->group->nickname . '.atom';
-            $this->showAtomTimeline(
+            $this->showRssTimeline(
                 $this->notices,
-                $title,
-                $id,
-                $link,
-                $subtitle,
+                $atom->title,
+                $this->group->homeUrl(),
+                $atom->subtitle,
                 null,
-                $selfuri
+                $atom->logo,
+                $self
             );
             break;
+        case 'atom':
+            header('Content-Type: application/atom+xml; charset=utf-8');
+                $atom->addEntryFromNotices($this->notices);
+                $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(
-                _('API method not found!'),
+                // TRANS: Client error displayed when trying to handle an unknown API method.
+                _('API method not found.'),
                 404,
                 $this->format
             );
@@ -151,7 +158,6 @@ class ApiTimelineGroupAction extends ApiAction
      *
      * @return array notices
      */
-
     function getNotices()
     {
         $notices = array();
@@ -160,8 +166,7 @@ class ApiTimelineGroupAction extends ApiAction
             ($this->page-1) * $this->count,
             $this->count,
             $this->since_id,
-            $this->max_id,
-            $this->since
+            $this->max_id
         );
 
         while ($notice->fetch()) {
@@ -178,7 +183,6 @@ class ApiTimelineGroupAction extends ApiAction
      *
      * @return boolean true
      */
-
     function isReadOnly($args)
     {
         return true;
@@ -189,7 +193,6 @@ class ApiTimelineGroupAction extends ApiAction
      *
      * @return string datestamp of the latest notice in the stream
      */
-
     function lastModified()
     {
         if (!empty($this->notices) && (count($this->notices) > 0)) {
@@ -207,7 +210,6 @@ class ApiTimelineGroupAction extends ApiAction
      *
      * @return string etag
      */
-
     function etag()
     {
         if (!empty($this->notices) && (count($this->notices) > 0)) {
@@ -217,6 +219,7 @@ class ApiTimelineGroupAction extends ApiAction
             return '"' . implode(
                 ':',
                 array($this->arg('action'),
+                      common_user_cache_hash($this->auth_user),
                       common_language(),
                       $this->group->id,
                       strtotime($this->notices[0]->created),
@@ -227,5 +230,4 @@ class ApiTimelineGroupAction extends ApiAction
 
         return null;
     }
-
 }