X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapitimelinetag.php;h=b3f17d0712019c9578f92f5fd8aa6dccbfe4b0f2;hb=bc1d66778457abf137ecacd70924e43a69986fd6;hp=4dbe1fc0dbcb9d865884eb4ff3a3e494ea71facb;hpb=e7c7fd39fc948f1169512916077185dd29973b60;p=quix0rs-gnu-social.git

diff --git a/actions/apitimelinetag.php b/actions/apitimelinetag.php
index 4dbe1fc0db..b3f17d0712 100644
--- a/actions/apitimelinetag.php
+++ b/actions/apitimelinetag.php
@@ -35,8 +35,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiprivateauth.php';
-
 /**
  * Returns the 20 most recent notices tagged by a given tag
  *
@@ -107,7 +105,7 @@ class ApiTimelineTagAction extends ApiPrivateAuthAction
             $sitename
         );
         $taguribase = TagURI::base();
-        $id         = "tag:$taguribase:TagTimeline:".$tag;
+        $id         = "tag:$taguribase:TagTimeline:".$this->tag;
 
         $link = common_local_url(
             'tag',
@@ -116,8 +114,6 @@ class ApiTimelineTagAction extends ApiPrivateAuthAction
 
         $self = $this->getSelfUri();
 
-        common_debug("self link is: $self");
-
         switch($this->format) {
         case 'xml':
             $this->showXmlTimeline($this->notices);
@@ -141,7 +137,7 @@ class ApiTimelineTagAction extends ApiPrivateAuthAction
             $atom->setId($id);
             $atom->setTitle($title);
             $atom->setSubtitle($subtitle);
-            $atom->setLogo($logo);
+            $atom->setLogo($sitelogo);
             $atom->setUpdated('now');
 
             $atom->addLink($link);
@@ -154,8 +150,16 @@ class ApiTimelineTagAction extends ApiPrivateAuthAction
         case 'json':
             $this->showJsonTimeline($this->notices);
             break;
+        case 'as':
+            header('Content-Type: ' . ActivityStreamJSONDocument::CONTENT_TYPE);
+            $doc = new ActivityStreamJSONDocument($this->auth_user);
+            $doc->setTitle($title);
+            $doc->addLink($link, 'alternate', 'text/html');
+            $doc->addItemsFromNotices($this->notices);
+            $this->raw($doc->asString());
+            break;
         default:
-            // TRANS: Client error displayed when trying to handle an unknown API method.
+            // TRANS: Client error displayed when coming across a non-supported API method.
             $this->clientError(_('API method not found.'), $code = 404);
             break;
         }
@@ -173,7 +177,9 @@ class ApiTimelineTagAction extends ApiPrivateAuthAction
         $notice = Notice_tag::getStream(
             $this->tag,
             ($this->page - 1) * $this->count,
-            $this->count + 1
+            $this->count + 1,
+            $this->since_id,
+            $this->max_id
         );
 
         while ($notice->fetch()) {