diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-07-11 07:30:26 -0700 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-07-11 07:30:26 -0700 |
commit | 55415652382d1f3ae77123d197e01d95da83041e (patch) | |
tree | 449ee7e9aebe184583f099e49a7194eb5bbf8543 /lib/router.php | |
parent | bfae5489cb629331f2936b2bf1066adb3976bce1 (diff) | |
parent | 7621e0e38467349a89f71e814941932fbacecfa1 (diff) |
Merge branch 'testing'
Diffstat (limited to 'lib/router.php')
-rw-r--r-- | lib/router.php | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lib/router.php b/lib/router.php index 50b733453..8104d7818 100644 --- a/lib/router.php +++ b/lib/router.php @@ -261,12 +261,12 @@ class Router $m->connect('api/statuses/:method', array('action' => 'api', 'apiaction' => 'statuses'), - array('method' => '(public_timeline|friends_timeline|user_timeline|update|replies|mentions|friends|followers|featured)(\.(atom|rss|xml|json))?')); + array('method' => '(public_timeline|friends_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|friends_timeline|replies|mentions|show|destroy|friends|followers)')); + array('method' => '(|user_timeline|friends_timeline|replies|mentions|show|destroy|friends|followers)')); // users @@ -394,6 +394,15 @@ class Router array('action' => 'api', 'apiaction' => 'laconica')); + // Groups + $m->connect('api/laconica/groups/:method/:argument', + array('action' => 'api', + 'apiaction' => 'groups')); + + $m->connect('api/laconica/groups/:method', + array('action' => 'api', + 'apiaction' => 'groups')); + // search $m->connect('api/search.atom', array('action' => 'twitapisearchatom')); $m->connect('api/search.json', array('action' => 'twitapisearchjson')); |