Merge branch 'candrews-review' into 0.8.x

* candrews-review:
  added group status api, located at /api/statuses/group_timeline/ID.rss

actions/showgroup.php

@@ -317,7 +317,24 @@ class ShowgroupAction extends GroupDesignAction
           common_local_url('grouprss',
                            array('nickname' => $this->group->nickname));
 
-        return array(new Feed(Feed::RSS1, $url, sprintf(_('Notice feed for %s group'),
+        return array(new Feed(Feed::RSS1,
+                              common_local_url('grouprss',
+                                               array('nickname' => $this->group->nickname)),
+                              sprintf(_('Notice feed for %s group (RSS 1.0)'),
+                                      $this->group->nickname)),
+                     new Feed(Feed::RSS2,
+                              common_local_url('api',
+                                               array('apiaction' => 'statuses',
+                                                     'method' => 'group_timeline',
+                                                     'argument' => $this->group->nickname.'.rss')),
+                              sprintf(_('Notice feed for %s group (RSS 2.0)'),
+                                      $this->group->nickname)),
+                     new Feed(Feed::ATOM,
+                              common_local_url('api',
+                                               array('apiaction' => 'statuses',
+                                                     'method' => 'group_timeline',
+                                                     'argument' => $this->group->nickname.'.atom')),
+                              sprintf(_('Notice feed for %s group (Atom)'),
                                       $this->group->nickname)));
     }
 

actions/twitapistatuses.php

@@ -136,6 +136,64 @@ class TwitapistatusesAction extends TwitterapiAction
 
     }
 
+    function group_timeline($args, $apidata)
+    {
+        parent::handle($args);
+
+        $this->auth_user = $apidata['user'];
+        $group = $this->get_group($apidata['api_arg'], $apidata);
+
+        if (empty($group)) {
+            $this->clientError('Not Found', 404, $apidata['content-type']);
+            return;
+        }
+
+        $sitename   = common_config('site', 'name');
+        $title      = sprintf(_("%s timeline"), $group->nickname);
+        $taguribase = common_config('integration', 'taguri');
+        $id         = "tag:$taguribase:GroupTimeline:".$group->id;
+        $link       = common_local_url('showstream',
+            array('nickname' => $group->nickname));
+        $subtitle   = sprintf(_('Updates from %1$s on %2$s!'),
+            $group->nickname, $sitename);
+
+        $page     = (int)$this->arg('page', 1);
+        $count    = (int)$this->arg('count', 20);
+        $max_id   = (int)$this->arg('max_id', 0);
+        $since_id = (int)$this->arg('since_id', 0);
+        $since    = $this->arg('since');
+
+        $notice = $group->getNotices(($page-1)*$count,
+            $count, $since_id, $max_id, $since);
+
+        switch($apidata['content-type']) {
+         case 'xml':
+            $this->show_xml_timeline($notice);
+            break;
+         case 'rss':
+            $this->show_rss_timeline($notice, $title, $link,
+                $subtitle, $suplink);
+            break;
+         case 'atom':
+            if (isset($apidata['api_arg'])) {
+                $selfuri = common_root_url() .
+                    'api/statuses/group_timeline/' .
+                        $apidata['api_arg'] . '.atom';
+            } else {
+                $selfuri = common_root_url() .
+                 'api/statuses/group_timeline.atom';
+            }
+            $this->show_atom_timeline($notice, $title, $id, $link,
+                $subtitle, $suplink, $selfuri);
+            break;
+         case 'json':
+            $this->show_json_timeline($notice);
+            break;
+         default:
+            $this->clientError(_('API method not found!'), $code = 404);
+        }
+    }
+
     function user_timeline($args, $apidata)
     {
         parent::handle($args);

lib/router.php

@@ -266,7 +266,7 @@ class Router
         $m->connect('api/statuses/:method/:argument',
                     array('action' => 'api',
                           'apiaction' => 'statuses'),
-                    array('method' => '(user_timeline|friends_timeline|replies|mentions|show|destroy|friends|followers)'));
+                    array('method' => '(group_timeline|user_timeline|friends_timeline|replies|mentions|show|destroy|friends|followers)'));
 
         // users
 

lib/twitterapi.php

@@ -774,6 +774,34 @@ class TwitterapiAction extends Action
         }
     }
 
+    function get_group($id, $apidata=null)
+    {
+        if (empty($id)) {
+
+            if (is_numeric($this->arg('id'))) {
+                return User::staticGet($this->arg('id'));
+            } else if ($this->arg('id')) {
+                $nickname = common_canonical_nickname($this->arg('id'));
+                return User_group::staticGet('nickname', $nickname);
+            } else if ($this->arg('user_id')) {
+                // This is to ensure that a non-numeric user_id still
+                // overrides screen_name even if it doesn't get used
+                if (is_numeric($this->arg('user_id'))) {
+                    return User_group::staticGet('id', $this->arg('user_id'));
+                }
+            } else if ($this->arg('screen_name')) {
+                $nickname = common_canonical_nickname($this->arg('screen_name'));
+                return User::staticGet('nickname', $nickname);
+            }
+
+        } else if (is_numeric($id)) {
+            return User_group::staticGet($id);
+        } else {
+            $nickname = common_canonical_nickname($id);
+            return User_group::staticGet('nickname', $nickname);
+        }
+    }
+
     function get_profile($id)
     {
         if (is_numeric($id)) {