Merge pull request #12041 from nupplaphil/feat/usersession_Module

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

diff --git a/src/Module/Update/Profile.php b/src/Module/Update/Profile.php
index 22e6e4a997b1e371dd57624cb31cdfa7981f1d2c..be15820e45d5ea24c95c8fb25208c6dda773acb2 100644 (file)
--- a/src/Module/Update/Profile.php
+++ b/src/Module/Update/Profile.php
@@ -22,7 +22,6 @@
 namespace Friendica\Module\Update;
 
 use Friendica\BaseModule;
-use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -40,15 +39,15 @@ class Profile extends BaseModule
                $a = DI::app();
 
                // Ensure we've got a profile owner if updating.
-               $a->setProfileOwner($_GET['p'] ?? 0);
+               $a->setProfileOwner((int)($_GET['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) {
                        $user = User::getById($a->getProfileOwner(), ['hidewall']);
@@ -59,47 +58,50 @@ class Profile extends BaseModule
 
                $o = '';
 
-               if (empty($_GET['force']) && DI::pConfig()->get(local_user(), 'system', 'no_auto_update')) {
+               if (empty($_GET['force']) && DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'no_auto_update')) {
                        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;
 
+               $condition = ["`uid` = ? AND NOT `contact-blocked` AND NOT `contact-pending`
+                               AND `visible` AND (NOT `deleted` OR `gravity` = ?)
+                               AND `wall` " . $sql_extra, $a->getProfileOwner(), Item::GRAVITY_ACTIVITY];
+
                if ($_GET['force'] && !empty($_GET['item'])) {
                        // When the parent is provided, we only fetch this
-                       $sql_extra4 = " AND `parent` = " . intval($_GET['item']);
+                       $condition = DBA::mergeConditions($condition, ['parent' => $_GET['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.
-                       $sql_extra4 = " AND `unseen`";
+                       $condition = DBA::mergeConditions($condition, ['unseen' => true]);
                } else {
                        $gmupdate = gmdate(DateTimeFormat::MYSQL, $last_updated);
-                       $sql_extra4 = " AND `received` > '" . $gmupdate . "'";
+                       $condition = DBA::mergeConditions($condition, ["`received` > ?", $gmupdate]);
                }
 
-               $items_stmt = DBA::p(
-                       "SELECT `parent-uri-id` AS `uri-id`, MAX(`created`), MAX(`received`) FROM `post-user-view`
-                               WHERE `uid` = ? AND NOT `contact-blocked` AND NOT `contact-pending`
-                               AND `visible` AND (NOT `deleted` OR `gravity` = ?)
-                               AND `wall` $sql_extra4 $sql_extra
-                       GROUP BY `parent-uri-id` ORDER BY `received` DESC",
-                       $a->getProfileOwner(),
-                       GRAVITY_ACTIVITY
-               );
-
-               if (!DBA::isResult($items_stmt)) {
+               $items = Post::selectToArray(['parent-uri-id', 'created', 'received'], $condition, ['group_by' => ['parent-uri-id'], 'order' => ['received' => true]]);
+               if (!DBA::isResult($items)) {
                        return;
                }
 
+               // @todo the DBA functions should handle "SELECT field AS alias" in the future,
+               // so that this workaround here could be removed.
+               $items = array_map(function ($item) {
+                       $item['uri-id'] = $item['parent-uri-id'];
+                       unset($item['parent-uri-id']);
+                       return $item;
+               }, $items);
+
                // 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();
@@ -107,14 +109,12 @@ 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()]);
                        }
                }
 
-               $items = DBA::toArray($items_stmt);
-
                $o .= DI::conversation()->create($items, 'profile', $a->getProfileOwner(), false, 'received', $a->getProfileOwner());
 
                System::htmlUpdateExit($o);