<?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\Module;
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
{
if (isset($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') {
// view infos about a known profile (needs a login)
- $which = $a->user['nickname'];
- $profile = $parameters['profile'];
+ $which = $a->user['nickname'];
} else {
System::jsonError(403, 'Authentication required');
- exit();
}
- Profile::load($a, $which, $profile);
+ Profile::load($a, $which);
+
+ if (empty($a->profile['uid'])) {
+ System::jsonError(404, 'Profile not found');
+ }
$json_info = [
'addr' => $a->profile['addr'],
'nick' => $which,
'guid' => $a->profile['guid'],
- 'key' => $a->profile['pubkey'],
+ 'key' => $a->profile['upubkey'],
'homepage' => DI::baseUrl() . "/profile/{$which}",
'comm' => ($a->profile['account-type'] == User::ACCOUNT_TYPE_COMMUNITY),
'account-type' => $a->profile['account-type'],
$json_info["dfrn-{$dfrn}"] = DI::baseUrl() . "/dfrn_{$dfrn}/{$which}";
}
- if (!$a->profile['net-publish'] || $a->profile['hidewall']) {
+ if (!$a->profile['net-publish']) {
$json_info['hide'] = true;
System::jsonExit($json_info);
}
$json_info['tags'] = $keywords;
$json_info['language'] = $a->profile['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($a->profile['last-item'])) {
+ $json_info['updated'] = date("c", strtotime($a->profile['last-item']));
+ }
+ if (!($a->profile['hide-friends'] ?? false)) {
$json_info['contacts'] = DBA::count('contact',
[
'uid' => $a->profile['uid'],
$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'];
foreach ($profile_fields as $field) {
if (!empty($a->profile[$field])) {
$json_info["$field"] = $a->profile[$field];