harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some improvements in api direct messages

Browse Source
This commit is contained in:
friendica 2014-12-22 18:26:11 -08:00
parent f66df5e137
commit ee89ff5124
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/api.php
View File

@ -1868,8 +1868,11 @@ require_once('include/items.php');
require_once("include/message.php"); require_once("include/message.php");
$r = q("SELECT `abook_id` FROM `abook` WHERE `abook_channel`=%d ", // in a decentralised world the screen name is ambiguous
intval(api_user())
$r = q("SELECT `abook_id` FROM `abook` left join xchan on abook_xchan = xchan_hash WHERE `abook_channel`=%d and xchan_addr like '%s'",
intval(api_user()),
dbesc($_POST['screen_name'] . '@%')
); );
$recipient = api_get_user($a, $r[0]['abook_id']); $recipient = api_get_user($a, $r[0]['abook_id']);
@ -1951,10 +1954,12 @@ require_once('include/items.php');
foreach($r as $item) { foreach($r as $item) {
if ($box == "inbox" || $item['from-url'] != $profile_url){ if ($box == "inbox" || $item['from-url'] != $profile_url){
$recipient = $user_info; $recipient = $user_info;
$sender = api_get_user($a,$item['contact-id']); // fixme to lookup recipient
$sender = api_get_user($a);
} }
elseif ($box == "sentbox" || $item['from-url'] != $profile_url){ elseif ($box == "sentbox" || $item['from-url'] != $profile_url){
$recipient = api_get_user($a,$item['contact-id']); // fixme to lookup recipient
$recipient = api_get_user($a);
$sender = $user_info; $sender = $user_info;
} }