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

Make get_group() behave more like get_user()

Browse Source
This commit is contained in:
Zach Copley 2009-07-10 18:22:19 -07:00
parent 6b0468358b
commit 0ac08c1fb3
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/router.php
View File

@ -399,6 +399,10 @@ class Router
array('action' => 'api', array('action' => 'api',
'apiaction' => 'groups')); 'apiaction' => 'groups'));
$m->connect('api/laconica/groups/:method',
array('action' => 'api',
'apiaction' => 'groups'));
// search // search
$m->connect('api/search.atom', array('action' => 'twitapisearchatom')); $m->connect('api/search.atom', array('action' => 'twitapisearchatom'));
$m->connect('api/search.json', array('action' => 'twitapisearchjson')); $m->connect('api/search.json', array('action' => 'twitapisearchjson'));

14
lib/twitterapi.php
View File

@ -779,19 +779,19 @@ class TwitterapiAction extends Action
if (empty($id)) { if (empty($id)) {
if (is_numeric($this->arg('id'))) { if (is_numeric($this->arg('id'))) {
return User::staticGet($this->arg('id')); return User_group::staticGet($this->arg('id'));
} else if ($this->arg('id')) { } else if ($this->arg('id')) {
$nickname = common_canonical_nickname($this->arg('id')); $nickname = common_canonical_nickname($this->arg('id'));
return User_group::staticGet('nickname', $nickname); return User_group::staticGet('nickname', $nickname);
} else if ($this->arg('user_id')) { } else if ($this->arg('group_id')) {
// This is to ensure that a non-numeric user_id still // This is to ensure that a non-numeric user_id still
// overrides screen_name even if it doesn't get used // overrides screen_name even if it doesn't get used
if (is_numeric($this->arg('user_id'))) { if (is_numeric($this->arg('group_id'))) {
return User_group::staticGet('id', $this->arg('user_id')); return User_group::staticGet('id', $this->arg('group_id'));
} }
} else if ($this->arg('screen_name')) { } else if ($this->arg('group_name')) {
$nickname = common_canonical_nickname($this->arg('screen_name')); $nickname = common_canonical_nickname($this->arg('group_name'));
return User::staticGet('nickname', $nickname); return User_group::staticGet('nickname', $nickname);
} }
} else if (is_numeric($id)) { } else if (is_numeric($id)) {