check if other user exists before unsub

[quix0rs-gnu-social.git] / actions / apitimelinegroup.php

diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index abe7f0c5d84b5e0b1f0350a3596128e04bcdc7c3..22c577f397ba5072413767a3510018b586ece83d 100644 (file)
--- a/actions/apitimelinegroup.php
+++ b/actions/apitimelinegroup.php
@@ -21,6 +21,9 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Jeffery To <jeffery.to@gmail.com>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -31,19 +34,22 @@ 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
  *
  * @category API
  * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Jeffery To <jeffery.to@gmail.com>
  * @author   Zach Copley <zach@status.net>
  * @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;
@@ -62,15 +68,7 @@ class ApiTimelineGroupAction extends ApiAction
     {
         parent::prepare($args);
 
-        $this->page     = (int)$this->arg('page', 1);
-        $this->count    = (int)$this->arg('count', 20);
-        $this->max_id   = (int)$this->arg('max_id', 0);
-        $this->since_id = (int)$this->arg('since_id', 0);
-        $this->since    = $this->arg('since');
-
-        $this->group = $this->getTargetGroup($this->arg('id'));
-
-        $this->notices = $this->getNotices();
+        $this->group   = $this->getTargetGroup($this->arg('id'));
 
         return true;
     }
@@ -88,6 +86,13 @@ class ApiTimelineGroupAction extends ApiAction
     function handle($args)
     {
         parent::handle($args);
+
+        if (empty($this->group)) {
+            $this->clientError(_('Group not found!'), 404, $this->format);
+            return false;
+        }
+
+        $this->notices = $this->getNotices();
         $this->showTimeline();
     }
 
@@ -100,6 +105,7 @@ class ApiTimelineGroupAction extends ApiAction
     function showTimeline()
     {
         $sitename   = common_config('site', 'name');
+        $avatar     = $this->group->homepage_logo;
         $title      = sprintf(_("%s timeline"), $this->group->nickname);
         $taguribase = common_config('integration', 'taguri');
         $id         = "tag:$taguribase:GroupTimeline:" . $this->group->id;
@@ -112,30 +118,32 @@ class ApiTimelineGroupAction extends ApiAction
             $this->group->nickname,
             $sitename
         );
+        $logo       = ($avatar) ? $avatar : User_group::defaultLogo(AVATAR_PROFILE_SIZE);
 
         switch($this->format) {
         case 'xml':
-            $this->show_xml_timeline($this->notices);
+            $this->showXmlTimeline($this->notices);
             break;
         case 'rss':
-            $this->show_rss_timeline($this->notices, $title, $link, $subtitle);
+            $this->showRssTimeline($this->notices, $title, $link, $subtitle, null, $logo);
             break;
         case 'atom':
             $selfuri = common_root_url() .
                 'api/statusnet/groups/timeline/' .
                     $this->group->nickname . '.atom';
-            $this->show_atom_timeline(
+            $this->showAtomTimeline(
                 $this->notices,
                 $title,
                 $id,
                 $link,
                 $subtitle,
                 null,
-                $selfuri
+                $selfuri,
+                $logo
             );
             break;
         case 'json':
-            $this->show_json_timeline($this->notices);
+            $this->showJsonTimeline($this->notices);
             break;
         default:
             $this->clientError(