feat: make update data opt-in

The update section is new in Nextcloud 28, and therefore it's still possible to change the default to false. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
nextcloud · Nov 7, 2023 · 5d9269b · 5d9269b
1 parent c30b59c
commit 5d9269b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/js/script.js b/js/script.js
@@ -317,19 +317,19 @@ function updateMonitoringUrl(event) {
 
 	const url = new URL($endpointUrl.value)
 	url.searchParams.delete('format')
-	url.searchParams.delete('skipUpdate')
 	url.searchParams.delete('skipApps')
+	url.searchParams.delete('skipUpdate')
 
 	for (const $param of $params) {
 		if ($param.name === 'format_json' && $param.checked) {
 			url.searchParams.set('format', 'json')
 		}
-		if ($param.name === 'skip_update' && $param.checked) {
-			url.searchParams.set('skipUpdate', 'true')
-		}
 		if ($param.name === 'skip_apps' && $param.checked) {
 			url.searchParams.set('skipApps', 'true')
 		}
+		if ($param.name === 'skip_update' && !$param.checked) {
+			url.searchParams.set('skipUpdate', 'false')
+		}
 	}
 
 	$endpointUrl.value = url.toString()

diff --git a/lib/Controller/ApiController.php b/lib/Controller/ApiController.php
@@ -113,7 +113,7 @@ private function checkAuthorized(): bool {
 	 * @PublicPage
 	 * @BruteForceProtection(action=serverinfo)
 	 */
-	public function info(bool $skipUpdate = false, bool $skipApps = false): DataResponse {
+	public function info(bool $skipApps = false, bool $skipUpdate = true): DataResponse {
 		if (!$this->checkAuthorized()) {
 			$response = new DataResponse(['message' => 'Unauthorized']);
 			$response->throttle();
@@ -122,7 +122,7 @@ public function info(bool $skipUpdate = false, bool $skipApps = false): DataResp
 		}
 		return new DataResponse([
 			'nextcloud' => [
-				'system' => $this->systemStatistics->getSystemStatistics($skipUpdate, $skipApps),
+				'system' => $this->systemStatistics->getSystemStatistics($skipApps, $skipUpdate),
 				'storage' => $this->storageStatistics->getStorageStatistics(),
 				'shares' => $this->shareStatistics->getShareStatistics()
 			],

diff --git a/lib/SystemStatistics.php b/lib/SystemStatistics.php
@@ -51,7 +51,7 @@ public function __construct(IConfig $config, IAppManager $appManager, Installer
 	 *
 	 * @throws \OCP\Files\InvalidPathException
 	 */
-	public function getSystemStatistics(bool $skipUpdate = false, bool $skipApps = false): array {
+	public function getSystemStatistics(bool $skipApps = false, bool $skipUpdate = true): array {
 		$processorUsage = $this->getProcessorUsage();
 		$memoryUsage = $this->os->getMemory();
 
@@ -73,14 +73,14 @@ public function getSystemStatistics(bool $skipUpdate = false, bool $skipApps = f
 			'swap_free' => $memoryUsage->getSwapFree() * 1024,
 		];
 
-		if (!$skipUpdate) {
-			$data['update'] = $this->getServerUpdateInfo();
-		}
-
 		if (!$skipApps) {
 			$data['apps'] = $this->getAppsInfo();
 		}
 
+		if (!$skipUpdate) {
+			$data['update'] = $this->getServerUpdateInfo();
+		}
+
 		return $data;
 	}
 

diff --git a/templates/settings-admin.php b/templates/settings-admin.php
@@ -424,14 +424,14 @@ function FormatMegabytes(int $byte): string {
 						<input type="checkbox" class="update-monitoring-endpoint-url" name="format_json" id="format_json">
 						<label for="format_json"><?php p($l->t('Output in JSON')) ?></label>
 					</div>
-					<div class="monitoring-url-param">
-						<input type="checkbox" class="update-monitoring-endpoint-url" name="skip_update" id="skip_update">
-						<label for="skip_update"><?php p($l->t('Skip server update')) ?></label>
-					</div>
 					<div class="monitoring-url-param">
 						<input type="checkbox" class="update-monitoring-endpoint-url" name="skip_apps" id="skip_apps">
 						<label for="skip_apps"><?php p($l->t('Skip app updates (including app updates will send an external request to the app store)')) ?></label>
 					</div>
+					<div class="monitoring-url-param">
+						<input type="checkbox" class="update-monitoring-endpoint-url" name="skip_update" id="skip_update" checked>
+						<label for="skip_update"><?php p($l->t('Skip server update')) ?></label>
+					</div>
 				</div>
 
 				<p>