Fix redirect logging

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

diff --git a/src/Module/NoScrape.php b/src/Module/NoScrape.php
index 56fe4eab461ca61bc8778775ff91e0a95c25fea5..f156efb44f17f66d6b742b859a97cff05c6fb7a8 100644 (file)
--- a/src/Module/NoScrape.php
+++ b/src/Module/NoScrape.php
@@ -26,7 +26,7 @@ use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\Profile;
+use Friendica\Model\Contact;
 use Friendica\Model\User;
 
 /**
@@ -45,12 +45,12 @@ 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->getLoggedInUserNickname();
                } else {
                        System::jsonError(403, 'Authentication required');
                }
 
-               $profile = Profile::getByNickname($which);
+               $profile = User::getOwnerDataByNick($which);
 
                if (empty($profile['uid'])) {
                        System::jsonError(404, 'Profile not found');
@@ -80,10 +80,8 @@ class NoScrape extends BaseModule
                $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['photo']    = Contact::getAvatarUrlForUrl($profile['url'], $profile['uid']);
                $json_info['tags']     = $keywords;
                $json_info['language'] = $profile['language'];
 
@@ -122,7 +120,7 @@ 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];