eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge branch '0.7.x' into 0.8.x

Browse Source
This commit is contained in:
Evan Prodromou
2009-03-06 16:17:58 -08:00
parent 9a2f335853 0617c7b773
commit 13c183e2f4
41 changed files with 1180 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/router.php
View File

@@ -234,14 +234,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
@@ -356,9 +357,15 @@ class Router
array('action' => 'api',
'apiaction' => 'laconica'));
// search
$m->connect('api/search.atom', array('action' => 'twitapisearchatom'));
$m->connect('api/search.json', array('action' => 'twitapisearchjson'));
$m->connect('api/trends.json', array('action' => 'twitapitrends'));
// user stuff
foreach (array('subscriptions', 'subscribers',
foreach (array('subscriptions', 'subscribers',
'nudge', 'xrds', 'all', 'foaf',
'replies', 'inbox', 'outbox', 'microsummary') as $a) {
$m->connect(':nickname/'.$a,
@@ -398,6 +405,8 @@ class Router
array('action' => 'showstream'),
array('nickname' => '[a-zA-Z0-9]{1,64}'));
Event::handle('RouterInitialized', array($m));
return $m;
}