Display the public contacts for profile visitors

diff --git a/src/Content/Widget/ContactBlock.php b/src/Content/Widget/ContactBlock.php
index c755a7d4f671b89efdd8363716020c587215d522..50c60031dff071262c6457d888ee32b738feee46 100644 (file)
--- a/src/Content/Widget/ContactBlock.php
+++ b/src/Content/Widget/ContactBlock.php
@@ -44,10 +44,16 @@ class ContactBlock
         * @hook contact_block_end (contacts=>array, output=>string)
         * @return string
         */
-       public static function getHTML(array $profile)
+       public static function getHTML(array $profile, int $visitor_uid = null)
        {
                $o = '';
 
+               if (is_null($visitor_uid) || ($visitor_uid == $profile['uid'])) {
+                       $contact_uid = $profile['uid'];
+               } else {
+                       $contact_uid = 0;
+               }
+
                $shown = DI::pConfig()->get($profile['uid'], 'system', 'display_friend_count', 24);
                if ($shown == 0) {
                        return $o;
@@ -82,7 +88,7 @@ class ContactBlock
                                $rel = [Contact::FOLLOWER, Contact::FRIEND];
                        }
 
-                       $contact_ids_stmt = DBA::select('contact', ['id'], [
+                       $personal_contacts = DBA::selectToArray('contact', ['uri-id'], [
                                'uid' => $profile['uid'],
                                'self' => false,
                                'blocked' => false,
@@ -93,13 +99,10 @@ class ContactBlock
                                'network' => Protocol::FEDERATED,
                        ], ['limit' => $shown]);
 
-                       if (DBA::isResult($contact_ids_stmt)) {
-                               $contact_ids = [];
-                               while($contact = DBA::fetch($contact_ids_stmt)) {
-                                       $contact_ids[] = $contact["id"];
-                               }
+                       $contact_ids = array_column($personal_contacts, 'uri-id');
 
-                               $contacts_stmt = DBA::select('contact', ['id', 'uid', 'addr', 'url', 'name', 'thumb', 'avatar', 'network'], ['id' => $contact_ids]);
+                       if (!empty($contact_ids)) {
+                               $contacts_stmt = DBA::select('contact', ['id', 'uid', 'addr', 'url', 'name', 'thumb', 'avatar', 'network'], ['uri-id' => $contact_ids, 'uid' => $contact_uid]);
 
                                if (DBA::isResult($contacts_stmt)) {
                                        $contacts_title = DI::l10n()->tt('%d Contact', '%d Contacts', $total);
@@ -113,8 +116,6 @@ class ContactBlock
 
                                DBA::close($contacts_stmt);
                        }
-
-                       DBA::close($contact_ids_stmt);
                }
 
                $tpl = Renderer::getMarkupTemplate('widget/contacts.tpl');

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index a1e97d1ee464273aea874fb902eda9da976ff3f9..4e984baa6f9ab52f3bbc917706c120a3dbd0230c 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -406,7 +406,7 @@ class Profile
                }
 
                if (!$block && $show_contacts) {
-                       $contact_block = ContactBlock::getHTML($profile);
+                       $contact_block = ContactBlock::getHTML($profile, local_user());
 
                        if (is_array($profile) && !$profile['hide-friends']) {
                                $contact_count = DBA::count('contact', [