Merge branch 'develop' of https://github.com/friendica/friendica into develop

[friendica.git] / src / Model / Profile.php

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 348e16badd90180534dfa5dc15375090ced12699..f328453e9b52f3df5a2e657f91a2cb21b97b2b5b 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.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
  *
@@ -27,7 +27,6 @@ use Friendica\Content\Widget\ContactBlock;
 use Friendica\Core\Cache\Duration;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
-use Friendica\Network\Probe;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
@@ -167,7 +166,7 @@ class Profile
                        }
                }
 
-               $profile = self::getByNickname($nickname, $user['uid']);
+               $profile = !empty($user['uid']) ? User::getOwnerDataById($user['uid'], false) : [];
 
                if (empty($profile) && empty($profiledata)) {
                        Logger::log('profile error: ' . DI::args()->getQueryString(), Logger::DEBUG);
@@ -259,7 +258,7 @@ class Profile
         * @hooks 'profile_sidebar'
         *      array $arr
         */
-       private static function sidebar(App $a, $profile, $block = 0, $show_connect = true)
+       private static function sidebar(App $a, array $profile, $block = 0, $show_connect = true)
        {
                $o = '';
                $location = false;
@@ -267,7 +266,8 @@ class Profile
                // This function can also use contact information in $profile
                $is_contact = !empty($profile['cid']);
 
-               if (!is_array($profile) && !count($profile)) {
+               if (empty($profile['nickname'])) {
+                       Logger::warning('Received profile with no nickname', ['profile' => $profile, 'callstack' => System::callstack(10)]);
                        return $o;
                }
 
@@ -292,8 +292,6 @@ class Profile
                $subscribe_feed_link = null;
                $wallmessage_link = null;
 
-
-
                $visitor_contact = [];
                if (!empty($profile['uid']) && self::getMyURL()) {
                        $visitor_contact = Contact::selectFirst(['rel'], ['uid' => $profile['uid'], 'nurl' => Strings::normaliseLink(self::getMyURL())]);
@@ -306,7 +304,7 @@ class Profile
 
                $profile_is_dfrn = $profile['network'] == Protocol::DFRN;
                $profile_is_native = in_array($profile['network'], Protocol::NATIVE_SUPPORT);
-               $local_user_is_self = local_user() && local_user() == ($profile['uid'] ?? 0);
+               $local_user_is_self = self::getMyURL() && ($profile['url'] == self::getMyURL());
                $visitor_is_authenticated = (bool)self::getMyURL();
                $visitor_is_following =
                        in_array($visitor_contact['rel'] ?? 0, [Contact::FOLLOWER, Contact::FRIEND])
@@ -324,9 +322,9 @@ class Profile
                                }
                        } elseif ($profile_is_native) {
                                if ($visitor_is_following) {
-                                       $unfollow_link = $visitor_base_path . '/unfollow?url=' . urlencode($profile_url);
+                                       $unfollow_link = $visitor_base_path . '/unfollow?url=' . urlencode($profile_url) . '&auto=1';
                                } else {
-                                       $follow_link =  $visitor_base_path .'/follow?url=' . urlencode($profile_url);
+                                       $follow_link =  $visitor_base_path .'/follow?url=' . urlencode($profile_url) . '&auto=1';
                                }
                        }
 
@@ -356,13 +354,7 @@ class Profile
                // Fetch the account type
                $account_type = Contact::getAccountType($profile);
 
-               if (!empty($profile['address'])
-                       || !empty($profile['location'])
-                       || !empty($profile['locality'])
-                       || !empty($profile['region'])
-                       || !empty($profile['postal-code'])
-                       || !empty($profile['country-name'])
-               ) {
+               if (!empty($profile['address']) || !empty($profile['location'])) {
                        $location = DI::l10n()->t('Location:');
                }
 
@@ -414,6 +406,7 @@ class Profile
                                        'pending' => false,
                                        'hidden' => false,
                                        'archive' => false,
+                                       'failed' => false,
                                        'network' => Protocol::FEDERATED,
                                ]);
                        }
@@ -429,10 +422,6 @@ class Profile
                        $p['about'] = BBCode::convert($p['about']);
                }
 
-               if (empty($p['address']) && !empty($p['location'])) {
-                       $p['address'] = $p['location'];
-               }
-
                if (isset($p['address'])) {
                        $p['address'] = BBCode::convert($p['address']);
                }
@@ -550,7 +539,7 @@ class Profile
 
                                        $today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false);
 
-                                       $rr['link'] = Contact::magicLink($rr['url']);
+                                       $rr['link'] = Contact::magicLinkById($rr['cid']);
                                        $rr['title'] = $rr['name'];
                                        $rr['date'] = DI::l10n()->getDay(DateTimeFormat::convert($rr['start'], $a->timezone, 'UTC', $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ? ' ' . DI::l10n()->t('[today]') : '');
                                        $rr['startime'] = null;
@@ -601,9 +590,9 @@ class Profile
 
                        while ($rr = DBA::fetch($s)) {
                                $condition = ['parent-uri' => $rr['uri'], 'uid' => $rr['uid'], 'author-id' => public_contact(),
-                                       'activity' => [Item::activityToIndex( Activity::ATTEND), Item::activityToIndex(Activity::ATTENDMAYBE)],
+                                       'vid' => [Verb::getID(Activity::ATTEND), Verb::getID(Activity::ATTENDMAYBE)],
                                        'visible' => true, 'deleted' => false];
-                               if (!Item::exists($condition)) {
+                               if (!Post::exists($condition)) {
                                        continue;
                                }
 
@@ -739,7 +728,7 @@ class Profile
                        $magic_path = $basepath . '/magic' . '?owa=1&dest=' . $dest . '&' . $addr_request;
 
                        // We have to check if the remote server does understand /magic without invoking something
-                       $serverret = Network::curl($basepath . '/magic');
+                       $serverret = DI::httpRequest()->get($basepath . '/magic');
                        if ($serverret->isSuccess()) {
                                Logger::log('Doing magic auth for visitor ' . $my_url . ' to ' . $magic_path, Logger::DEBUG);
                                System::externalRedirect($magic_path);
@@ -772,7 +761,7 @@ class Profile
                $_SESSION['visitor_handle'] = $visitor['addr'];
                $_SESSION['visitor_home'] = $visitor['url'];
                $_SESSION['my_url'] = $visitor['url'];
-               $_SESSION['remote_comment'] = Probe::getRemoteFollowLink($visitor['url']);
+               $_SESSION['remote_comment'] = $visitor['subscribe'];
 
                Session::setVisitorsContacts();