X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub.php;h=6c7bbb4745c488f87bec60b9b421dacf6043f9c8;hb=a80a6bec74dc35b90697dfde6260206bfb128827;hp=4c909efbc057c04fc44b741a4c0015ef2584f42a;hpb=3282ce53894b624893ee2989747a59866ab4b137;p=friendica.git

diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index 4c909efbc0..6c7bbb4745 100644
--- a/src/Protocol/ActivityPub.php
+++ b/src/Protocol/ActivityPub.php
@@ -4,9 +4,11 @@
  */
 namespace Friendica\Protocol;
 
+use Friendica\Util\JsonLD;
 use Friendica\Util\Network;
 use Friendica\Core\Protocol;
 use Friendica\Model\APContact;
+use Friendica\Model\User;
 use Friendica\Util\HTTPSignature;
 
 /**
@@ -43,8 +45,10 @@ class ActivityPub
 		['vcard' => 'http://www.w3.org/2006/vcard/ns#',
 		'dfrn' => 'http://purl.org/macgirvin/dfrn/1.0/',
 		'diaspora' => 'https://diasporafoundation.org/ns/',
+		'litepub' => 'http://litepub.social/ns#',
 		'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers',
-		'sensitive' => 'as:sensitive', 'Hashtag' => 'as:Hashtag']];
+		'sensitive' => 'as:sensitive', 'Hashtag' => 'as:Hashtag',
+		'directMessage' => 'litepub:directMessage']];
 	const ACCOUNT_TYPES = ['Person', 'Organization', 'Service', 'Group', 'Application'];
 	/**
 	 * Checks if the web request is done for the AP protocol
@@ -71,7 +75,7 @@ class ActivityPub
 			return HTTPSignature::fetch($url, $uid);
 		}
 
-		$curlResult = Network::curl($url, false, $redirects, ['accept_content' => 'application/activity+json, application/ld+json']);
+		$curlResult = Network::curl($url, false, ['accept_content' => 'application/activity+json, application/ld+json']);
 		if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
 			return false;
 		}
@@ -85,17 +89,43 @@ class ActivityPub
 		return $content;
 	}
 
+	private static function getAccountType($apcontact)
+	{
+		$accounttype = -1;
+
+		switch($apcontact['type']) {
+			case 'Person':
+				$accounttype = User::ACCOUNT_TYPE_PERSON;
+				break;
+			case 'Organization':
+				$accounttype = User::ACCOUNT_TYPE_ORGANISATION;
+				break;
+			case 'Service':
+				$accounttype = User::ACCOUNT_TYPE_NEWS;
+				break;
+			case 'Group':
+				$accounttype = User::ACCOUNT_TYPE_COMMUNITY;
+				break;
+			case 'Application':
+				$accounttype = User::ACCOUNT_TYPE_RELAY;
+				break;
+		}
+
+		return $accounttype;
+	}
+
 	/**
 	 * Fetches a profile from the given url into an array that is compatible to Probe::uri
 	 *
-	 * @param string $url profile url
+	 * @param string  $url    profile url
+	 * @param boolean $update Update the profile
 	 * @return array
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function probeProfile($url)
+	public static function probeProfile($url, $update = true)
 	{
-		$apcontact = APContact::getByURL($url, true);
+		$apcontact = APContact::getByURL($url, $update);
 		if (empty($apcontact)) {
 			return false;
 		}
@@ -107,8 +137,14 @@ class ActivityPub
 		$profile['url'] = $apcontact['url'];
 		$profile['addr'] = $apcontact['addr'];
 		$profile['alias'] = $apcontact['alias'];
+		$profile['following'] = $apcontact['following'];
+		$profile['followers'] = $apcontact['followers'];
+		$profile['inbox'] = $apcontact['inbox'];
+		$profile['outbox'] = $apcontact['outbox'];
+		$profile['sharedinbox'] = $apcontact['sharedinbox'];
 		$profile['photo'] = $apcontact['photo'];
-		// $profile['community']
+		$profile['account-type'] = self::getAccountType($apcontact);
+		$profile['community'] = ($profile['account-type'] == User::ACCOUNT_TYPE_COMMUNITY);
 		// $profile['keywords']
 		// $profile['location']
 		$profile['about'] = $apcontact['about'];