diff options
| author | Evan Prodromou <evan@status.net> | 2009-12-15 16:24:52 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-12-15 16:24:52 -0500 |
| commit | 2a1468ec8b2918553b490ddaef6bdede3e2d5b1b (patch) | |
| tree | c94a68a1239a5a3c35d5564323967fcd4ff14523 /lib/router.php | |
| parent | e9b733e7f036bc03353ae6dd7b096ea179698a4d (diff) | |
| parent | f3d27cc3ae92e2b7412dd998d7de7a2b58dc8e6a (diff) | |
Merge branch '0.9.x' into testing
Diffstat (limited to 'lib/router.php')
| -rw-r--r-- | lib/router.php | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/lib/router.php b/lib/router.php index 37525319f..474e05996 100644 --- a/lib/router.php +++ b/lib/router.php @@ -99,6 +99,7 @@ class Router 'groupblock', 'groupunblock', 'sandbox', 'unsandbox', 'silence', 'unsilence', + 'repeat', 'deleteuser'); foreach ($main as $a) { @@ -282,12 +283,13 @@ class Router array('action' => 'ApiTimelineFriends', 'id' => '[a-zA-Z0-9]+', 'format' => '(xml|json|rss|atom)')); + $m->connect('api/statuses/home_timeline.:format', - array('action' => 'ApiTimelineFriends', + array('action' => 'ApiTimelineHome', 'format' => '(xml|json|rss|atom)')); $m->connect('api/statuses/home_timeline/:id.:format', - array('action' => 'ApiTimelineFriends', + array('action' => 'ApiTimelineHome', 'id' => '[a-zA-Z0-9]+', 'format' => '(xml|json|rss|atom)')); @@ -318,6 +320,18 @@ class Router 'id' => '[a-zA-Z0-9]+', 'format' => '(xml|json|rss|atom)')); + $m->connect('api/statuses/retweeted_by_me.:format', + array('action' => 'ApiTimelineRetweetedByMe', + 'format' => '(xml|json|atom)')); + + $m->connect('api/statuses/retweeted_to_me.:format', + array('action' => 'ApiTimelineRetweetedToMe', + 'format' => '(xml|json|atom)')); + + $m->connect('api/statuses/retweets_of_me.:format', + array('action' => 'ApiTimelineRetweetsOfMe', + 'format' => '(xml|json|atom)')); + $m->connect('api/statuses/friends.:format', array('action' => 'ApiUserFriends', 'format' => '(xml|json)')); @@ -358,6 +372,16 @@ class Router 'id' => '[0-9]+', '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)')); + // users $m->connect('api/users/show.:format', |