]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' into refactor-api
authorZach Copley <zach@status.net>
Thu, 1 Oct 2009 23:17:43 +0000 (16:17 -0700)
committerZach Copley <zach@status.net>
Thu, 1 Oct 2009 23:17:43 +0000 (16:17 -0700)
* 0.9.x:
  change DB so OpenIDPlugin manages OpenID tables
  Some bug fixes
  check the schema
  add some more methods to Schema
  Added hook for Aside container
  Revert "Outputting UTF-8 charset in document header irrespective of mimetype."
  FOAF for Groups.
  use schema tool to create a table
  statusize schema-related modules
  test script for schema code
  make table def method of schema code work
  start a module for schema management

1  2 
lib/router.php

diff --combined lib/router.php
index 1ea06afe08a7a66bf435421560f31d238aaafb02,91f886bce1111eebe3b990118811b4822ab0eb5c..3de4e322f9e7d53ad06f131603a19317c7d1a911
@@@ -241,6 -241,10 +241,10 @@@ class Route
                          array('nickname' => '[a-zA-Z0-9]+'));
          }
  
+         $m->connect('group/:nickname/foaf',
+                     array('action' => 'foafgroup'),
+                     array('nickname' => '[a-zA-Z0-9]+'));
          $m->connect('group/:nickname/blocked',
                      array('action' => 'blockedfromgroup'),
                      array('nickname' => '[a-zA-Z0-9]+'));
  
          // statuses API
  
 -        $m->connect('api/statuses/:method',
 -                    array('action' => 'api',
 -                          'apiaction' => 'statuses'),
 -                    array('method' => '(public_timeline|home_timeline|friends_timeline|user_timeline|update|replies|mentions|show|friends|followers|featured)(\.(atom|rss|xml|json))?'));
 +        $m->connect('api/statuses/public_timeline.:format',
 +                    array('action' => 'ApiPublicTimeline',
 +                    'format' => '(xml|json|rss|atom)'));
 +
 +        $m->connect('api/statuses/friends_timeline.:format',
 +                    array('action' => 'ApiFriendsTimeline',
 +                          'format' => '(xml|json|rss|atom)'));
 +
 +        $m->connect('api/statuses/friends_timeline/:id.:format',
 +                    array('action' => 'ApiFriendsTimeline',
 +                          'id' => '[a-zA-Z0-9]+',
 +                          'format' => '(xml|json|rss|atom)'));
 +        $m->connect('api/statuses/home_timeline.:format',
 +                    array('action' => 'ApiFriendsTimeline',
 +                          'format' => '(xml|json|rss|atom)'));
 +
 +        $m->connect('api/statuses/home_timeline/:id.:format',
 +                    array('action' => 'ApiFriendsTimeline',
 +                          'id' => '[a-zA-Z0-9]+',
 +                          'format' => '(xml|json|rss|atom)'));
 +
 +        $m->connect('api/statuses/user_timeline.:format',
 +                    array('action' => 'ApiUserTimeline',
 +                    'format' => '(xml|json|rss|atom)'));
 +
 +        $m->connect('api/statuses/user_timeline/:id.:format',
 +                    array('action' => 'ApiUserTimeline',
 +                    'id' => '[a-zA-Z0-9]+',
 +                    'format' => '(xml|json|rss|atom)'));
 +
 +        $m->connect('api/statuses/mentions.:format',
 +                    array('action' => 'ApiMentions',
 +                    'format' => '(xml|json|rss|atom)'));
 +
 +        $m->connect('api/statuses/mentions/:id.:format',
 +                    array('action' => 'ApiMentions',
 +                    'id' => '[a-zA-Z0-9]+',
 +                    'format' => '(xml|json|rss|atom)'));
 +
 +        $m->connect('api/statuses/replies.:format',
 +                    array('action' => 'ApiMentions',
 +                    'format' => '(xml|json|rss|atom)'));
 +
 +        $m->connect('api/statuses/replies/:id.:format',
 +                    array('action' => 'ApiMentions',
 +                    'id' => '[a-zA-Z0-9]+',
 +                    'format' => '(xml|json|rss|atom)'));
 +
 +        $m->connect('api/statuses/friends.:format',
 +                     array('action' => 'ApiFriends',
 +                           'format' => '(xml|json)'));
 +
 +        $m->connect('api/statuses/friends/:id.:format',
 +                    array('action' => 'ApiFriends',
 +                    'id' => '[a-zA-Z0-9]+',
 +                    'format' => '(xml|json)'));
 +
 +        $m->connect('api/statuses/followers.:format',
 +                     array('action' => 'ApiFollowers',
 +                           'format' => '(xml|json)'));
 +
 +        $m->connect('api/statuses/followers/:id.:format',
 +                    array('action' => 'ApiFollowers',
 +                    'id' => '[a-zA-Z0-9]+',
 +                    'format' => '(xml|json)'));
 +
 +        $m->connect('api/statuses/show.:format',
 +                    array('action' => 'ApiShow',
 +                          'format' => '(xml|json)'));
 +
 +        $m->connect('api/statuses/show/:id.:format',
 +                    array('action' => 'ApiShow',
 +                          'id' => '[a-zA-Z0-9]+',
 +                          'format' => '(xml|json)'));
 +
 +        $m->connect('api/statuses/update.:format',
 +                    array('action' => 'ApiUpdate',
 +                          'format' => '(xml|json)'));
  
          $m->connect('api/statuses/:method/:argument',
                      array('action' => 'api',
                            'apiaction' => 'statuses'),
 -                    array('method' => '(user_timeline|home_timeline|friends_timeline|replies|mentions|show|destroy|friends|followers)'));
 +                    array('method' => 'destroy'));
  
          // users
  
  
          // Social graph
  
 -        $m->connect('api/friends/ids/:argument',
 -                    array('action' => 'api',
 -                          'apiaction' => 'statuses',
 -                          'method' => 'friendsIDs'));
 +        $m->connect('api/friends/ids/:id.:format',
 +                    array('action' => 'apiFriends',
 +                          'ids_only' => true));
  
 -        foreach (array('xml', 'json') as $e) {
 -            $m->connect('api/friends/ids.'.$e,
 -                        array('action' => 'api',
 -                              'apiaction' => 'statuses',
 -                              'method' => 'friendsIDs.'.$e));
 -        }
 +        $m->connect('api/followers/ids/:id.:format',
 +                    array('action' => 'apiFollowers',
 +                          'ids_only' => true));
  
 -        $m->connect('api/followers/ids/:argument',
 -                    array('action' => 'api',
 -                          'apiaction' => 'statuses',
 -                          'method' => 'followersIDs'));
 +        $m->connect('api/friends/ids.:format',
 +                    array('action' => 'apiFriends',
 +                          'ids_only' => true));
  
 -        foreach (array('xml', 'json') as $e) {
 -            $m->connect('api/followers/ids.'.$e,
 -                        array('action' => 'api',
 -                              'apiaction' => 'statuses',
 -                              'method' => 'followersIDs.'.$e));
 -        }
 +        $m->connect('api/followers/ids.:format',
 +                     array('action' => 'apiFollowers',
 +                          'ids_only' => true));
  
          // account