/**
* URL Router
*
- * Cheap wrapper around Net_URL_Mapper
+ * Cheap wrapper around URLMapper
*
* @category URL
* @package StatusNet
array('user_id' => '[0-9]+',
'token' => '.+'));
+ // these take a code; before the main part
+
+ foreach (array('register', 'confirmaddress', 'recoverpassword') as $c) {
+ $m->connect('main/'.$c.'/:code', array('action' => $c));
+ }
+
+ // Also need a block variant accepting ID on URL for mail links
+ $m->connect('main/block/:profileid',
+ array('action' => 'block'),
+ array('profileid' => '[0-9]+'));
+
+ $m->connect('main/sup/:seconds', array('action' => 'sup'),
+ array('seconds' => '[0-9]+'));
+
// main stuff is repetitive
$main = array('login', 'logout', 'register', 'subscribe',
'unsubscribe', 'cancelsubscription', 'approvesub',
'confirmaddress', 'recoverpassword',
- 'invite', 'favor', 'disfavor', 'sup',
+ 'invite', 'sup',
'block', 'unblock', 'subedit',
'groupblock', 'groupunblock',
'sandbox', 'unsandbox',
'backupaccount',
'deleteaccount',
'restoreaccount',
+ 'top',
);
foreach ($main as $a) {
$m->connect('main/'.$a, array('action' => $a));
}
- // Also need a block variant accepting ID on URL for mail links
- $m->connect('main/block/:profileid',
- array('action' => 'block'),
- array('profileid' => '[0-9]+'));
-
- $m->connect('main/sup/:seconds', array('action' => 'sup'),
- array('seconds' => '[0-9]+'));
-
- $m->connect('main/tagprofile', array('action' => 'tagprofile'));
$m->connect('main/tagprofile/:id', array('action' => 'tagprofile'),
array('id' => '[0-9]+'));
- $m->connect('main/oembed',
- array('action' => 'oembed'));
+ $m->connect('main/tagprofile', array('action' => 'tagprofile'));
$m->connect('main/xrds',
array('action' => 'publicxrds'));
- $m->connect('.well-known/host-meta',
- array('action' => 'hostmeta'));
- $m->connect('main/xrd',
- array('action' => 'userxrd'));
-
- // these take a code
-
- foreach (array('register', 'confirmaddress', 'recoverpassword') as $c) {
- $m->connect('main/'.$c.'/:code', array('action' => $c));
- }
// settings
$m->connect('settings/'.$s, array('action' => $s.'settings'));
}
+ if (common_config('oldschool', 'enabled')) {
+ $m->connect('settings/oldschool', array('action' => 'oldschoolsettings'));
+ }
+
$m->connect('settings/oauthapps/show/:id',
array('action' => 'showapplication'),
array('id' => '[0-9]+')
// search
foreach (array('group', 'people', 'notice') as $s) {
- $m->connect('search/'.$s, array('action' => $s.'search'));
$m->connect('search/'.$s.'?q=:q',
array('action' => $s.'search'),
array('q' => '.+'));
+ $m->connect('search/'.$s, array('action' => $s.'search'));
}
// The second of these is needed to make the link work correctly
// when inserted into the page. The first is needed to match the
- // route on the way in. Seems to be another Net_URL_Mapper bug to me.
- $m->connect('search/notice/rss', array('action' => 'noticesearchrss'));
+ // route on the way in. Seems to be another URLMapper bug to me.
$m->connect('search/notice/rss?q=:q', array('action' => 'noticesearchrss'),
array('q' => '.+'));
+ $m->connect('search/notice/rss', array('action' => 'noticesearchrss'));
$m->connect('attachment/:attachment',
array('action' => 'attachment'),
array('attachment' => '[0-9]+'));
- $m->connect('attachment/:attachment/ajax',
- array('action' => 'attachment_ajax'),
- array('attachment' => '[0-9]+'));
-
$m->connect('attachment/:attachment/thumbnail',
array('action' => 'attachment_thumbnail'),
array('attachment' => '[0-9]+'));
- $m->connect('notice/new', array('action' => 'newnotice'));
- $m->connect('notice/new?replyto=:replyto',
- array('action' => 'newnotice'),
- array('replyto' => Nickname::DISPLAY_FMT));
$m->connect('notice/new?replyto=:replyto&inreplyto=:inreplyto',
array('action' => 'newnotice'),
array('replyto' => Nickname::DISPLAY_FMT),
array('inreplyto' => '[0-9]+'));
- $m->connect('notice/:notice/file',
- array('action' => 'file'),
- array('notice' => '[0-9]+'));
+ $m->connect('notice/new?replyto=:replyto',
+ array('action' => 'newnotice'),
+ array('replyto' => Nickname::DISPLAY_FMT));
+
+ $m->connect('notice/new', array('action' => 'newnotice'));
$m->connect('notice/:notice',
array('action' => 'shownotice'),
array('notice' => '[0-9]+'));
- $m->connect('notice/delete', array('action' => 'deletenotice'));
+
$m->connect('notice/delete/:notice',
array('action' => 'deletenotice'),
array('notice' => '[0-9]+'));
- $m->connect('bookmarklet/new', array('action' => 'bookmarklet'));
+ $m->connect('notice/delete', array('action' => 'deletenotice'));
// conversation
$m->connect('conversation/:id',
array('action' => 'conversation'),
array('id' => '[0-9]+'));
- $m->connect('conversation/:id/replies',
- array('action' => 'conversationreplies'),
- array('id' => '[0-9]+'));
$m->connect('message/new', array('action' => 'newmessage'));
$m->connect('message/new?to=:to', array('action' => 'newmessage'), array('to' => Nickname::DISPLAY_FMT));
array('action' => 'userbyid'),
array('id' => '[0-9]+'));
- $m->connect('tags/', array('action' => 'publictagcloud'));
- $m->connect('tag/', array('action' => 'publictagcloud'));
- $m->connect('tags', array('action' => 'publictagcloud'));
- $m->connect('tag', array('action' => 'publictagcloud'));
+ 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' => 'showgroup'),
array('nickname' => Nickname::DISPLAY_FMT));
+ $m->connect('group/:nickname/',
+ array('action' => 'showgroup'),
+ array('nickname' => Nickname::DISPLAY_FMT));
+
$m->connect('group/', array('action' => 'groups'));
$m->connect('group', array('action' => 'groups'));
$m->connect('groups/', array('action' => 'groups'));
$m->connect('api/statuses/replies.:format',
array('action' => 'ApiTimelineMentions',
'format' => '(xml|json|rss|atom|as)'));
+
+ $m->connect('api/statuses/mentions_timeline/:id.:format',
+ array('action' => 'ApiTimelineMentions',
+ 'id' => Nickname::INPUT_FMT,
+ 'format' => '(xml|json|rss|atom|as)'));
+
+ $m->connect('api/statuses/mentions_timeline.:format',
+ array('action' => 'ApiTimelineMentions',
+ 'format' => '(xml|json|rss|atom|as)'));
$m->connect('api/statuses/retweeted_by_me.:format',
array('action' => 'ApiTimelineRetweetedByMe',
'id' => '[0-9]+',
'format' => '(xml|json)'));
+ // START qvitter API additions
+
+ $m->connect('api/attachment/:id.:format',
+ array('action' => 'ApiAttachment',
+ 'id' => '[0-9]+',
+ 'format' => '(xml|json)'));
+
+ $m->connect('api/checkhub.:format',
+ array('action' => 'ApiCheckHub',
+ 'format' => '(xml|json)'));
+
+ $m->connect('api/externalprofile/show.:format',
+ array('action' => 'ApiExternalProfileShow',
+ 'format' => '(xml|json)'));
+
+ $m->connect('api/statusnet/groups/admins/:id.:format',
+ array('action' => 'ApiGroupAdmins',
+ 'id' => Nickname::INPUT_FMT,
+ 'format' => '(xml|json)'));
+
+ $m->connect('api/account/update_link_color.:format',
+ array('action' => 'ApiAccountUpdateLinkColor',
+ 'format' => '(xml|json)'));
+
+ $m->connect('api/account/update_background_color.:format',
+ array('action' => 'ApiAccountUpdateBackgroundColor',
+ 'format' => '(xml|json)'));
+
+ $m->connect('api/account/register.:format',
+ array('action' => 'ApiAccountRegister',
+ 'format' => '(xml|json)'));
+
+ $m->connect('api/check_nickname.:format',
+ array('action' => 'ApiCheckNickname',
+ 'format' => '(xml|json)'));
+
+ // END qvitter API additions
+
// users
$m->connect('api/users/show/:id.:format',
$m->connect('api/account/rate_limit_status.:format',
array('action' => 'ApiAccountRateLimitStatus'));
- // favorites
-
- $m->connect('api/favorites/:id.:format',
- array('action' => 'ApiTimelineFavorites',
- 'id' => Nickname::INPUT_FMT,
- 'format' => '(xml|json|rss|atom|as)'));
-
- $m->connect('api/favorites.:format',
- array('action' => 'ApiTimelineFavorites',
- 'format' => '(xml|json|rss|atom|as)'));
-
- $m->connect('api/favorites/create/:id.:format',
- array('action' => 'ApiFavoriteCreate',
- 'id' => '[0-9]+',
- 'format' => '(xml|json)'));
-
- $m->connect('api/favorites/destroy/:id.:format',
- array('action' => 'ApiFavoriteDestroy',
- 'id' => '[0-9]+',
- 'format' => '(xml|json)'));
// blocks
$m->connect('api/blocks/create/:id.:format',
// statusnet
$m->connect('api/statusnet/version.:format',
- array('action' => 'ApiStatusnetVersion',
+ array('action' => 'ApiGNUsocialVersion',
'format' => '(xml|json)'));
$m->connect('api/statusnet/config.:format',
- array('action' => 'ApiStatusnetConfig',
+ array('action' => 'ApiGNUsocialConfig',
'format' => '(xml|json)'));
- // For older methods, we provide "laconica" base action
+ // For our current software name, we provide "gnusocial" base action
- $m->connect('api/laconica/version.:format',
- array('action' => 'ApiStatusnetVersion',
+ $m->connect('api/gnusocial/version.:format',
+ array('action' => 'ApiGNUsocialVersion',
'format' => '(xml|json)'));
- $m->connect('api/laconica/config.:format',
- array('action' => 'ApiStatusnetConfig',
+ $m->connect('api/gnusocial/config.:format',
+ array('action' => 'ApiGNUsocialConfig',
'format' => '(xml|json)'));
// Groups and tags are newer than 0.8.1 so no backward-compatibility
$m->connect('api/statusnet/groups/join/:id.:format',
array('action' => 'ApiGroupJoin',
+ 'id' => Nickname::INPUT_FMT,
'format' => '(xml|json)'));
$m->connect('api/statusnet/groups/join.:format',
array('action' => 'ApiGroupJoin',
- 'id' => Nickname::INPUT_FMT,
'format' => '(xml|json)'));
$m->connect('api/statusnet/groups/leave/:id.:format',
'format' => '(xml|json|rss|atom|as)'));
// Lists (people tags)
+ $m->connect('api/lists/list.:format',
+ array('action' => 'ApiListSubscriptions',
+ 'format' => '(xml|json)'));
$m->connect('api/lists/memberships.:format',
array('action' => 'ApiListMemberships',
// Tags
$m->connect('api/statusnet/tags/timeline/:tag.:format',
array('action' => 'ApiTimelineTag',
+ 'tag' => self::REGEX_TAG,
'format' => '(xml|json|rss|atom|as)'));
// media related
'api/statusnet/media/upload',
array('action' => 'ApiMediaUpload')
);
+ $m->connect(
+ 'api/statuses/update_with_media.json',
+ array('action' => 'ApiMediaUpload')
+ );
// search
$m->connect('api/search.atom', array('action' => 'ApiSearchAtom'));
$m->connect('api/trends.json', array('action' => 'ApiTrends'));
$m->connect('api/oauth/request_token',
- array('action' => 'ApiOauthRequestToken'));
+ array('action' => 'ApiOAuthRequestToken'));
$m->connect('api/oauth/access_token',
- array('action' => 'ApiOauthAccessToken'));
+ array('action' => 'ApiOAuthAccessToken'));
$m->connect('api/oauth/authorize',
- array('action' => 'ApiOauthAuthorize'));
+ array('action' => 'ApiOAuthAuthorize'));
// Admin
$m->connect('panel/site', array('action' => 'siteadminpanel'));
$m->connect('panel/user', array('action' => 'useradminpanel'));
- $m->connect('panel/access', array('action' => 'accessadminpanel'));
+ $m->connect('panel/access', array('action' => 'accessadminpanel'));
$m->connect('panel/paths', array('action' => 'pathsadminpanel'));
$m->connect('panel/sessions', array('action' => 'sessionsadminpanel'));
$m->connect('panel/sitenotice', array('action' => 'sitenoticeadminpanel'));
- $m->connect('panel/snapshot', array('action' => 'snapshotadminpanel'));
$m->connect('panel/license', array('action' => 'licenseadminpanel'));
$m->connect('panel/plugins', array('action' => 'pluginsadminpanel'));
array('action' => 'getfile'),
array('filename' => '[A-Za-z0-9._-]+'));
+ // Common people-tag stuff
+
+ $m->connect('peopletag/:tag', array('action' => 'peopletag',
+ 'tag' => self::REGEX_TAG));
+
+ $m->connect('selftag/:tag', array('action' => 'selftag',
+ 'tag' => self::REGEX_TAG));
+
+ $m->connect('main/addpeopletag', array('action' => 'addpeopletag'));
+
+ $m->connect('main/removepeopletag', array('action' => 'removepeopletag'));
+
+ $m->connect('main/profilecompletion', array('action' => 'profilecompletion'));
+
+ $m->connect('main/peopletagautocomplete', array('action' => 'peopletagautocomplete'));
+
// In the "root"
if (common_config('singleuser', 'enabled')) {
foreach (array('subscriptions', 'subscribers',
'all', 'foaf', 'replies',
- 'microsummary', 'hcard') as $a) {
+ 'microsummary') as $a) {
$m->connect($a,
array('action' => $a,
'nickname' => $nickname));
'nickname' => $nickname));
}
- foreach (array('all', 'replies', 'favorites') as $a) {
+ foreach (array('all', 'replies') as $a) {
$m->connect($a.'/rss',
array('action' => $a.'rss',
'nickname' => $nickname));
}
- $m->connect('favorites',
- array('action' => 'showfavorites',
+ $m->connect('avatar',
+ array('action' => 'avatarbynickname',
'nickname' => $nickname));
-
$m->connect('avatar/:size',
array('action' => 'avatarbynickname',
'nickname' => $nickname),
- array('size' => '(original|96|48|24)'));
+ array('size' => '(|original|\d+)'));
$m->connect('tag/:tag/rss',
array('action' => 'userrss',
$m->connect('',
array('action' => 'showstream',
'nickname' => $nickname));
+
+ // peopletags
+
+ $m->connect('peopletags',
+ array('action' => 'peopletagsbyuser'));
+
+ $m->connect('peopletags/private',
+ array('action' => 'peopletagsbyuser',
+ 'private' => 1));
+
+ $m->connect('peopletags/public',
+ array('action' => 'peopletagsbyuser',
+ 'public' => 1));
+
+ $m->connect('othertags',
+ array('action' => 'peopletagsforuser'));
+
+ $m->connect('peopletagsubscriptions',
+ array('action' => 'peopletagsubscriptions'));
+
+ $m->connect('all/:tag/subscribers',
+ array('action' => 'peopletagsubscribers',
+ 'tag' => self::REGEX_TAG));
+
+ $m->connect('all/:tag/tagged',
+ array('action' => 'peopletagged',
+ 'tag' => self::REGEX_TAG));
+
+ $m->connect('all/:tag/edit',
+ array('action' => 'editpeopletag',
+ 'tag' => self::REGEX_TAG));
+
+ foreach(array('subscribe', 'unsubscribe') as $v) {
+ $m->connect('peopletag/:id/'.$v,
+ array('action' => $v.'peopletag',
+ 'id' => '[0-9]{1,64}'));
+ }
+ $m->connect('user/:tagger_id/profiletag/:id/id',
+ array('action' => 'profiletagbyid',
+ 'tagger_id' => '[0-9]+',
+ 'id' => '[0-9]+'));
+
+ $m->connect('all/:tag',
+ array('action' => 'showprofiletag',
+ 'tag' => self::REGEX_TAG));
+
+ foreach (array('subscriptions', 'subscribers') as $a) {
+ $m->connect($a.'/:tag',
+ array('action' => $a),
+ array('tag' => self::REGEX_TAG));
+ }
} else {
$m->connect('', array('action' => 'public'));
$m->connect('rss', array('action' => 'publicrss'));
$m->connect('featuredrss', array('action' => 'featuredrss'));
- $m->connect('favoritedrss', array('action' => 'favoritedrss'));
$m->connect('featured/', array('action' => 'featured'));
$m->connect('featured', array('action' => 'featured'));
- $m->connect('favorited/', array('action' => 'favorited'));
- $m->connect('favorited', array('action' => 'favorited'));
$m->connect('rsd.xml', array('action' => 'rsd'));
foreach (array('subscriptions', 'subscribers',
'nudge', 'all', 'foaf', 'replies',
- 'inbox', 'outbox', 'microsummary', 'hcard') as $a) {
+ 'inbox', 'outbox', 'microsummary') as $a) {
$m->connect(':nickname/'.$a,
array('action' => $a),
array('nickname' => Nickname::DISPLAY_FMT));
// people tags
- $m->connect('peopletags', array('action' => 'publicpeopletagcloud'));
-
- $m->connect('peopletag/:tag', array('action' => 'peopletag',
- 'tag' => self::REGEX_TAG));
-
- $m->connect('selftag/:tag', array('action' => 'selftag',
- 'tag' => self::REGEX_TAG));
-
- $m->connect('main/addpeopletag', array('action' => 'addpeopletag'));
-
- $m->connect('main/removepeopletag', array('action' => 'removepeopletag'));
-
- $m->connect('main/profilecompletion', array('action' => 'profilecompletion'));
-
- $m->connect('main/peopletagautocomplete', array('action' => 'peopletagautocomplete'));
-
$m->connect(':nickname/peopletags',
array('action' => 'peopletagsbyuser',
'nickname' => Nickname::DISPLAY_FMT));
array('nickname' => Nickname::DISPLAY_FMT));
}
- foreach (array('all', 'replies', 'favorites') as $a) {
+ foreach (array('all', 'replies') as $a) {
$m->connect(':nickname/'.$a.'/rss',
array('action' => $a.'rss'),
array('nickname' => Nickname::DISPLAY_FMT));
}
- $m->connect(':nickname/favorites',
- array('action' => 'showfavorites'),
+ $m->connect(':nickname/avatar',
+ array('action' => 'avatarbynickname'),
array('nickname' => Nickname::DISPLAY_FMT));
-
$m->connect(':nickname/avatar/:size',
array('action' => 'avatarbynickname'),
- array('size' => '(original|96|48|24)',
+ array('size' => '(|original|\d+)',
'nickname' => Nickname::DISPLAY_FMT));
$m->connect(':nickname/tag/:tag/rss',
$m->connect(':nickname',
array('action' => 'showstream'),
array('nickname' => Nickname::DISPLAY_FMT));
+
+ $m->connect(':nickname/',
+ array('action' => 'showstream'),
+ array('nickname' => Nickname::DISPLAY_FMT));
}
// AtomPub API
array('action' => 'AtomPubSubscriptionFeed'),
array('subscriber' => '[0-9]+'));
- $m->connect('api/statusnet/app/favorites/:profile/:notice.atom',
- array('action' => 'AtomPubShowFavorite'),
- array('profile' => '[0-9]+',
- 'notice' => '[0-9]+'));
-
- $m->connect('api/statusnet/app/favorites/:profile.atom',
- array('action' => 'AtomPubFavoriteFeed'),
- array('profile' => '[0-9]+'));
-
$m->connect('api/statusnet/app/memberships/:profile/:group.atom',
array('action' => 'AtomPubShowMembership'),
array('profile' => '[0-9]+',
}
$url = $this->m->generate($args, $params, $fragment);
- // Due to a bug in the Net_URL_Mapper code, the returned URL may
+ // Due to a bug in the URLMapper code, the returned URL may
// contain a malformed query of the form ?p1=v1?p2=v2?p3=v3. We
// repair that here rather than modifying the upstream code...
projects / quix0rs-gnu-social.git / blobdiff