Merge pull request #10283 from very-ape/fix-message-button

[friendica.git] / src / Model / APContact.php

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index 863496dbb0f4883669f6004be411f34e6f83d50c..7a63e413cab3ee5f6f26d6ad8c5b8acfe1c4a629 100644 (file)
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -235,7 +235,7 @@ class APContact
                unset($parts['path']);
 
                if (empty($apcontact['addr'])) {
-                       if (!empty($apcontact['nick'])) {
+                       if (!empty($apcontact['nick']) && is_array($parts)) {
                                $apcontact['addr'] = $apcontact['nick'] . '@' . str_replace('//', '', Network::unparseURL($parts));
                        } else {
                                $apcontact['addr'] = '';
@@ -258,29 +258,23 @@ class APContact
                }
 
                if (!empty($apcontact['following'])) {
-                       $data = ActivityPub::fetchContent($apcontact['following']);
-                       if (!empty($data)) {
-                               if (!empty($data['totalItems'])) {
-                                       $apcontact['following_count'] = $data['totalItems'];
-                               }
+                       $following = ActivityPub::fetchContent($apcontact['following']);
+                       if (!empty($following['totalItems'])) {
+                               $apcontact['following_count'] = $following['totalItems'];
                        }
                }
 
                if (!empty($apcontact['followers'])) {
-                       $data = ActivityPub::fetchContent($apcontact['followers']);
-                       if (!empty($data)) {
-                               if (!empty($data['totalItems'])) {
-                                       $apcontact['followers_count'] = $data['totalItems'];
-                               }
+                       $followers = ActivityPub::fetchContent($apcontact['followers']);
+                       if (!empty($followers['totalItems'])) {
+                               $apcontact['followers_count'] = $followers['totalItems'];
                        }
                }
 
                if (!empty($apcontact['outbox'])) {
-                       $data = ActivityPub::fetchContent($apcontact['outbox']);
-                       if (!empty($data)) {
-                               if (!empty($data['totalItems'])) {
-                                       $apcontact['statuses_count'] = $data['totalItems'];
-                               }
+                       $outbox = ActivityPub::fetchContent($apcontact['outbox']);
+                       if (!empty($outbox['totalItems'])) {
+                               $apcontact['statuses_count'] = $outbox['totalItems'];
                        }
                }
 
@@ -333,7 +327,7 @@ class APContact
 
                if (empty($apcontact['subscribe'])) {
                        $apcontact['subscribe'] = null;
-               }               
+               }
 
                if (!empty($apcontact['baseurl']) && empty($fetched_contact['gsid'])) {
                        $apcontact['gsid'] = GServer::getID($apcontact['baseurl']);