From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Thu, 5 Jan 2023 15:27:03 +0000 (-0500)
Subject: Remove system.no_auto_update personal config key and assume default value of true
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3b9bf4d70d658568eb81616855a101d8ed40f95e;p=friendica.git

Remove system.no_auto_update personal config key and assume default value of true

- By popular request, the behavior with false was too perturbating
---

diff --git a/mod/update_contact.php b/mod/update_contact.php
index 12a0aed4d6..1a85018e6d 100644
--- a/mod/update_contact.php
+++ b/mod/update_contact.php
@@ -30,7 +30,7 @@ use Friendica\Model\Contact;
 
 function update_contact_content(App $a)
 {
-	if (!empty(DI::args()->get(1)) && (!empty($_GET['force']) || !DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'no_auto_update'))) {
+	if (!empty(DI::args()->get(1)) && !empty($_GET['force'])) {
 		$contact = Contact::getById(DI::args()->get(1), ['id', 'deleted']);
 		if (DBA::isResult($contact) && empty($contact['deleted'])) {
 			DI::page()['aside'] = '';
diff --git a/src/Module/Settings/Display.php b/src/Module/Settings/Display.php
index 08b219d0da..cb9ec09ee3 100644
--- a/src/Module/Settings/Display.php
+++ b/src/Module/Settings/Display.php
@@ -79,7 +79,6 @@ class Display extends BaseSettings
 		$first_day_of_week      = !empty($request['first_day_of_week'])      ? intval($request['first_day_of_week'])      : 0;
 		$calendar_default_view  = !empty($request['calendar_default_view'])  ? trim($request['calendar_default_view'])    : 'month';
 		$infinite_scroll        = !empty($request['infinite_scroll'])        ? intval($request['infinite_scroll'])        : 0;
-		$no_auto_update         = !empty($request['no_auto_update'])         ? intval($request['no_auto_update'])         : 0;
 		$enable_smart_threading = !empty($request['enable_smart_threading']) ? intval($request['enable_smart_threading']) : 0;
 		$enable_dislike         = !empty($request['enable_dislike'])         ? intval($request['enable_dislike'])         : 0;
 		$display_resharer       = !empty($request['display_resharer'])       ? intval($request['display_resharer'])       : 0;
@@ -113,7 +112,6 @@ class Display extends BaseSettings
 		$this->pConfig->set($uid, 'system', 'itemspage_network'       , $itemspage_network);
 		$this->pConfig->set($uid, 'system', 'itemspage_mobile_network', $itemspage_mobile_network);
 		$this->pConfig->set($uid, 'system', 'update_interval'         , $browser_update);
-		$this->pConfig->set($uid, 'system', 'no_auto_update'          , $no_auto_update);
 		$this->pConfig->set($uid, 'system', 'no_smilies'              , !$enable_smile);
 		$this->pConfig->set($uid, 'system', 'infinite_scroll'         , $infinite_scroll);
 		$this->pConfig->set($uid, 'system', 'no_smart_threading'      , !$enable_smart_threading);
@@ -202,7 +200,6 @@ class Display extends BaseSettings
 			$browser_update = (($browser_update == 0) ? 40 : $browser_update / 1000); // default if not set: 40 seconds
 		}
 
-		$no_auto_update         =  $this->pConfig->get($uid, 'system', 'no_auto_update', 0);
 		$enable_smile           = !$this->pConfig->get($uid, 'system', 'no_smilies', 0);
 		$infinite_scroll        =  $this->pConfig->get($uid, 'system', 'infinite_scroll', 0);
 		$enable_smart_threading = !$this->pConfig->get($uid, 'system', 'no_smart_threading', 0);
@@ -265,7 +262,6 @@ class Display extends BaseSettings
 			'$itemspage_network'        => ['itemspage_network'       , $this->t('Number of items to display per page:'), $itemspage_network, $this->t('Maximum of 100 items')],
 			'$itemspage_mobile_network' => ['itemspage_mobile_network', $this->t('Number of items to display per page when viewed from mobile device:'), $itemspage_mobile_network, $this->t('Maximum of 100 items')],
 			'$ajaxint'                  => ['browser_update'          , $this->t('Update browser every xx seconds'), $browser_update, $this->t('Minimum of 10 seconds. Enter -1 to disable it.')],
-			'$no_auto_update'           => ['no_auto_update'          , $this->t('Automatic updates only at the top of the post stream pages'), $no_auto_update, $this->t('Auto update may add new posts at the top of the post stream pages, which can affect the scroll position and perturb normal reading if it happens anywhere else the top of the page.')],
 			'$enable_smile'	            => ['enable_smile'            , $this->t('Display emoticons'), $enable_smile, $this->t('When enabled, emoticons are replaced with matching symbols.')],
 			'$infinite_scroll'          => ['infinite_scroll'         , $this->t('Infinite scroll'), $infinite_scroll, $this->t('Automatic fetch new items when reaching the page end.')],
 			'$enable_smart_threading'   => ['enable_smart_threading'  , $this->t('Enable Smart Threading'), $enable_smart_threading, $this->t('Enable the automatic suppression of extraneous thread indentation.')],
diff --git a/src/Module/Update/Community.php b/src/Module/Update/Community.php
index b1e77c42ba..5b8e479fbf 100644
--- a/src/Module/Update/Community.php
+++ b/src/Module/Update/Community.php
@@ -38,7 +38,7 @@ class Community extends CommunityModule
 		$this->parseRequest();
 
 		$o = '';
-		if (!empty($request['force']) || !DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'no_auto_update')) {
+		if (!empty($request['force'])) {
 			$o = DI::conversation()->create(self::getItems(), 'community', true, false, 'commented', DI::userSession()->getLocalUserId());
 		}
 
diff --git a/src/Module/Update/Network.php b/src/Module/Update/Network.php
index f8367e2d91..2119631565 100644
--- a/src/Module/Update/Network.php
+++ b/src/Module/Update/Network.php
@@ -41,43 +41,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, 'network', $profile_uid, false, $ordering, DI::userSession()->getLocalUserId());
+
 		System::htmlUpdateExit($o);
 	}
 }
