Merge remote-tracking branch 'upstream/develop' into user-defined-channels

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

diff --git a/src/Module/Update/Display.php b/src/Module/Update/Display.php
index 9467badf327639386841d19042b6ee08d32218d6..57f5679790d05d2cb19311aac6a39a0aacdb6602 100644 (file)
--- a/src/Module/Update/Display.php
+++ b/src/Module/Update/Display.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
  *
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
- * See update_profile.php for documentation
  */
 
 namespace Friendica\Module\Update;
@@ -38,8 +37,8 @@ class Display extends DisplayModule
                        throw new HTTPException\UnauthorizedException($this->t('Access denied.'));
                }
 
-               $profileUid = $request['p'] ?? 0;
-               $force      = $request['force'] ?? false;
+               $profileUid = $request['p']      ?? 0;
+               $force      = $request['force']  ?? false;
                $uriId      = $request['uri_id'] ?? 0;
 
                if (empty($uriId)) {
@@ -49,20 +48,20 @@ class Display extends DisplayModule
                $item = Post::selectFirst(
                        ['uid', 'parent-uri-id', 'uri-id'],
                        ['uri-id' => $uriId, 'uid' => [0, $profileUid]],
-                       ['order' => ['uid' => true]]
+                       ['order'  => ['uid' => true]]
                );
 
                if (empty($item)) {
                        throw new HTTPException\NotFoundException($this->t('The requested item doesn\'t exist or has been deleted.'));
                }
 
-               $this->app->setProfileOwner($item['uid'] ?? $profileUid);
+               $this->app->setProfileOwner($item['uid'] ?: $profileUid);
                $parentUriId = $item['parent-uri-id'];
 
                if (empty($force)) {
-                       $browserUpdate = $this->pConfig->get($profileUid, 'system', 'update_interval');
-                       if (!empty($browserUpdate)) {
-                               $updateDate = date(DateTimeFormat::MYSQL, time() - (intval($browserUpdate) / 500));
+                       $browserUpdate = intval($this->pConfig->get($profileUid, 'system', 'update_interval') ?? 40000);
+                       if ($browserUpdate >= 1000) {
+                               $updateDate = date(DateTimeFormat::MYSQL, time() - ($browserUpdate * 2 / 1000));
                                if (!Post::exists([
                                        "`parent-uri-id` = ? AND `uid` IN (?, ?) AND `received` > ?",
                                        $parentUriId, 0,