wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Additional fixes found while looking at ticket #2532: when given a screen name as API parameter for a profile, do the nickname lookup on local users only. The profile table can't guarantee unique lookups, so using names isn't currently safe there. This won't affect anything using local nicknames correctly, and may avoid some weird bugs if there were conflicts between local and remote nicknames.

Browse Source
This commit is contained in:
Brion Vibber 2010-10-22 13:53:10 -07:00
parent 2d124e4aab
commit eb30c6651a
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/apiaction.php
View File

@ -1398,8 +1398,10 @@ class ApiAction extends Action
if (is_numeric($this->arg('id'))) { if (is_numeric($this->arg('id'))) {
return Profile::staticGet($this->arg('id')); return Profile::staticGet($this->arg('id'));
} else if ($this->arg('id')) { } else if ($this->arg('id')) {
// Screen names currently can only uniquely identify a local user.
$nickname = common_canonical_nickname($this->arg('id')); $nickname = common_canonical_nickname($this->arg('id'));
return Profile::staticGet('nickname', $nickname); $user = User::staticGet('nickname', $nickname);
return $user ? $user->getProfile() : null;
} else if ($this->arg('user_id')) { } else if ($this->arg('user_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
@ -1408,13 +1410,15 @@ class ApiAction extends Action
} }
} else if ($this->arg('screen_name')) { } else if ($this->arg('screen_name')) {
$nickname = common_canonical_nickname($this->arg('screen_name')); $nickname = common_canonical_nickname($this->arg('screen_name'));
return Profile::staticGet('nickname', $nickname); $user = User::staticGet('nickname', $nickname);
return $user ? $user->getProfile() : null;
} }
} else if (is_numeric($id)) { } else if (is_numeric($id)) {
return Profile::staticGet($id); return Profile::staticGet($id);
} else { } else {
$nickname = common_canonical_nickname($id); $nickname = common_canonical_nickname($id);
return Profile::staticGet('nickname', $nickname); $user = User::staticGet('nickname', $nickname);
return $user ? $user->getProfile() : null;
} }
} }