Merge commit 'refs/merge-requests/121' of git://gitorious.org/statusnet/mainline...

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

diff --git a/actions/apitimelinepublic.php b/actions/apitimelinepublic.php
index 58e26773483bf0d2ebedbd111f1112d0fa72d403..0fb0788e98795b286daf9b7f37f7d9cf0d92804c 100644 (file)
--- a/actions/apitimelinepublic.php
+++ b/actions/apitimelinepublic.php
@@ -37,7 +37,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 by everybody
@@ -55,7 +55,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiTimelinePublicAction extends ApiAction
+class ApiTimelinePublicAction extends ApiPrivateAuthAction
 {
 
     var $notices = null;
@@ -74,6 +74,10 @@ class ApiTimelinePublicAction extends ApiAction
         parent::prepare($args);
 
         $this->notices = $this->getNotices();
+        
+        if ($this->since) {
+            throw new ServerException("since parameter is disabled for performance; use since_id", 403);
+        }
 
         return true;
     }
@@ -103,6 +107,7 @@ class ApiTimelinePublicAction extends ApiAction
     function showTimeline()
     {
         $sitename   = common_config('site', 'name');
+        $sitelogo   = (common_config('site', 'logo')) ? common_config('site', 'logo') : Theme::path('logo.png');
         $title      = sprintf(_("%s public timeline"), $sitename);
         $taguribase = common_config('integration', 'taguri');
         $id         = "tag:$taguribase:PublicTimeline";
@@ -114,20 +119,20 @@ class ApiTimelinePublicAction extends ApiAction
             $this->showXmlTimeline($this->notices);
             break;
         case 'rss':
-            $this->showRssTimeline($this->notices, $title, $link, $subtitle);
+            $this->showRssTimeline($this->notices, $title, $link, $subtitle, null, $sitelogo);
             break;
         case 'atom':
             $selfuri = common_root_url() . 'api/statuses/public_timeline.atom';
             $this->showAtomTimeline(
                 $this->notices, $title, $id, $link,
-                $subtitle, null, $selfuri
+                $subtitle, null, $selfuri, $sitelogo
             );
             break;
         case 'json':
             $this->showJsonTimeline($this->notices);
             break;
         default:
-            $this->clientError(_('API method not found!'), $code = 404);
+            $this->clientError(_('API method not found.'), $code = 404);
             break;
         }
     }
@@ -144,7 +149,7 @@ class ApiTimelinePublicAction extends ApiAction
 
         $notice = Notice::publicStream(
             ($this->page - 1) * $this->count, $this->count, $this->since_id,
-            $this->max_id, $this->since
+            $this->max_id
         );
 
         while ($notice->fetch()) {