New action for group timelines via API

2 files changed, 7 insertions, 10 deletions

diff --git a/lib/router.php b/lib/router.php
index 03210ce98..dbe2be0bb 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -501,6 +501,12 @@ class Router
 
         // Groups
         //'list' has to be handled differently, as php will not allow a method to be named 'list'
+
+        $m->connect('api/statusnet/groups/timeline/:id.:format',
+                    array('action' => 'ApiTimelineGroup',
+                          'id' => '[a-zA-Z0-9]+',
+                          'format' => '(xmljson|rss|atom)'));
+
         $m->connect('api/statusnet/groups/list/:argument',
                     array('action' => 'api',
                           'method' => 'list_groups',
@@ -518,15 +524,6 @@ class Router
                           'apiaction' => 'statuses'),
                     array('method' => '(list_all|)(\.(atom|rss|xml|json))?'));
 
-        $m->connect('api/statuses/:method/:argument',
-                    array('action' => 'api',
-                          'apiaction' => 'statuses'),
-                    array('method' => '(user_timeline|home_timeline|friends_timeline|replies|mentions|show|destroy|friends|followers)'));
-
-        $m->connect('api/statusnet/groups/:method/:argument',
-                    array('action' => 'api',
-                          'apiaction' => 'groups'));
-
         $m->connect('api/statusnet/groups/:method',
                     array('action' => 'api',
                           'apiaction' => 'groups'));
diff --git a/lib/twitterapi.php b/lib/twitterapi.php
index 2141194df..5cd88628b 100644
--- a/lib/twitterapi.php
+++ b/lib/twitterapi.php
@@ -1142,7 +1142,7 @@ class TwitterapiAction extends Action
         }
     }
 
-    function get_group($id, $apidata=null)
+    function getTargetGroup($id)
     {
         if (empty($id)) {