summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/router.php26
1 files changed, 24 insertions, 2 deletions
diff --git a/lib/router.php b/lib/router.php
index d4d5b659c..b9c616222 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -266,6 +266,10 @@ class Router
// statuses API
+ $m->connect('api/statuses/public_timeline.:format',
+ array('action' => 'ApiPublicTimeline',
+ 'format' => '(xml|json|rss|atom)'));
+
$m->connect('api/statuses/friends_timeline.:format',
array('action' => 'ApiFriendsTimeline',
'format' => '(xml|json|rss|atom)'));
@@ -275,18 +279,36 @@ class Router
'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json|rss|atom)'));
+ $m->connect('api/statuses/user_timeline.:format',
+ array('action' => 'ApiUserTimeline',
+ 'format' => '(xml|json|rss|atom)'));
+
+ $m->connect('api/statuses/user_timeline/:id.:format',
+ array('action' => 'ApiUserTimeline',
+ 'id' => '[a-zA-Z0-9]+',
+ 'format' => '(xml|json|rss|atom)'));
+
+ $m->connect('api/statuses/mentions.:format',
+ array('action' => 'ApiMentions',
+ 'format' => '(xml|json|rss|atom)'));
+
+ $m->connect('api/statuses/mentions/:id.:format',
+ array('action' => 'ApiMentions',
+ '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|user_timeline|update|replies|mentions|show|friends|followers|featured)(\.(atom|rss|xml|json))?'));
+ array('method' => '(update|replies|show|friends|followers|featured)(\.(atom|rss|xml|json))?'));
$m->connect('api/statuses/:method/:argument',
array('action' => 'api',
'apiaction' => 'statuses'),
- array('method' => '(user_timeline|replies|mentions|show|destroy|friends|followers)'));
+ array('method' => '(replies|show|destroy|friends|followers)'));
// users