X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Frouter.php;h=3febbbeff44bee10f34e063215f91f03468db0a6;hb=1776c90cb98d5ca738db143703fb998612ada31e;hp=8798db89e0524748e2c0013414982c699aba2d78;hpb=fb406a81e2c2ab6c7a09a8ff009a692844f46ac5;p=quix0rs-gnu-social.git diff --git a/lib/router.php b/lib/router.php index 8798db89e0..3febbbeff4 100644 --- a/lib/router.php +++ b/lib/router.php @@ -156,6 +156,7 @@ class Router 'backupaccount', 'deleteaccount', 'restoreaccount', + 'top', ); foreach ($main as $a) { @@ -167,15 +168,8 @@ class Router $m->connect('main/tagprofile', array('action' => 'tagprofile')); - $m->connect('main/oembed', - array('action' => 'oembed')); - $m->connect('main/xrds', array('action' => 'publicxrds')); - $m->connect('.well-known/host-meta', - array('action' => 'hostmeta')); - $m->connect('main/xrd', - array('action' => 'userxrd')); // settings @@ -400,6 +394,15 @@ class Router $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', @@ -463,6 +466,49 @@ class Router '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', + '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', @@ -564,6 +610,18 @@ class Router // favorites + $m->connect('api/favorites/create.:format', + array('action' => 'ApiFavoriteCreate', + 'format' => '(xml|json)')); + + $m->connect('api/favorites/destroy.:format', + array('action' => 'ApiFavoriteDestroy', + 'format' => '(xml|json)')); + + $m->connect('api/favorites/list.:format', + array('action' => 'ApiTimelineFavorites', + 'format' => '(xml|json|rss|atom|as)')); + $m->connect('api/favorites/:id.:format', array('action' => 'ApiTimelineFavorites', 'id' => Nickname::INPUT_FMT, @@ -582,6 +640,7 @@ class Router array('action' => 'ApiFavoriteDestroy', 'id' => '[0-9]+', 'format' => '(xml|json)')); + // blocks $m->connect('api/blocks/create/:id.:format', @@ -611,21 +670,21 @@ class Router // 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 @@ -650,11 +709,11 @@ class Router $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', @@ -707,6 +766,9 @@ class Router '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', @@ -776,6 +838,7 @@ class Router // Tags $m->connect('api/statusnet/tags/timeline/:tag.:format', array('action' => 'ApiTimelineTag', + 'tag' => self::REGEX_TAG, 'format' => '(xml|json|rss|atom|as)')); // media related @@ -783,6 +846,10 @@ class Router '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')); @@ -790,23 +857,22 @@ class Router $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')); @@ -878,10 +944,13 @@ class Router array('action' => 'showfavorites', 'nickname' => $nickname)); + $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', @@ -1050,9 +1119,12 @@ class Router array('action' => 'showfavorites'), array('nickname' => Nickname::DISPLAY_FMT)); + $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',