GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

DirectMessage moved into a plugin, not done yet

Browse Source 
We still have to move some API calls into the new plugin.
This commit is contained in:
Mikael Nordfeldth
2014-11-07 15:47:10 +01:00
parent faae9d069a
commit 68143ff916
18 changed files with 116 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/router.php
View File

@@ -249,12 +249,6 @@ class Router
array('action' => 'conversation'),
array('id' => '[0-9]+'));
$m->connect('message/new', array('action' => 'newmessage'));
$m->connect('message/new?to=:to', array('action' => 'newmessage'), array('to' => Nickname::DISPLAY_FMT));
$m->connect('message/:message',
array('action' => 'showmessage'),
array('message' => '[0-9]+'));
$m->connect('user/:id',
array('action' => 'userbyid'),
array('id' => '[0-9]+'));
@@ -507,21 +501,6 @@ class Router
'screen_name' => Nickname::DISPLAY_FMT,
'format' => '(xml|json)'));
// direct messages
$m->connect('api/direct_messages.:format',
array('action' => 'ApiDirectMessage',
'format' => '(xml|json|rss|atom)'));
$m->connect('api/direct_messages/sent.:format',
array('action' => 'ApiDirectMessage',
'format' => '(xml|json|rss|atom)',
'sent' => true));
$m->connect('api/direct_messages/new.:format',
array('action' => 'ApiDirectMessageNew',
'format' => '(xml|json)'));
// friendships
$m->connect('api/friendships/show.:format',