X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FAPContact.php;h=7ce47bb227ec04e39804680947228533ac696328;hb=7b7132971a64a92a685a5fd860fe4709dce1765a;hp=82afc0769622959c068d320d293cd0f48808d3e2;hpb=9b8b2b36cdf39852068b3dd372409501f8e31344;p=friendica.git

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index 82afc07696..7ce47bb227 100644
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -1,23 +1,37 @@
 <?php
-
 /**
- * @file src/Model/APContact.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 namespace Friendica\Model;
 
-use Friendica\BaseObject;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Logger;
-use Friendica\Core\Config;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Util\Network;
 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
@@ -34,7 +48,7 @@ class APContact extends BaseObject
 			return false;
 		}
 
-		$xrd_timeout = Config::get('system', 'xrd_timeout');
+		$xrd_timeout = DI::config()->get('system', 'xrd_timeout');
 
 		$webfinger = 'https://' . $addr_parts[1] . '/.well-known/webfinger?resource=acct:' . urlencode($addr);
 
@@ -84,7 +98,7 @@ class APContact extends BaseObject
 	public static function getByURL($url, $update = null)
 	{
 		if (empty($url)) {
-			return false;
+			return [];
 		}
 
 		$fetched_contact = false;
@@ -110,7 +124,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 +167,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 +199,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 +218,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