Merge pull request #10721 from annando/issue-10720-avatar

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

diff --git a/src/Module/NoScrape.php b/src/Module/NoScrape.php
index 1b97d047f7c1a846722f22e4c3475f65f9055069..b791c5cd7922bb992ba68deec352ec48e5abfb07 100644 (file)
--- a/src/Module/NoScrape.php
+++ b/src/Module/NoScrape.php
@@ -26,7 +26,6 @@ use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\Contact;
 use Friendica\Model\User;
 
 /**
@@ -45,7 +44,7 @@ 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');
                }
@@ -81,7 +80,7 @@ class NoScrape extends BaseModule
                $keywords = explode(',', $keywords);
 
                $json_info['fn']       = $profile['name'];
-               $json_info['photo']    = Contact::getAvatarUrlForUrl($profile['url'], $profile['uid']);
+               $json_info['photo']    = User::getAvatarUrlForId($profile['uid']);
                $json_info['tags']     = $keywords;
                $json_info['language'] = $profile['language'];
 
@@ -120,7 +119,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];