Changed function name

[friendica.git] / src / Module / NoScrape.php

diff --git a/src/Module/NoScrape.php b/src/Module/NoScrape.php
index a03770d0d4514e6f2a41d693e4307d62705b6e30..9c7b9ec8bdbf154f4bfa4f0c784d5dd0cca4f404 100644 (file)
--- a/src/Module/NoScrape.php
+++ b/src/Module/NoScrape.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -26,14 +26,13 @@ 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\Contact;
 use Friendica\Model\User;
 
 /**
  * Endpoint for getting current user infos
  *
- * @see GContact::updateFromNoScrape() for usage
+ * @see Contact::updateFromNoScrape() for usage
  */
 class NoScrape extends BaseModule
 {
@@ -46,22 +45,25 @@ class NoScrape extends BaseModule
                        $which = $parameters['nick'];
                } elseif (local_user() && isset($parameters['profile']) && DI::args()->get(2) == 'view') {
                        // view infos about a known profile (needs a login)
-                       $which   = $a->user['nickname'];
+                       $which = $a->getUserNickname();
                } else {
                        System::jsonError(403, 'Authentication required');
-                       exit();
                }
 
-               Profile::load($a, $which);
+               $profile = User::getOwnerDataByNick($which);
+
+               if (empty($profile['uid'])) {
+                       System::jsonError(404, 'Profile not found');
+               }
 
                $json_info = [
-                       'addr'         => $a->profile['addr'],
+                       'addr'         => $profile['addr'],
                        'nick'         => $which,
-                       'guid'         => $a->profile['guid'],
-                       'key'          => $a->profile['pubkey'],
+                       'guid'         => $profile['guid'],
+                       'key'          => $profile['upubkey'],
                        'homepage'     => DI::baseUrl() . "/profile/{$which}",
-                       'comm'         => ($a->profile['account-type'] == User::ACCOUNT_TYPE_COMMUNITY),
-                       'account-type' => $a->profile['account-type'],
+                       'comm'         => ($profile['account-type'] == User::ACCOUNT_TYPE_COMMUNITY),
+                       'account-type' => $profile['account-type'],
                ];
 
                $dfrn_pages = ['request', 'confirm', 'notify', 'poll'];
@@ -69,41 +71,28 @@ class NoScrape extends BaseModule
                        $json_info["dfrn-{$dfrn}"] = DI::baseUrl() . "/dfrn_{$dfrn}/{$which}";
                }
 
-               if (!$a->profile['net-publish']) {
+               if (!$profile['net-publish']) {
                        $json_info['hide'] = true;
                        System::jsonExit($json_info);
                }
 
-               $keywords = $a->profile['pub_keywords'] ?? '';
+               $keywords = $profile['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']       = $profile['name'];
+               $json_info['photo']    = Contact::getAvatarUrlForUrl($profile['url'], $profile['uid']);
                $json_info['tags']     = $keywords;
-               $json_info['language'] = $a->profile['language'];
-
-               if (!($a->profile['hide-friends'] ?? false)) {
-                       $stmt = DBA::p(
-                               "SELECT `gcontact`.`updated`
-                               FROM `contact`
-                               INNER JOIN `gcontact`
-                               WHERE `gcontact`.`nurl` = `contact`.`nurl`
-                                 AND `self`
-                                 AND `uid` = ?
-                               LIMIT 1",
-                               intval($a->profile['uid'])
-                       );
-                       if ($gcontact = DBA::fetch($stmt)) {
-                               $json_info["updated"] = date("c", strtotime($gcontact['updated']));
-                       }
-                       DBA::close($stmt);
+               $json_info['language'] = $profile['language'];
+
+               if (!empty($profile['last-item'])) {
+                       $json_info['updated'] = date("c", strtotime($profile['last-item']));
+               }
 
+               if (!($profile['hide-friends'] ?? false)) {
                        $json_info['contacts'] = DBA::count('contact',
                                [
-                                       'uid'     => $a->profile['uid'],
+                                       'uid'     => $profile['uid'],
                                        'self'    => 0,
                                        'blocked' => 0,
                                        'pending' => 0,
@@ -115,13 +104,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' => $profile['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' => $profile['uid']];
                $user      = DBA::selectFirst('user', ['login_date'], $condition);
                if (DBA::isResult($user)) {
                        if ($last_active < strtotime($user['login_date'])) {
@@ -133,8 +122,8 @@ class NoScrape extends BaseModule
                //These are optional fields.
                $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];
+                       if (!empty($profile[$field])) {
+                               $json_info["$field"] = $profile[$field];
                        }
                }