bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #3467 from annando/1705-dm-api

Browse source 
API: Direct Messages via the API now work again.
This commit is contained in:
Hypolite Petovan 2017-05-15 19:00:41 -04:00 committed by GitHub
parent 9f62dd8627 875592f285
commit 916afd3d9a
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/api.php
View file

@ -456,10 +456,13 @@ $called_api = null;
* Contact url or False if contact id is unknown * Contact url or False if contact id is unknown
*/ */
function api_unique_id_to_url($id) { function api_unique_id_to_url($id) {
$r = q("SELECT `url` FROM `contact` WHERE `uid` = 0 AND `id` = %d LIMIT 1", $r = dba::select('contact', array('url'), array('uid' => 0, 'id' => $id), array('limit' => 1));
intval($id));
return (dbm::is_result($r) && $r[0]["url"]); if (dbm::is_result($r)) {
return $r["url"];
} else {
return false;
}
} }
/** /**
@ -3027,8 +3030,9 @@ $called_api = null;
api_best_nickname($r); api_best_nickname($r);
$recipient = api_get_user($a, $r[0]['nurl']); $recipient = api_get_user($a, $r[0]['nurl']);
} else } else {
$recipient = api_get_user($a, $_POST['user_id']); $recipient = api_get_user($a, $_POST['user_id']);
}
$replyto = ''; $replyto = '';
$sub = ''; $sub = '';