Merge pull request #12041 from nupplaphil/feat/usersession_Module

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

diff --git a/src/Module/Update/Network.php b/src/Module/Update/Network.php
index a1a120ea27dce40c5fcce6c76d3f69ba187f269c..6224d7c435e65e196ab53fb2a6eed877df3e1f83 100644 (file)
--- a/src/Module/Update/Network.php
+++ b/src/Module/Update/Network.php
@@ -1,21 +1,41 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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/>.
+ *
+ */
 
 namespace Friendica\Module\Update;
 
 use Friendica\Core\System;
 use Friendica\DI;
+use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Module\Conversation\Network as NetworkModule;
 
 class Network extends NetworkModule
 {
-       public function rawContent()
+       protected function rawContent(array $request = [])
        {
                if (!isset($_GET['p']) || !isset($_GET['item'])) {
-                       exit();
+                       System::exit();
                }
 
-               self::parseRequest($_GET);
+               $this->parseRequest($_GET);
 
                $profile_uid = intval($_GET['p']);
 
@@ -36,7 +56,7 @@ class Network extends NetworkModule
                        } elseif (self::$order === 'received') {
                                // Only load new toplevel posts
                                $conditionFields['unseen'] = true;
-                               $conditionFields['gravity'] = GRAVITY_PARENT;
+                               $conditionFields['gravity'] = Item::GRAVITY_PARENT;
                        } else {
                                // Load all unseen items
                                $conditionFields['unseen'] = true;
@@ -49,11 +69,13 @@ class Network extends NetworkModule
 
                        if (self::$order === 'received') {
                                $ordering = '`received`';
+                       } elseif (self::$order === 'created') {
+                               $ordering = '`created`';
                        } else {
                                $ordering = '`commented`';
                        }
 
-                       $o = DI::conversation()->create($items, 'network', $profile_uid, false, $ordering, local_user());
+                       $o = DI::conversation()->create($items, 'network', $profile_uid, false, $ordering, DI::userSession()->getLocalUserId());
                }
 
                System::htmlUpdateExit($o);