/**
* URL Router
*
- * Cheap wrapper around Net_URL_Mapper
+ * Cheap wrapper around URLMapper
*
* @category URL
* @package StatusNet
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',
$main = array('login', 'logout', 'register', 'subscribe',
'unsubscribe', 'cancelsubscription', 'approvesub',
'confirmaddress', 'recoverpassword',
- 'invite', 'favor', 'disfavor', 'sup',
+ 'invite', 'sup',
'block', 'unblock', 'subedit',
'groupblock', 'groupunblock',
'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/all', array('action' => 'networkpublic'));
+
$m->connect('main/tagprofile/:id', array('action' => 'tagprofile'),
array('id' => '[0-9]+'));
$m->connect('main/tagprofile', array('action' => 'tagprofile'));
- $m->connect('main/oembed',
- array('action' => 'oembed'));
-
$m->connect('main/xrds',
array('action' => 'publicxrds'));
foreach (array('profile', 'avatar', 'password', 'im', 'oauthconnections',
'oauthapps', 'email', 'sms', 'url') as $s) {
- $m->connect('settings/'.$s, array('action' => $s.'settings'));
+ $m->connect('settings/' . $s, array('action' => $s . 'settings'));
}
if (common_config('oldschool', 'enabled')) {
// 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.
+ // 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'));
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/:notice/file',
- array('action' => 'file'),
- array('notice' => '[0-9]+'));
-
$m->connect('notice/:notice',
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'));
-
- $m->connect('bookmarklet/new', array('action' => 'bookmarklet'));
-
// 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));
- $m->connect('message/:message',
- array('action' => 'showmessage'),
- array('message' => '[0-9]+'));
$m->connect('user/:id',
array('action' => 'userbyid'),
array('action' => 'ApiTimelinePublic',
'format' => '(xml|json|rss|atom|as)'));
+ // this is not part of the Twitter API. Also may require authentication depending on server config!
+ $m->connect('api/statuses/networkpublic_timeline.:format',
+ array('action' => 'ApiTimelineNetworkPublic',
+ 'format' => '(xml|json|rss|atom|as)'));
+
$m->connect('api/statuses/friends_timeline/:id.:format',
array('action' => 'ApiTimelineFriends',
'id' => Nickname::INPUT_FMT,
$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/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/mentions_timeline.:format',
+ array('action' => 'ApiTimelineMentions',
+ 'format' => '(xml|json|rss|atom|as)'));
$m->connect('api/statuses/friends/:id.:format',
array('action' => 'ApiUserFriends',
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/statuses/favs/:id.:format',
- array('action' => 'ApiStatusesFavs',
- 'id' => '[0-9]+',
- 'format' => '(xml|json)'));
$m->connect('api/attachment/:id.:format',
array('action' => 'ApiAttachment',
'screen_name' => Nickname::DISPLAY_FMT,
'format' => '(xml|json)'));
- // direct messages
-
- $m->connect('api/direct_messages.:format',
- array('action' => 'ApiDirectMessage',
- 'format' => '(xml|json|rss|atom)'));
-
- $m->connect('api/direct_messages/sent.:format',
- array('action' => 'ApiDirectMessage',
- 'format' => '(xml|json|rss|atom)',
- 'sent' => true));
-
- $m->connect('api/direct_messages/new.:format',
- array('action' => 'ApiDirectMessageNew',
- 'format' => '(xml|json)'));
-
// friendships
$m->connect('api/friendships/show.: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',
$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',
'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('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'));
'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',
- 'nickname' => $nickname));
-
$m->connect('avatar',
array('action' => 'avatarbynickname',
'nickname' => $nickname));
array('action' => 'rsd',
'nickname' => $nickname));
- $m->connect('',
- array('action' => 'showstream',
- 'nickname' => $nickname));
-
// peopletags
$m->connect('peopletags',
$m->connect('all/:tag',
array('action' => 'showprofiletag',
+ 'nickname' => $nickname,
'tag' => self::REGEX_TAG));
foreach (array('subscriptions', 'subscribers') as $a) {
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') as $a) {
- $m->connect(':nickname/'.$a,
- array('action' => $a),
- array('nickname' => Nickname::DISPLAY_FMT));
- }
- $m->connect(':nickname/subscribers/pending',
- array('action' => 'subqueue'),
+ $m->connect('rss', array('action' => 'publicrss'));
+ $m->connect('featuredrss', array('action' => 'featuredrss'));
+ $m->connect('featured/', array('action' => 'featured'));
+ $m->connect('featured', array('action' => 'featured'));
+ $m->connect('rsd.xml', array('action' => 'rsd'));
+
+ foreach (array('subscriptions', 'subscribers',
+ 'nudge', 'all', 'foaf', 'replies',
+ 'inbox', 'outbox', 'microsummary') as $a) {
+ $m->connect(':nickname/'.$a,
+ array('action' => $a),
array('nickname' => Nickname::DISPLAY_FMT));
+ }
+ $m->connect(':nickname/subscribers/pending',
+ array('action' => 'subqueue'),
+ array('nickname' => Nickname::DISPLAY_FMT));
- // people tags
-
- $m->connect(':nickname/peopletags',
- array('action' => 'peopletagsbyuser',
- 'nickname' => Nickname::DISPLAY_FMT));
-
- $m->connect(':nickname/peopletags/private',
- array('action' => 'peopletagsbyuser',
- 'nickname' => Nickname::DISPLAY_FMT,
- 'private' => 1));
-
- $m->connect(':nickname/peopletags/public',
- array('action' => 'peopletagsbyuser',
- 'nickname' => Nickname::DISPLAY_FMT,
- 'public' => 1));
+ // 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));
+ }
- $m->connect(':nickname/othertags',
- array('action' => 'peopletagsforuser',
- 'nickname' => Nickname::DISPLAY_FMT));
+ // people tags
- $m->connect(':nickname/peopletagsubscriptions',
- array('action' => 'peopletagsubscriptions',
- 'nickname' => Nickname::DISPLAY_FMT));
+ $m->connect(':nickname/peopletags',
+ array('action' => 'peopletagsbyuser',
+ 'nickname' => Nickname::DISPLAY_FMT));
- $m->connect(':tagger/all/:tag/subscribers',
- array('action' => 'peopletagsubscribers',
- 'tagger' => Nickname::DISPLAY_FMT,
- 'tag' => self::REGEX_TAG));
+ $m->connect(':nickname/peopletags/private',
+ array('action' => 'peopletagsbyuser',
+ 'nickname' => Nickname::DISPLAY_FMT,
+ 'private' => 1));
- $m->connect(':tagger/all/:tag/tagged',
- array('action' => 'peopletagged',
- 'tagger' => Nickname::DISPLAY_FMT,
- 'tag' => self::REGEX_TAG));
+ $m->connect(':nickname/peopletags/public',
+ array('action' => 'peopletagsbyuser',
+ 'nickname' => Nickname::DISPLAY_FMT,
+ 'public' => 1));
- $m->connect(':tagger/all/:tag/edit',
- array('action' => 'editpeopletag',
- 'tagger' => Nickname::DISPLAY_FMT,
- 'tag' => self::REGEX_TAG));
+ $m->connect(':nickname/othertags',
+ array('action' => 'peopletagsforuser',
+ 'nickname' => Nickname::DISPLAY_FMT));
- 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(':nickname/peopletagsubscriptions',
+ array('action' => 'peopletagsubscriptions',
+ 'nickname' => Nickname::DISPLAY_FMT));
- $m->connect(':tagger/all/:tag',
- array('action' => 'showprofiletag',
- 'tagger' => Nickname::DISPLAY_FMT,
- 'tag' => self::REGEX_TAG));
+ $m->connect(':tagger/all/:tag/subscribers',
+ array('action' => 'peopletagsubscribers',
+ 'tagger' => Nickname::DISPLAY_FMT,
+ 'tag' => self::REGEX_TAG));
- foreach (array('subscriptions', 'subscribers') as $a) {
- $m->connect(':nickname/'.$a.'/:tag',
- array('action' => $a),
- array('tag' => self::REGEX_TAG,
- 'nickname' => Nickname::DISPLAY_FMT));
- }
+ $m->connect(':tagger/all/:tag/tagged',
+ array('action' => 'peopletagged',
+ 'tagger' => Nickname::DISPLAY_FMT,
+ 'tag' => self::REGEX_TAG));
- foreach (array('rss', 'groups') as $a) {
- $m->connect(':nickname/'.$a,
- array('action' => 'user'.$a),
- array('nickname' => Nickname::DISPLAY_FMT));
- }
+ $m->connect(':tagger/all/:tag/edit',
+ array('action' => 'editpeopletag',
+ 'tagger' => Nickname::DISPLAY_FMT,
+ 'tag' => self::REGEX_TAG));
- foreach (array('all', 'replies', 'favorites') as $a) {
- $m->connect(':nickname/'.$a.'/rss',
- array('action' => $a.'rss'),
- array('nickname' => Nickname::DISPLAY_FMT));
- }
+ 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(':nickname/all/:tag',
+ array('action' => 'showprofiletag'),
+ array('nickname' => Nickname::DISPLAY_FMT,
+ 'tag' => self::REGEX_TAG));
- $m->connect(':nickname/favorites',
- array('action' => 'showfavorites'),
- array('nickname' => Nickname::DISPLAY_FMT));
+ foreach (array('subscriptions', 'subscribers') as $a) {
+ $m->connect(':nickname/'.$a.'/:tag',
+ array('action' => $a),
+ array('tag' => self::REGEX_TAG,
+ 'nickname' => Nickname::DISPLAY_FMT));
+ }
- $m->connect(':nickname/avatar',
- array('action' => 'avatarbynickname'),
+ foreach (array('rss', 'groups') as $a) {
+ $m->connect(':nickname/'.$a,
+ array('action' => 'user'.$a),
array('nickname' => Nickname::DISPLAY_FMT));
- $m->connect(':nickname/avatar/:size',
- array('action' => 'avatarbynickname'),
- array('size' => '(|original|\d+)',
- 'nickname' => Nickname::DISPLAY_FMT));
+ }
- $m->connect(':nickname/tag/:tag/rss',
- array('action' => 'userrss'),
- array('nickname' => Nickname::DISPLAY_FMT),
- array('tag' => self::REGEX_TAG));
+ $m->connect(':nickname/avatar',
+ array('action' => 'avatarbynickname'),
+ array('nickname' => Nickname::DISPLAY_FMT));
+ $m->connect(':nickname/avatar/:size',
+ array('action' => 'avatarbynickname'),
+ array('size' => '(|original|\d+)',
+ 'nickname' => Nickname::DISPLAY_FMT));
+
+ $m->connect(':nickname/tag/:tag/rss',
+ array('action' => 'userrss'),
+ array('nickname' => Nickname::DISPLAY_FMT),
+ array('tag' => self::REGEX_TAG));
- $m->connect(':nickname/tag/:tag',
- array('action' => 'showstream'),
- array('nickname' => Nickname::DISPLAY_FMT),
- array('tag' => self::REGEX_TAG));
+ $m->connect(':nickname/tag/:tag',
+ array('action' => 'showstream'),
+ array('nickname' => Nickname::DISPLAY_FMT),
+ array('tag' => self::REGEX_TAG));
- $m->connect(':nickname/rsd.xml',
- array('action' => 'rsd'),
- array('nickname' => Nickname::DISPLAY_FMT));
+ $m->connect(':nickname/rsd.xml',
+ array('action' => 'rsd'),
+ array('nickname' => Nickname::DISPLAY_FMT));
- $m->connect(':nickname',
- array('action' => 'showstream'),
- array('nickname' => Nickname::DISPLAY_FMT));
+ $m->connect(':nickname',
+ array('action' => 'showstream'),
+ array('nickname' => Nickname::DISPLAY_FMT));
- $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