diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-03-05 11:04:16 -0800 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-03-05 11:04:16 -0800 |
| commit | 6ce7d0c567b23d3bec035a9c4428399bdfdb896b (patch) | |
| tree | ae887738020b1c67cd57aa247f4c326fe331a048 /lib/router.php | |
| parent | b9781258bbfaac0e7fc91af4f77f1f340274a88e (diff) | |
| parent | 3087e4ad5dfbccb7218c12ca747e1dbcf3a6415c (diff) | |
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Diffstat (limited to 'lib/router.php')
| -rw-r--r-- | lib/router.php | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/lib/router.php b/lib/router.php index d4a4d2ca9..41c376a72 100644 --- a/lib/router.php +++ b/lib/router.php @@ -228,14 +228,15 @@ class Router // users - $m->connect('api/users/show/:argument', + $m->connect('api/users/:method/:argument', array('action' => 'api', - 'apiaction' => 'users')); + 'apiaction' => 'users'), + array('method' => 'show(\.(xml|json))?')); $m->connect('api/users/:method', array('action' => 'api', 'apiaction' => 'users'), - array('method' => 'show(\.(xml|json|atom|rss))?')); + array('method' => 'show(\.(xml|json))?')); // direct messages @@ -283,14 +284,14 @@ class Router array('action' => 'api', 'apiaction' => 'statuses', 'method' => 'friendsIDs')); - + foreach (array('xml', 'json') as $e) { $m->connect('api/friends/ids.'.$e, array('action' => 'api', 'apiaction' => 'statuses', 'method' => 'friendsIDs.'.$e)); } - + $m->connect('api/followers/ids/:argument', array('action' => 'api', 'apiaction' => 'statuses', @@ -351,6 +352,16 @@ class Router array('action' => 'api', 'apiaction' => 'laconica')); + + // search + + foreach (array('json', 'atom') as $e) { + $m->connect('api/search.'.$e, + array('action' => 'twitapisearch')); + } + + $m->connect('api/trends.json', array('action' => 'twitapitrends')); + // user stuff foreach (array('subscriptions', 'subscribers', |