Issue 10966: Improved logging / reworked forum functionality

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

diff --git a/src/Module/Update/Profile.php b/src/Module/Update/Profile.php
index 22e6e4a997b1e371dd57624cb31cdfa7981f1d2c..b97b9f89e5d955a9c8286e8d20a0e3843343a477 100644 (file)
--- a/src/Module/Update/Profile.php
+++ b/src/Module/Update/Profile.php
@@ -70,32 +70,35 @@ class Profile extends BaseModule
 
                $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(), 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();
@@ -113,8 +116,6 @@ class Profile extends BaseModule
                        }
                }
 
-               $items = DBA::toArray($items_stmt);
-
                $o .= DI::conversation()->create($items, 'profile', $a->getProfileOwner(), false, 'received', $a->getProfileOwner());
 
                System::htmlUpdateExit($o);