Mode depending control for the behaviour with blocked contacts

[friendica.git] / src / Module / Update / Profile.php

diff --git a/src/Module/Update/Profile.php b/src/Module/Update/Profile.php
index b7dae9ec11ce2e8bc6a5e0556cdb44938ea77a42..53406e195f82d9760141cce847c5a5332f5d0416 100644 (file)
--- a/src/Module/Update/Profile.php
+++ b/src/Module/Update/Profile.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,7 +22,7 @@
 namespace Friendica\Module\Update;
 
 use Friendica\BaseModule;
-use Friendica\Core\Session;
+use Friendica\Content\Conversation;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -40,17 +40,17 @@ class Profile extends BaseModule
                $a = DI::app();
 
                // Ensure we've got a profile owner if updating.
-               $a->setProfileOwner((int)($_GET['p'] ?? 0));
+               $a->setProfileOwner((int)($request['p'] ?? 0));
 
-               if (DI::config()->get('system', 'block_public') && !local_user() && !Session::getRemoteContactID($a->getProfileOwner())) {
+               if (DI::config()->get('system', 'block_public') && !DI::userSession()->getLocalUserId() && !DI::userSession()->getRemoteContactID($a->getProfileOwner())) {
                        throw new ForbiddenException();
                }
 
-               $remote_contact = Session::getRemoteContactID($a->getProfileOwner());
-               $is_owner = local_user() == $a->getProfileOwner();
-               $last_updated_key = "profile:" . $a->getProfileOwner() . ":" . local_user() . ":" . $remote_contact;
+               $remote_contact = DI::userSession()->getRemoteContactID($a->getProfileOwner());
+               $is_owner = DI::userSession()->getLocalUserId() == $a->getProfileOwner();
+               $last_updated_key = "profile:" . $a->getProfileOwner() . ":" . DI::userSession()->getLocalUserId() . ":" . $remote_contact;
 
-               if (!$is_owner && !$remote_contact) {
+               if (!DI::userSession()->isAuthenticated()) {
                        $user = User::getById($a->getProfileOwner(), ['hidewall']);
                        if ($user['hidewall']) {
                                throw new ForbiddenException(DI::l10n()->t('Access to this profile has been restricted.'));
@@ -59,14 +59,14 @@ class Profile extends BaseModule
 
                $o = '';
 
-               if (empty($_GET['force']) && DI::pConfig()->get(local_user(), 'system', 'no_auto_update')) {
+               if (empty($request['force'])) {
                        System::htmlUpdateExit($o);
                }
 
                // Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups
                $sql_extra = Item::getPermissionsSQLByUserId($a->getProfileOwner());
 
-               $last_updated_array = Session::get('last_updated', []);
+               $last_updated_array = DI::session()->get('last_updated', []);
 
                $last_updated = $last_updated_array[$last_updated_key] ?? 0;
 
@@ -74,9 +74,9 @@ class Profile extends BaseModule
                                AND `visible` AND (NOT `deleted` OR `gravity` = ?)
                                AND `wall` " . $sql_extra, $a->getProfileOwner(), Item::GRAVITY_ACTIVITY];
 
-               if ($_GET['force'] && !empty($_GET['item'])) {
+               if ($request['force'] && !empty($request['item'])) {
                        // When the parent is provided, we only fetch this
-                       $condition = DBA::mergeConditions($condition, ['parent' => $_GET['item']]);
+                       $condition = DBA::mergeConditions($condition, ['parent' => $request['item']]);
                } elseif ($is_owner || !$last_updated) {
                        // If the page user is the owner of the page we should query for unseen
                        // items. Otherwise use a timestamp of the last succesful update request.
@@ -102,7 +102,7 @@ class Profile extends BaseModule
                // Set a time stamp for this page. We will make use of it when we
                // search for new items (update routine)
                $last_updated_array[$last_updated_key] = time();
-               Session::set('last_updated', $last_updated_array);
+               DI::session()->set('last_updated', $last_updated_array);
 
                if ($is_owner && !$a->getProfileOwner() && !DI::config()->get('theme', 'hide_eventlist')) {
                        $o .= ProfileModel::getBirthdays();
@@ -110,13 +110,13 @@ class Profile extends BaseModule
                }
 
                if ($is_owner) {
-                       $unseen = Post::exists(['wall' => true, 'unseen' => true, 'uid' => local_user()]);
+                       $unseen = Post::exists(['wall' => true, 'unseen' => true, 'uid' => DI::userSession()->getLocalUserId()]);
                        if ($unseen) {
-                               Item::update(['unseen' => false], ['wall' => true, 'unseen' => true, 'uid' => local_user()]);
+                               Item::update(['unseen' => false], ['wall' => true, 'unseen' => true, 'uid' => DI::userSession()->getLocalUserId()]);
                        }
                }
 
-               $o .= DI::conversation()->create($items, 'profile', $a->getProfileOwner(), false, 'received', $a->getProfileOwner());
+               $o .= DI::conversation()->create($items, Conversation::MODE_PROFILE, $a->getProfileOwner(), false, 'received', $a->getProfileOwner());
 
                System::htmlUpdateExit($o);
        }