Moved oEmbed stuff out to a plugin (Oembed).

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

diff --git a/lib/router.php b/lib/router.php
index 0d38d448359f9320b0b76b286a4651d905bd7957..3febbbeff44bee10f34e063215f91f03468db0a6 100644 (file)
--- a/lib/router.php
+++ b/lib/router.php
@@ -168,9 +168,6 @@ class Router
 
             $m->connect('main/tagprofile', array('action' => 'tagprofile'));
 
-            $m->connect('main/oembed',
-                        array('action' => 'oembed'));
-
             $m->connect('main/xrds',
                         array('action' => 'publicxrds'));
 
@@ -397,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',
@@ -462,36 +468,44 @@ class Router
 
             // START qvitter API additions
 
-            $m->connect('api/statuses/favs/:id.json',
-                array('action' => 'ApiStatusesFavs',
-                'id' => '[0-9]+'));
+            $m->connect('api/statuses/favs/:id.:format',
+                        array('action' => 'ApiStatusesFavs',
+                              'id' => '[0-9]+',
+                              'format' => '(xml|json)'));
             
-            $m->connect('api/attachment/:id.json',
-                array('action' => 'ApiAttachment',
-                'id' => '[0-9]+'));
+            $m->connect('api/attachment/:id.:format',
+                        array('action' => 'ApiAttachment',
+                              'id' => '[0-9]+',
+                              'format' => '(xml|json)'));
             
-            $m->connect('api/checkhub.json',
-                array('action' => 'ApiCheckHub'));
+            $m->connect('api/checkhub.:format',
+                        array('action' => 'ApiCheckHub',
+                              'format' => '(xml|json)'));
             
-            $m->connect('api/externalprofile/show.json',
-                array('action' => 'ApiExternalProfileShow'));
+            $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)'));
+                        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_link_color.:format',
+                        array('action' => 'ApiAccountUpdateLinkColor',
+                              'format' => '(xml|json)'));
                 
-            $m->connect('api/account/update_background_color.json',
-                array('action' => 'ApiAccountUpdateBackgroundColor'));
+            $m->connect('api/account/update_background_color.:format',
+                        array('action' => 'ApiAccountUpdateBackgroundColor',
+                              'format' => '(xml|json)'));
 
-            $m->connect('api/account/register.json',
-                array('action' => 'ApiAccountRegister'));
+            $m->connect('api/account/register.:format',
+                        array('action' => 'ApiAccountRegister',
+                              'format' => '(xml|json)'));
             
-            $m->connect('api/check_nickname.json',
-                array('action' => 'ApiCheckNickname'));
+            $m->connect('api/check_nickname.:format',
+                        array('action' => 'ApiCheckNickname',
+                              'format' => '(xml|json)'));
 
             // END qvitter API additions
 
@@ -596,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,
@@ -614,6 +640,7 @@ class Router
                         array('action' => 'ApiFavoriteDestroy',
                               'id' => '[0-9]+',
                               'format' => '(xml|json)'));
+
             // blocks
 
             $m->connect('api/blocks/create/:id.:format',
@@ -643,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
@@ -682,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',
@@ -739,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',
@@ -816,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'));
@@ -835,11 +869,10 @@ class Router
 
             $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'));