X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapitimelinepublic.php;h=07dcace942457b254660005ca48b18135c5e837d;hb=57c87088d4cdc435d386c457249642c2ffeab21b;hp=a786aa15cca7089f243e9fc521351d62dcb49af8;hpb=31b29fde50e9664e1b70064c043879ce87553883;p=quix0rs-gnu-social.git

diff --git a/actions/apitimelinepublic.php b/actions/apitimelinepublic.php
index a786aa15cc..07dcace942 100644
--- a/actions/apitimelinepublic.php
+++ b/actions/apitimelinepublic.php
@@ -38,8 +38,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiprivateauth.php';
-
 /**
  * Returns the most recent notices (default 20) posted by everybody
  *
@@ -156,7 +154,7 @@ class ApiTimelinePublicAction extends ApiPrivateAuthAction
      * @return boolean success flag
      *
      */
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -170,16 +168,20 @@ class ApiTimelinePublicAction extends ApiPrivateAuthAction
      *
      * Just show the notices
      *
-     * @param array $args $_REQUEST data (unused)
-     *
      * @return void
      */
-    function handle($args)
+    protected function handle()
     {
-        parent::handle($args);
+        parent::handle();
         $this->showTimeline();
     }
 
+    function title()
+    {
+        // TRANS: Title for site timeline. %s is the GNU social sitename.
+        return sprintf(_("%s public timeline"), common_config('site', 'name'));
+    }
+
     /**
      * Show the timeline of notices
      *
@@ -187,16 +189,16 @@ class ApiTimelinePublicAction extends ApiPrivateAuthAction
      */
     function showTimeline()
     {
-        $sitename   = common_config('site', 'name');
+        $nonapi_action = substr($this->action, strlen('apitimeline'));  // Just so we don't need to set this explicitly
+
         $sitelogo   = (common_config('site', 'logo')) ? common_config('site', 'logo') : Theme::path('logo.png');
-        // TRANS: Title for site timeline. %s is the StatusNet sitename.
-        $title      = sprintf(_("%s public timeline"), $sitename);
+        $title      = $this->title();
         $taguribase = TagURI::base();
-        $id         = "tag:$taguribase:PublicTimeline";
-        $link       = common_local_url('public');
+        $id         = "tag:$taguribase:" . ucfirst($nonapi_action) . 'Timeline';    // Public or Networkpublic probably
+        $link       = common_local_url($nonapi_action);
         $self       = $this->getSelfUri();
-        // TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-        $subtitle   = sprintf(_("%s updates from everyone!"), $sitename);
+        // TRANS: Subtitle for site timeline. %s is the GNU social sitename.
+        $subtitle   = sprintf(_("%s updates from everyone!"), common_config('site', 'name'));
 
         switch($this->format) {
         case 'xml':
@@ -224,7 +226,7 @@ class ApiTimelinePublicAction extends ApiPrivateAuthAction
             $atom->setSubtitle($subtitle);
             $atom->setLogo($sitelogo);
             $atom->setUpdated('now');
-            $atom->addLink(common_local_url('public'));
+            $atom->addLink(common_local_url($nonapi_action));
             $atom->setSelfLink($self);
             $atom->addEntryFromNotices($this->notices);
 
@@ -235,7 +237,7 @@ class ApiTimelinePublicAction extends ApiPrivateAuthAction
             $this->showJsonTimeline($this->notices);
             break;
         case 'as':
-            header('Content-Type: application/json; charset=utf-8');
+            header('Content-Type: ' . ActivityStreamJSONDocument::CONTENT_TYPE);
             $doc = new ActivityStreamJSONDocument($this->auth_user);
             $doc->setTitle($title);
             $doc->addLink($link, 'alternate', 'text/html');
@@ -258,18 +260,25 @@ class ApiTimelinePublicAction extends ApiPrivateAuthAction
     {
         $notices = array();
 
-        $notice = Notice::publicStream(
-            ($this->page - 1) * $this->count, $this->count, $this->since_id,
-            $this->max_id
-        );
+        $stream = $this->getStream();
 
-        while ($notice->fetch()) {
-            $notices[] = clone($notice);
-        }
+        $notice = $stream->getNotices(($this->page - 1) * $this->count,
+                                      $this->count,
+                                      $this->since_id,
+                                      $this->max_id);
+
+        $notices = $notice->fetchAll();
+
+        NoticeList::prefill($notices);
 
         return $notices;
     }
 
+    protected function getStream()
+    {
+        return new PublicNoticeStream($this->scoped);
+    }
+
     /**
      * Is this action read only?
      *