Qvitter API changes (thanks hannes2peer)

[quix0rs-gnu-social.git] / lib / router.php

diff --git a/lib/router.php b/lib/router.php
index 25c436ac928da2f7a3ac7e622f0a38a588b64ec5..0d38d448359f9320b0b76b286a4651d905bd7957 100644 (file)
--- a/lib/router.php
+++ b/lib/router.php
@@ -173,10 +173,6 @@ class Router
 
             $m->connect('main/xrds',
                         array('action' => 'publicxrds'));
-            $m->connect('.well-known/host-meta',
-                        array('action' => 'hostmeta'));
-            $m->connect('main/xrd',
-                        array('action' => 'userxrd'));
 
             // settings
 
@@ -464,6 +460,41 @@ class Router
                               'id' => '[0-9]+',
                               'format' => '(xml|json)'));
 
+            // START qvitter API additions
+
+            $m->connect('api/statuses/favs/:id.json',
+                array('action' => 'ApiStatusesFavs',
+                'id' => '[0-9]+'));
+            
+            $m->connect('api/attachment/:id.json',
+                array('action' => 'ApiAttachment',
+                'id' => '[0-9]+'));
+            
+            $m->connect('api/checkhub.json',
+                array('action' => 'ApiCheckHub'));
+            
+            $m->connect('api/externalprofile/show.json',
+                array('action' => 'ApiExternalProfileShow'));
+
+            $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.json',
+                array('action' => 'ApiAccountUpdateLinkColor'));
+                
+            $m->connect('api/account/update_background_color.json',
+                array('action' => 'ApiAccountUpdateBackgroundColor'));
+
+            $m->connect('api/account/register.json',
+                array('action' => 'ApiAccountRegister'));
+            
+            $m->connect('api/check_nickname.json',
+                array('action' => 'ApiCheckNickname'));
+
+            // END qvitter API additions
+
             // users
 
             $m->connect('api/users/show/:id.:format',
@@ -777,6 +808,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
@@ -791,13 +823,13 @@ 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
 
@@ -879,10 +911,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',
@@ -1051,9 +1086,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',