Merge pull request #12896 from HankG/mastodon-status-edit-fix-link-preview-changing

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

diff --git a/src/Module/Update/Network.php b/src/Module/Update/Network.php
index f8367e2d918379e511ccd8b76150a891c26b1c63..052ae040f066fd56396dab8aa22bd1011671cbf3 100644 (file)
--- a/src/Module/Update/Network.php
+++ b/src/Module/Update/Network.php
@@ -21,6 +21,7 @@
 
 namespace Friendica\Module\Update;
 
+use Friendica\Content\Conversation;
 use Friendica\Core\System;
 use Friendica\DI;
 use Friendica\Model\Item;
@@ -41,43 +42,45 @@ class Network extends NetworkModule
 
                $o = '';
 
-               if (!DI::pConfig()->get($profile_uid, 'system', 'no_auto_update') || ($request['force'] == 1)) {
-                       if (!empty($request['item'])) {
-                               $item = Post::selectFirst(['parent'], ['id' => $request['item']]);
-                               $parent = $item['parent'] ?? 0;
-                       } else {
-                               $parent = 0;
-                       }
+               if (empty($request['force'])) {
+                       System::htmlUpdateExit($o);
+               }
 
-                       $conditionFields = [];
-                       if (!empty($parent)) {
-                               // Load only a single thread
-                               $conditionFields['parent'] = $parent;
-                       } elseif (self::$order === 'received') {
-                               // Only load new toplevel posts
-                               $conditionFields['unseen'] = true;
-                               $conditionFields['gravity'] = Item::GRAVITY_PARENT;
-                       } else {
-                               // Load all unseen items
-                               $conditionFields['unseen'] = true;
-                       }
+               if (!empty($request['item'])) {
+                       $item = Post::selectFirst(['parent'], ['id' => $request['item']]);
+                       $parent = $item['parent'] ?? 0;
+               } else {
+                       $parent = 0;
+               }
 
-                       $params = ['limit' => 100];
-                       $table = 'network-item-view';
+               $conditionFields = [];
+               if (!empty($parent)) {
+                       // Load only a single thread
+                       $conditionFields['parent'] = $parent;
+               } elseif (self::$order === 'received') {
+                       // Only load new toplevel posts
+                       $conditionFields['unseen'] = true;
+                       $conditionFields['gravity'] = Item::GRAVITY_PARENT;
+               } else {
+                       // Load all unseen items
+                       $conditionFields['unseen'] = true;
+               }
 
-                       $items = self::getItems($table, $params, $conditionFields);
+               $params = ['limit' => 100];
+               $table = 'network-item-view';
 
-                       if (self::$order === 'received') {
-                               $ordering = '`received`';
-                       } elseif (self::$order === 'created') {
-                               $ordering = '`created`';
-                       } else {
-                               $ordering = '`commented`';
-                       }
+               $items = self::getItems($table, $params, $conditionFields);
 
-                       $o = DI::conversation()->create($items, 'network', $profile_uid, false, $ordering, DI::userSession()->getLocalUserId());
+               if (self::$order === 'received') {
+                       $ordering = '`received`';
+               } elseif (self::$order === 'created') {
+                       $ordering = '`created`';
+               } else {
+                       $ordering = '`commented`';
                }
 
+               $o = DI::conversation()->create($items, Conversation::MODE_NETWORK, $profile_uid, false, $ordering, DI::userSession()->getLocalUserId());
+
                System::htmlUpdateExit($o);
        }
 }