Merge pull request #10046 from MrPetovan/bug/10019-oembed-iframes-part-1

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

diff --git a/src/Module/NoScrape.php b/src/Module/NoScrape.php
index 13a683d974868b53b9f18812de5d884df1d7840e..7178209bd813ef4238a0b5d51a4d48d420b684b0 100644 (file)
--- a/src/Module/NoScrape.php
+++ b/src/Module/NoScrape.php
@@ -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\User;
 
 /**
  * Endpoint for getting current user infos
  *
- * @see GContact::updateFromNoScrape() for usage
+ * @see Contact::updateFromNoScrape() for usage
  */
 class NoScrape extends BaseModule
 {
@@ -46,19 +45,22 @@ 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->user['nickname'];
                } else {
                        System::jsonError(403, 'Authentication required');
-                       exit();
                }
 
                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'],