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

diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index 5d05429185..da816c40a9 100644
--- a/actions/apitimelinegroup.php
+++ b/actions/apitimelinegroup.php
@@ -34,7 +34,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
@@ -49,7 +49,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiTimelineGroupAction extends ApiAction
+class ApiTimelineGroupAction extends ApiPrivateAuthAction
 {
 
     var $group   = null;
@@ -69,7 +69,6 @@ class ApiTimelineGroupAction extends ApiAction
         parent::prepare($args);
 
         $this->group   = $this->getTargetGroup($this->arg('id'));
-        $this->notices = $this->getNotices();
 
         return true;
     }
@@ -87,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();
     }
 
@@ -98,47 +104,51 @@ class ApiTimelineGroupAction extends ApiAction
 
     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',
-            array('nickname' => $this->group->nickname)
-        );
-        $subtitle   = sprintf(
-            _('Updates from %1$s on %2$s!'),
-            $this->group->nickname,
-            $sitename
-        );
+        // We'll pull common formatting out of this for other formats
+        $atom = new AtomGroupNoticeFeed($this->group);
+
+        $self = $this->getSelfUri();
 
         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');
+
+            try {
+                $atom->addAuthorRaw($this->group->asAtomAuthor());
+                $atom->setActivitySubject($this->group->asActivitySubject());
+                $atom->setId($self);
+                $atom->setSelfLink($self);
+                $atom->addEntryFromNotices($this->notices);
+                $this->raw($atom->getString());
+            } catch (Atom10FeedException $e) {
+                $this->serverError(
+                    'Could not generate feed for group - ' . $e->getMessage()
+                );
+                return;
+            }
+
             break;
         case 'json':
             $this->showJsonTimeline($this->notices);
             break;
         default:
             $this->clientError(
-                _('API method not found!'),
+                _('API method not found.'),
                 404,
                 $this->format
             );
@@ -160,8 +170,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()) {