mirror of
https://github.com/friendica/friendica
synced 2024-11-10 09:02:53 +00:00
Merge pull request #3432 from annando/1705-api
Twidere reported error 501 when accessing a profile
This commit is contained in:
commit
3f4502155d
2 changed files with 15 additions and 0 deletions
|
@ -172,6 +172,11 @@ On error:
|
|||
HTTP 400 BadRequest
|
||||
* on friendica_verbose=true: different JSON returns {"result":"error","message":"xyz"}
|
||||
|
||||
---
|
||||
### externalprofile/show (*)
|
||||
#### Parameters
|
||||
* profileurl: profile url
|
||||
|
||||
---
|
||||
### favorites (*; AUTH)
|
||||
#### Parameters
|
||||
|
|
|
@ -525,6 +525,15 @@ $called_api = null;
|
|||
}
|
||||
}
|
||||
|
||||
if (is_null($user) && x($_GET, 'profileurl')) {
|
||||
$user = dbesc(normalise_link($_GET['profileurl']));
|
||||
$nick = $user;
|
||||
$extra_query = "AND `contact`.`nurl` = '%s' ";
|
||||
if (api_user() !== false) {
|
||||
$extra_query .= "AND `contact`.`uid`=".intval(api_user());
|
||||
}
|
||||
}
|
||||
|
||||
if (is_null($user) AND ($a->argc > (count($called_api) - 1)) AND (count($called_api) > 0)) {
|
||||
$argid = count($called_api);
|
||||
list($user, $null) = explode(".", $a->argv[$argid]);
|
||||
|
@ -1400,6 +1409,7 @@ $called_api = null;
|
|||
|
||||
/// @TODO move to top of file or somewhere better
|
||||
api_register_func('api/users/show','api_users_show');
|
||||
api_register_func('api/externalprofile/show','api_users_show');
|
||||
|
||||
function api_users_search($type) {
|
||||
|
||||
|
|
Loading…
Reference in a new issue