summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-02-28 15:12:31 -0800
committerEvan Prodromou <evan@controlyourself.ca>2009-02-28 15:12:31 -0800
commit02ba71b0f186b406071a97c3267603d4863a4b21 (patch)
treed99d4a38e8844cf4653e6bccc6187f7e3efe0bf6 /lib
parentbaf5afb26339f410a24a7ae5064d6c7a9029e86c (diff)
start conversation action
Diffstat (limited to 'lib')
-rw-r--r--lib/router.php11
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/router.php b/lib/router.php
index b18a5523e..4c036e7b2 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -143,6 +143,12 @@ class Router
array('action' => 'deletenotice'),
array('notice' => '[0-9]+'));
+ // conversation
+
+ $m->connect('conversation/:id',
+ array('action' => 'conversation'),
+ array('id' => '[0-9]+'));
+
$m->connect('message/new', array('action' => 'newmessage'));
$m->connect('message/:message',
array('action' => 'showmessage'),
@@ -265,21 +271,20 @@ class Router
'apiaction' => 'friendships'),
array('method' => 'exists(\.(xml|json|rss|atom))'));
-
// Social graph
$m->connect('api/friends/ids/:argument',
array('action' => 'api',
'apiaction' => 'statuses',
'method' => 'friendsIDs'));
-
+
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/:argument',
array('action' => 'api',
'apiaction' => 'statuses',