Use get_contact_details_by_url for unknown contacts

- Fix typo
- Fix comment
- Fix closure

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 2a435c8e74ce541a1b6639ac4d277fb5c322ef56..4036886c49938e016e7bcad936420a6cbbd0623d 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -610,12 +610,18 @@ function acl_lookup(App $a, $out_type = 'json') {
        $items = array_merge($groups, $contacts);
 
        if ($conv_id) {
-               /* if $conv_id is set, get unknow contacts in thread */
-               /* but first get know contacts url to filter them out */
-               function _contact_link($i){ return dbesc($i['link']); }
-               $known_contacts = array_map(_contact_link, $contacts);
-               $unknow_contacts=array();
-               $r = q("SELECT `author-avatar`,`author-name`,`author-link`, `network`
+               /*
+                * if $conv_id is set, get unknown contacts in thread
+                * but first get known contacts url to filter them out
+                */
+               $known_contacts = array_map(
+                       function ($i) {
+                               return dbesc($i['link']);
+                       }
+               , $contacts);
+
+               $unknown_contacts = array();
+               $r = q("SELECT `author-link`
                                FROM `item` WHERE `parent` = %d
                                        AND (`author-name` LIKE '%%%s%%' OR `author-link` LIKE '%%%s%%')
                                        AND `author-link` NOT IN ('%s')
@@ -625,31 +631,27 @@ function acl_lookup(App $a, $out_type = 'json') {
                                intval($conv_id),
                                dbesc($search),
                                dbesc($search),
-                               implode("','", $known_contacts)
+                               implode("', '", $known_contacts)
                );
                if (dbm::is_result($r)) {
                        foreach ($r as $row) {
-                               $up = parse_url($row['author-link']);
-                               $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(
-                                       'type'    => 'c',
-                                       'photo'   => proxy_url($row['author-avatar'], false, PROXY_SIZE_MICRO),
-                                       'name'    => htmlentities($row['author-name']),
-                                       'id'      => '',
-                                       'network' => $row['network'],
-                                       'link'    => $row['author-link'],
-                                       'nick'    => htmlentities($nick),
+                               $contact = get_contact_details_by_url($row['author-link'], 0);
+
+                               $unknown_contacts[] = array(
+                                       'type'    => 'cu',
+                                       'photo'   => proxy_url($contact['micro'], false, PROXY_SIZE_MICRO),
+                                       'name'    => htmlentities($contact['name']),
+                                       'id'      => intval($contact['id']),
+                                       'network' => $contact['network'],
+                                       'link'    => $contact['url'],
+                                       'nick'    => $contact['nick'],
                                        'forum'   => false
                                );
                        }
                }
 
-               $items = array_merge($items, $unknow_contacts);
-               $tot += count($unknow_contacts);
+               $items = array_merge($items, $unknown_contacts);
+               $tot += count($unknown_contacts);
        }
 
        $results = array(