diff --git a/src/Module/Update/Profile.php b/src/Module/Update/Profile.php
index c2b1951349..80d3b51891 100644
--- a/src/Module/Update/Profile.php
+++ b/src/Module/Update/Profile.php
@@ -58,7 +58,7 @@ class Profile extends BaseModule
 
 		$o = '';
 
-		if (empty($request['force']) && DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'no_auto_update')) {
+		if (empty($request['force'])) {
 			System::htmlUpdateExit($o);
 		}
 
diff --git a/view/templates/settings/display.tpl b/view/templates/settings/display.tpl
index e7488b1242..4aab6721b6 100644
--- a/view/templates/settings/display.tpl
+++ b/view/templates/settings/display.tpl
@@ -13,7 +13,6 @@
 
 	{{include file="field_input.tpl" field=$itemspage_mobile_network}}
 	{{include file="field_input.tpl" field=$ajaxint}}
-	{{include file="field_checkbox.tpl" field=$no_auto_update}}
 	{{include file="field_checkbox.tpl" field=$enable_smile}}
 	{{include file="field_checkbox.tpl" field=$infinite_scroll}}
 	{{include file="field_checkbox.tpl" field=$enable_smart_threading}}
diff --git a/view/theme/frio/templates/settings/display.tpl b/view/theme/frio/templates/settings/display.tpl
index 19a22eb070..09f23d32af 100644
--- a/view/theme/frio/templates/settings/display.tpl
+++ b/view/theme/frio/templates/settings/display.tpl
@@ -60,7 +60,6 @@
 						{{include file="field_input.tpl" field=$itemspage_network}}
 						{{include file="field_input.tpl" field=$itemspage_mobile_network}}
 						{{include file="field_input.tpl" field=$ajaxint}}
-						{{include file="field_checkbox.tpl" field=$no_auto_update}}
 						{{include file="field_checkbox.tpl" field=$enable_smile}}
 						{{include file="field_checkbox.tpl" field=$infinite_scroll}}
 						{{include file="field_checkbox.tpl" field=$enable_smart_threading}}