X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FNoScrape.php;h=06bce3e2486d97bb4c43c40f0a1ea0267d236202;hb=fd7c1d766c2c922909b858f7af6aa440fbc697aa;hp=a76b3a951737676cf556a7162fadd01fe10c77a6;hpb=e4553ad156d2846a85503186740a81de88be8a86;p=friendica.git

diff --git a/src/Module/NoScrape.php b/src/Module/NoScrape.php
index a76b3a9517..06bce3e248 100644
--- a/src/Module/NoScrape.php
+++ b/src/Module/NoScrape.php
@@ -26,7 +26,6 @@ use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\Profile;
 use Friendica\Model\User;
 
 /**
@@ -36,34 +35,34 @@ use Friendica\Model\User;
  */
 class NoScrape extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public function rawContent()
 	{
 		$a = DI::app();
 
-		if (isset($parameters['nick'])) {
+		if (isset($this->parameters['nick'])) {
 			// Get infos about a specific nick (public)
-			$which = $parameters['nick'];
-		} elseif (local_user() && isset($parameters['profile']) && DI::args()->get(2) == 'view') {
+			$which = $this->parameters['nick'];
+		} elseif (local_user() && isset($this->parameters['profile']) && DI::args()->get(2) == 'view') {
 			// view infos about a known profile (needs a login)
-			$which = $a->user['nickname'];
+			$which = $a->getLoggedInUserNickname();
 		} else {
 			System::jsonError(403, 'Authentication required');
 		}
 
-		$profile = Profile::getByNickname($which, local_user());
+		$owner = User::getOwnerDataByNick($which);
 
-		if (empty($profile['uid'])) {
+		if (empty($owner['uid'])) {
 			System::jsonError(404, 'Profile not found');
 		}
 
 		$json_info = [
-			'addr'         => $profile['addr'],
+			'addr'         => $owner['addr'],
 			'nick'         => $which,
-			'guid'         => $profile['guid'],
-			'key'          => $profile['upubkey'],
-			'homepage'     => DI::baseUrl() . "/profile/{$which}",
-			'comm'         => ($profile['account-type'] == User::ACCOUNT_TYPE_COMMUNITY),
-			'account-type' => $profile['account-type'],
+			'guid'         => $owner['guid'],
+			'key'          => $owner['upubkey'],
+			'homepage'     => DI::baseUrl() . '/profile/' . $which,
+			'comm'         => ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY),
+			'account-type' => $owner['account-type'],
 		];
 
 		$dfrn_pages = ['request', 'confirm', 'notify', 'poll'];
@@ -71,30 +70,28 @@ class NoScrape extends BaseModule
 			$json_info["dfrn-{$dfrn}"] = DI::baseUrl() . "/dfrn_{$dfrn}/{$which}";
 		}
 
-		if (!$profile['net-publish']) {
+		if (!$owner['net-publish']) {
 			$json_info['hide'] = true;
 			System::jsonExit($json_info);
 		}
 
-		$keywords = $profile['pub_keywords'] ?? '';
+		$keywords = $owner['pub_keywords'] ?? '';
 		$keywords = str_replace(['#', ',', ' ', ',,'], ['', ' ', ',', ','], $keywords);
 		$keywords = explode(',', $keywords);
 
-		$contactPhoto = DBA::selectFirst('contact', ['photo'], ['self' => true, 'uid' => $profile['uid']]);
-
-		$json_info['fn']       = $profile['name'];
-		$json_info['photo']    = $contactPhoto["photo"];
+		$json_info['fn']       = $owner['name'];
+		$json_info['photo']    = User::getAvatarUrl($owner);
 		$json_info['tags']     = $keywords;
-		$json_info['language'] = $profile['language'];
+		$json_info['language'] = $owner['language'];
 
-		if (!empty($profile['last-item'])) {
-			$json_info['updated'] = date("c", strtotime($profile['last-item']));
+		if (!empty($owner['last-item'])) {
+			$json_info['updated'] = date("c", strtotime($owner['last-item']));
 		}
 
-		if (!($profile['hide-friends'] ?? false)) {
+		if (!($owner['hide-friends'] ?? false)) {
 			$json_info['contacts'] = DBA::count('contact',
 				[
-					'uid'     => $profile['uid'],
+					'uid'     => $owner['uid'],
 					'self'    => 0,
 					'blocked' => 0,
 					'pending' => 0,
@@ -106,13 +103,13 @@ class NoScrape extends BaseModule
 
 		// We display the last activity (post or login), reduced to year and week number
 		$last_active = 0;
-		$condition   = ['uid' => $profile['uid'], 'self' => true];
+		$condition   = ['uid' => $owner['uid'], 'self' => true];
 		$contact     = DBA::selectFirst('contact', ['last-item'], $condition);
 		if (DBA::isResult($contact)) {
 			$last_active = strtotime($contact['last-item']);
 		}
 
-		$condition = ['uid' => $profile['uid']];
+		$condition = ['uid' => $owner['uid']];
 		$user      = DBA::selectFirst('user', ['login_date'], $condition);
 		if (DBA::isResult($user)) {
 			if ($last_active < strtotime($user['login_date'])) {
@@ -122,10 +119,10 @@ class NoScrape extends BaseModule
 		$json_info['last-activity'] = date('o-W', $last_active);
 
 		//These are optional fields.
-		$profile_fields = ['about', 'locality', 'region', 'postal-code', 'country-name'];
+		$profile_fields = ['about', 'locality', 'region', 'postal-code', 'country-name', 'xmpp', 'matrix'];
 		foreach ($profile_fields as $field) {
-			if (!empty($profile[$field])) {
-				$json_info["$field"] = $profile[$field];
+			if (!empty($owner[$field])) {
+				$json_info["$field"] = $owner[$field];
 			}
 		}