X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FAPContact.php;h=067be587467638fe6dd86b6564d64b57b6171118;hb=6b8db5ad1333e2b430da3a771d9a962d44d4b6fc;hp=b027d6c47810d61096b44a1661924930bc1fea2e;hpb=b9ab6137776f39db3d01481cb6a7d5f6a1634be5;p=friendica.git

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index b027d6c478..067be58746 100644
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -6,7 +6,6 @@
 
 namespace Friendica\Model;
 
-use Friendica\BaseObject;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Logger;
 use Friendica\Core\Config;
@@ -17,7 +16,7 @@ use Friendica\Util\JsonLD;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
 
-class APContact extends BaseObject
+class APContact
 {
 	/**
 	 * Resolves the profile url from the address by using webfinger
@@ -84,7 +83,7 @@ class APContact extends BaseObject
 	public static function getByURL($url, $update = null)
 	{
 		if (empty($url)) {
-			return false;
+			return [];
 		}
 
 		$fetched_contact = false;
@@ -110,7 +109,7 @@ class APContact extends BaseObject
 			}
 
 			if (!is_null($update)) {
-				return DBA::isResult($apcontact) ? $apcontact : false;
+				return DBA::isResult($apcontact) ? $apcontact : [];
 			}
 
 			if (DBA::isResult($apcontact)) {
@@ -153,7 +152,7 @@ class APContact extends BaseObject
 			self::unarchiveInbox($apcontact['sharedinbox'], true);
 		}
 
-		$apcontact['nick'] = JsonLD::fetchElement($compacted, 'as:preferredUsername', '@value');
+		$apcontact['nick'] = JsonLD::fetchElement($compacted, 'as:preferredUsername', '@value') ?? '';
 		$apcontact['name'] = JsonLD::fetchElement($compacted, 'as:name', '@value');
 
 		if (empty($apcontact['name'])) {
@@ -185,8 +184,14 @@ class APContact extends BaseObject
 		$parts = parse_url($apcontact['url']);
 		unset($parts['scheme']);
 		unset($parts['path']);
-		$apcontact['addr'] = $apcontact['nick'] . '@' . str_replace('//', '', Network::unparseURL($parts));
 
+		if (!empty($apcontact['nick'])) {
+			$apcontact['addr'] = $apcontact['nick'] . '@' . str_replace('//', '', Network::unparseURL($parts));
+		} else {
+			$apcontact['addr'] = '';
+		}
+
+		$apcontact['pubkey'] = null;
 		if (!empty($compacted['w3id:publicKey'])) {
 			$apcontact['pubkey'] = trim(JsonLD::fetchElement($compacted['w3id:publicKey'], 'w3id:publicKeyPem', '@value'));
 		}
@@ -198,6 +203,33 @@ class APContact extends BaseObject
 			$apcontact['generator'] = JsonLD::fetchElement($compacted['as:generator'], 'as:name', '@value');
 		}
 
+		if (!empty($apcontact['following'])) {
+			$data = ActivityPub::fetchContent($apcontact['following']);
+			if (!empty($data)) {
+				if (!empty($data['totalItems'])) {
+					$apcontact['following_count'] = $data['totalItems'];
+				}
+			}
+		}
+
+		if (!empty($apcontact['followers'])) {
+			$data = ActivityPub::fetchContent($apcontact['followers']);
+			if (!empty($data)) {
+				if (!empty($data['totalItems'])) {
+					$apcontact['followers_count'] = $data['totalItems'];
+				}
+			}
+		}
+
+		if (!empty($apcontact['outbox'])) {
+			$data = ActivityPub::fetchContent($apcontact['outbox']);
+			if (!empty($data)) {
+				if (!empty($data['totalItems'])) {
+					$apcontact['statuses_count'] = $data['totalItems'];
+				}
+			}
+		}
+
 		// To-Do
 
 		// Unhandled
@@ -237,44 +269,6 @@ class APContact extends BaseObject
 			DBA::delete('apcontact', ['url' => $url]);
 		}
 
-		// Update some data in the contact table with various ways to catch them all
-		$contact_fields = ['name' => $apcontact['name'], 'about' => $apcontact['about'], 'alias' => $apcontact['alias']];
-
-		// Fetch the type and match it with the contact type
-		$contact_types = array_keys(ActivityPub::ACCOUNT_TYPES, $apcontact['type']);
-		if (!empty($contact_types)) {
-			$contact_type = array_pop($contact_types);
-			if (is_int($contact_type)) {
-				$contact_fields['contact-type'] = $contact_type;
-
-				if ($contact_fields['contact-type'] != User::ACCOUNT_TYPE_COMMUNITY) {
-					// Resetting the 'forum' and 'prv' field when it isn't a forum
-					$contact_fields['forum'] = false;
-					$contact_fields['prv'] = false;
-				} else {
-					// Otherwise set the corresponding forum type
-					$contact_fields['forum'] = !$apcontact['manually-approve'];
-					$contact_fields['prv'] = $apcontact['manually-approve'];
-				}
-			}
-		}
-
-		DBA::update('contact', $contact_fields, ['nurl' => Strings::normaliseLink($url)]);
-
-		if (!empty($apcontact['photo'])) {
-			$contacts = DBA::select('contact', ['uid', 'id'], ['nurl' => Strings::normaliseLink($url)]);
-			while ($contact = DBA::fetch($contacts)) {
-				Contact::updateAvatar($apcontact['photo'], $contact['uid'], $contact['id']);
-			}
-			DBA::close($contacts);
-		}
-
-		// Update the gcontact table
-		// These two fields don't exist in the gcontact table
-		unset($contact_fields['forum']);
-		unset($contact_fields['prv']);
-		DBA::update('gcontact', $contact_fields, ['nurl' => Strings::normaliseLink($url)]);
-
 		Logger::log('Updated profile for ' . $url, Logger::DEBUG);
 
 		return $apcontact;