X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FNoScrape.php;h=c315ff0454220768dea0e5d429694156a3898d6a;hb=6dbbd081795fa1c8fe57db2248ac162efeeada88;hp=0d765f640380fd052ff4487df8ea61626135d7b6;hpb=7db4621eef159f055351c09d68647f0fb092f1a1;p=friendica.git

diff --git a/src/Module/NoScrape.php b/src/Module/NoScrape.php
index 0d765f6403..c315ff0454 100644
--- a/src/Module/NoScrape.php
+++ b/src/Module/NoScrape.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @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\Module;
 
@@ -7,44 +26,43 @@ use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\GContact;
-use Friendica\Model\Profile;
 use Friendica\Model\User;
 
 /**
  * Endpoint for getting current user infos
  *
- * @see GContact::updateFromNoScrape() for usage
+ * @see Contact::updateFromNoScrape() for usage
  */
 class NoScrape extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	protected function rawContent(array $request = [])
 	{
 		$a = DI::app();
 
-		if (isset($parameters['nick'])) {
+		if (isset($this->parameters['nick'])) {
 			// Get infos about a specific nick (public)
-			$which = $parameters['nick'];
-			$profile = 0;
-		} 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'];
-			$profile = $parameters['profile'];
+			$which = $a->getLoggedInUserNickname();
 		} else {
 			System::jsonError(403, 'Authentication required');
-			exit();
 		}
 
-		Profile::load($a, $which, $profile);
+		$owner = User::getOwnerDataByNick($which);
+
+		if (empty($owner['uid'])) {
+			System::jsonError(404, 'Profile not found');
+		}
 
 		$json_info = [
-			'addr'         => $a->profile['addr'],
+			'addr'         => $owner['addr'],
 			'nick'         => $which,
-			'guid'         => $a->profile['guid'],
-			'key'          => $a->profile['pubkey'],
-			'homepage'     => DI::baseUrl() . "/profile/{$which}",
-			'comm'         => ($a->profile['account-type'] == User::ACCOUNT_TYPE_COMMUNITY),
-			'account-type' => $a->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'];
@@ -52,32 +70,28 @@ class NoScrape extends BaseModule
 			$json_info["dfrn-{$dfrn}"] = DI::baseUrl() . "/dfrn_{$dfrn}/{$which}";
 		}
 
-		if (!$a->profile['net-publish'] || $a->profile['hidewall']) {
+		if (!$owner['net-publish']) {
 			$json_info['hide'] = true;
 			System::jsonExit($json_info);
 		}
 
-		$keywords = $a->profile['pub_keywords'] ?? '';
+		$keywords = $owner['pub_keywords'] ?? '';
 		$keywords = str_replace(['#', ',', ' ', ',,'], ['', ' ', ',', ','], $keywords);
 		$keywords = explode(',', $keywords);
 
-		$contactPhoto = DBA::selectFirst('contact', ['photo'], ['self' => true, 'uid' => $a->profile['uid']]);
-
-		$json_info['fn']       = $a->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'] = $a->profile['language'];
+		$json_info['language'] = $owner['language'];
 
-		if (!($a->profile['hide-friends'] ?? false)) {
-			/// @todo What should this value tell us?
-			$result = DBA::p("SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = %d LIMIT 1", $a->profile['uid']);
-			if (DBA::isResult($result)) {
-				$json_info["updated"] = date("c", strtotime($result[0]['updated']));
-			}
+		if (!empty($owner['last-item'])) {
+			$json_info['updated'] = date("c", strtotime($owner['last-item']));
+		}
 
+		if (!($owner['hide-friends'] ?? false)) {
 			$json_info['contacts'] = DBA::count('contact',
 				[
-					'uid'     => $a->profile['uid'],
+					'uid'     => $owner['uid'],
 					'self'    => 0,
 					'blocked' => 0,
 					'pending' => 0,
@@ -89,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' => $a->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' => $a->profile['uid']];
+		$condition = ['uid' => $owner['uid']];
 		$user      = DBA::selectFirst('user', ['login_date'], $condition);
 		if (DBA::isResult($user)) {
 			if ($last_active < strtotime($user['login_date'])) {
@@ -105,10 +119,10 @@ class NoScrape extends BaseModule
 		$json_info['last-activity'] = date('o-W', $last_active);
 
 		//These are optional fields.
-		$profile_fields = ['pdesc', 'locality', 'region', 'postal-code', 'country-name', 'gender', 'marital', 'about'];
+		$profile_fields = ['about', 'locality', 'region', 'postal-code', 'country-name', 'xmpp', 'matrix'];
 		foreach ($profile_fields as $field) {
-			if (!empty($a->profile[$field])) {
-				$json_info["$field"] = $a->profile[$field];
+			if (!empty($owner[$field])) {
+				$json_info["$field"] = $owner[$field];
 			}
 		}