* @link http://status.net/
*/
-if (!defined('STATUSNET') && !defined('LACONICA')) {
- exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
/**
* URL Router
if (Event::handle('StartInitializeRouter', array(&$m))) {
+ // top of the menu hierarchy, sometimes "Home"
+ $m->connect('', array('action' => 'top'));
+
+ // public endpoints
+
$m->connect('robots.txt', array('action' => 'robotstxt'));
$m->connect('opensearch/people', array('action' => 'opensearch',
'sandbox', 'unsandbox',
'silence', 'unsilence',
'grantrole', 'revokerole',
- 'repeat',
'deleteuser',
'geocode',
'version',
'deleteaccount',
'restoreaccount',
'top',
+ 'public',
);
foreach ($main as $a) {
$m->connect('main/'.$a, array('action' => $a));
}
- $m->connect('main/public', array('action' => 'public'));
$m->connect('main/all', array('action' => 'networkpublic'));
$m->connect('main/tagprofile/:id', array('action' => 'tagprofile'),
array('action' => 'attachment'),
array('attachment' => '[0-9]+'));
+ $m->connect('attachment/:attachment/download',
+ array('action' => 'attachment_download'),
+ array('attachment' => '[0-9]+'));
+
$m->connect('attachment/:attachment/thumbnail',
array('action' => 'attachment_thumbnail'),
array('attachment' => '[0-9]+'));
array('action' => 'shownotice'),
array('notice' => '[0-9]+'));
- $m->connect('notice/delete/:notice',
+ $m->connect('notice/:notice/delete',
array('action' => 'deletenotice'),
array('notice' => '[0-9]+'));
- $m->connect('notice/delete', array('action' => 'deletenotice'));
-
// conversation
$m->connect('conversation/:id',
array('action' => 'userbyid'),
array('id' => '[0-9]+'));
- if (!common_config('performance', 'high')) {
- $m->connect('tags/', array('action' => 'publictagcloud'));
- $m->connect('tag/', array('action' => 'publictagcloud'));
- $m->connect('tags', array('action' => 'publictagcloud'));
- $m->connect('tag', array('action' => 'publictagcloud'));
- }
$m->connect('tag/:tag/rss',
array('action' => 'tagrss'),
array('tag' => self::REGEX_TAG));
array('action' => 'ApiTimelineMentions',
'format' => '(xml|json|rss|atom|as)'));
- $m->connect('api/statuses/retweeted_by_me.:format',
- array('action' => 'ApiTimelineRetweetedByMe',
- 'format' => '(xml|json|atom|as)'));
-
- $m->connect('api/statuses/retweeted_to_me.:format',
- array('action' => 'ApiTimelineRetweetedToMe',
- 'format' => '(xml|json|atom|as)'));
-
- $m->connect('api/statuses/retweets_of_me.:format',
- array('action' => 'ApiTimelineRetweetsOfMe',
- 'format' => '(xml|json|atom|as)'));
-
$m->connect('api/statuses/friends/:id.:format',
array('action' => 'ApiUserFriends',
'id' => Nickname::INPUT_FMT,
$m->connect('api/statuses/update.:format',
array('action' => 'ApiStatusesUpdate',
- 'format' => '(xml|json)'));
+ 'format' => '(xml|json|atom)'));
$m->connect('api/statuses/destroy/:id.:format',
array('action' => 'ApiStatusesDestroy',
array('action' => 'ApiStatusesDestroy',
'format' => '(xml|json)'));
- $m->connect('api/statuses/retweet/:id.:format',
- array('action' => 'ApiStatusesRetweet',
- 'id' => '[0-9]+',
- 'format' => '(xml|json)'));
-
- $m->connect('api/statuses/retweets/:id.:format',
- array('action' => 'ApiStatusesRetweets',
- 'id' => '[0-9]+',
- 'format' => '(xml|json)'));
-
// START qvitter API additions
$m->connect('api/attachment/:id.:format',
'api/statuses/update_with_media.json',
array('action' => 'ApiMediaUpload')
);
+ // Twitter Media upload API v1.1
+ $m->connect(
+ 'api/media/upload.:format',
+ array('action' => 'ApiMediaUpload',
+ 'format' => '(xml|json)',
+ )
+ );
// search
$m->connect('api/search.atom', array('action' => 'ApiSearchAtom'));
foreach (array('subscriptions', 'subscribers',
'all', 'foaf', 'replies',
- 'microsummary') as $a) {
+ ) as $a) {
$m->connect($a,
array('action' => $a,
'nickname' => $nickname));
array('action' => 'rsd',
'nickname' => $nickname));
- $m->connect('',
- array('action' => 'startpage'));
-
// peopletags
$m->connect('peopletags',
$m->connect('all/:tag',
array('action' => 'showprofiletag',
+ 'nickname' => $nickname,
'tag' => self::REGEX_TAG));
foreach (array('subscriptions', 'subscribers') as $a) {
}
}
- $m->connect('', array('action' => 'startpage'));
- $m->connect('main/public', array('action' => 'public'));
- $m->connect('main/all', array('action' => 'networkpublic'));
$m->connect('rss', array('action' => 'publicrss'));
$m->connect('featuredrss', array('action' => 'featuredrss'));
$m->connect('featured/', array('action' => 'featured'));
foreach (array('subscriptions', 'subscribers',
'nudge', 'all', 'foaf', 'replies',
- 'inbox', 'outbox', 'microsummary') as $a) {
+ 'inbox', 'outbox') as $a) {
$m->connect(':nickname/'.$a,
array('action' => $a),
array('nickname' => Nickname::DISPLAY_FMT));
array('action' => 'subqueue'),
array('nickname' => Nickname::DISPLAY_FMT));
+ // some targeted RSS 1.0 actions (extends TargetedRss10Action)
+ foreach (array('all', 'replies') as $a) {
+ $m->connect(':nickname/'.$a.'/rss',
+ array('action' => $a.'rss'),
+ array('nickname' => Nickname::DISPLAY_FMT));
+ }
+
// people tags
$m->connect(':nickname/peopletags',
'tagger_id' => '[0-9]+',
'id' => '[0-9]+'));
- $m->connect(':tagger/all/:tag',
- array('action' => 'showprofiletag',
- 'tagger' => Nickname::DISPLAY_FMT,
+ $m->connect(':nickname/all/:tag',
+ array('action' => 'showprofiletag'),
+ array('nickname' => Nickname::DISPLAY_FMT,
'tag' => self::REGEX_TAG));
foreach (array('subscriptions', 'subscribers') as $a) {
array('nickname' => Nickname::DISPLAY_FMT));
}
- foreach (array('all', 'replies') as $a) {
- $m->connect(':nickname/'.$a.'/rss',
- array('action' => $a.'rss'),
- array('nickname' => Nickname::DISPLAY_FMT));
- }
-
$m->connect(':nickname/avatar',
array('action' => 'avatarbynickname'),
array('nickname' => Nickname::DISPLAY_FMT));
function map($path)
{
try {
- $match = $this->m->match($path);
- } catch (Exception $e) {
- common_log(LOG_ERR, "Problem getting route for $path - " .
- $e->getMessage());
+ return $this->m->match($path);
+ } catch (NoRouteMapException $e) {
+ common_debug($e->getMessage());
// TRANS: Client error on action trying to visit a non-existing page.
- $cac = new ClientErrorAction(_('Page not found.'), 404);
- $cac->showPage();
+ throw new ClientException(_('Page not found.'), 404);
}
-
- return $match;
}
function build($action, $args=null, $params=null, $fragment=null)