Merge branch '0.9.x' into refactor-api

[quix0rs-gnu-social.git] / lib / router.php

diff --git a/lib/router.php b/lib/router.php
index c18f273ed06ae6b948953d75ab0a392caad8d2f1..33b0984738e72c9305071503e3daea0fd787b1a6 100644 (file)
--- a/lib/router.php
+++ b/lib/router.php
@@ -266,15 +266,27 @@ class Router
 
         // statuses API
 
+        $m->connect('api/statuses/friends_timeline.:format',
+                    array('action' => 'apifriendstimeline',
+                          'format' => '(xml|json|rss|atom)'));
+
+        $m->connect('api/statuses/friends_timeline/:id.:format',
+                    array('action' => 'apifriendstimeline',
+                          'id' => '[a-zA-Z0-9]+',
+                          'format' => '(xml|json|rss|atom)'));
+
+        $m->connect('api/statuses/home_timeline',
+                    array('action' => 'apifriendstimeline'));
+
         $m->connect('api/statuses/:method',
                     array('action' => 'api',
                           'apiaction' => 'statuses'),
-                    array('method' => '(public_timeline|home_timeline|friends_timeline|user_timeline|update|replies|mentions|show|friends|followers|featured)(\.(atom|rss|xml|json))?'));
+                    array('method' => '(public_timeline|user_timeline|update|replies|mentions|show|friends|followers|featured)(\.(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)'));
+                    array('method' => '(user_timeline|replies|mentions|show|destroy|friends|followers)'));
 
         // users