friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Use get_contact_details_by_url for unknown contacts 

- Fix typo
- Fix comment
- Fix closure
This commit is contained in:
Hypolite Petovan 2017-04-11 02:41:19 -04:00
parent 7f2fddea69
commit 762e8eda7a
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
include/acl_selectors.php
View File

@ -610,12 +610,18 @@ function acl_lookup(App $a, $out_type = 'json') {
$items = array_merge($groups, $contacts); $items = array_merge($groups, $contacts);
if ($conv_id) { if ($conv_id) {
/* if $conv_id is set, get unknow contacts in thread */ /*
/* but first get know contacts url to filter them out */ * if $conv_id is set, get unknown contacts in thread
function _contact_link($i){ return dbesc($i['link']); } * but first get known contacts url to filter them out
$known_contacts = array_map(_contact_link, $contacts); */
$unknow_contacts=array(); $known_contacts = array_map(
$r = q("SELECT `author-avatar`,`author-name`,`author-link`, `network` function ($i) {
return dbesc($i['link']);
}
, $contacts);
$unknown_contacts = array();
$r = q("SELECT `author-link`
FROM `item` WHERE `parent` = %d FROM `item` WHERE `parent` = %d
AND (`author-name` LIKE '%%%s%%' OR `author-link` LIKE '%%%s%%') AND (`author-name` LIKE '%%%s%%' OR `author-link` LIKE '%%%s%%')
AND `author-link` NOT IN ('%s') AND `author-link` NOT IN ('%s')
@ -625,31 +631,27 @@ function acl_lookup(App $a, $out_type = 'json') {
intval($conv_id), intval($conv_id),
dbesc($search), dbesc($search),
dbesc($search), dbesc($search),
implode("','", $known_contacts) implode("', '", $known_contacts)
); );
if (dbm::is_result($r)) { if (dbm::is_result($r)) {
foreach ($r as $row) { foreach ($r as $row) {
$up = parse_url($row['author-link']); $contact = get_contact_details_by_url($row['author-link'], 0);
$nick = explode('/', $up['path']);
// Fix for Mastodon URLs with format https://domain.tld/@nick
$nick = ltrim($nick[count($nick) - 1], '@');
$nick .= '@' . $up['host'];
$unknow_contacts[] = array( $unknown_contacts[] = array(
'type' => 'c', 'type' => 'cu',
'photo' => proxy_url($row['author-avatar'], false, PROXY_SIZE_MICRO), 'photo' => proxy_url($contact['micro'], false, PROXY_SIZE_MICRO),
'name' => htmlentities($row['author-name']), 'name' => htmlentities($contact['name']),
'id' => '', 'id' => intval($contact['id']),
'network' => $row['network'], 'network' => $contact['network'],
'link' => $row['author-link'], 'link' => $contact['url'],
'nick' => htmlentities($nick), 'nick' => $contact['nick'],
'forum' => false 'forum' => false
); );
} }
} }
$items = array_merge($items, $unknow_contacts); $items = array_merge($items, $unknown_contacts);
$tot += count($unknow_contacts); $tot += count($unknown_contacts);
} }
$results = array( $results = array(