From f8f8acef838377b65f9a29f9fc3e7e15cd633adc Mon Sep 17 00:00:00 2001
From: Git'Fellow <12234510+solracsf@users.noreply.github.com>
Date: Mon, 9 Sep 2024 09:29:09 +0200
Subject: fix(appstore): return if appstore is manually disabled

Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>

fix: camel case

Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>

fix: log a debug log

Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>

fix: typing

Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>

fix: typo

fix: typing
---
 lib/private/App/AppStore/Fetcher/AppFetcher.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'lib/private')

diff --git a/lib/private/App/AppStore/Fetcher/AppFetcher.php b/lib/private/App/AppStore/Fetcher/AppFetcher.php
index 3f7f5e0a3bd..6deeed98f0c 100644
--- a/lib/private/App/AppStore/Fetcher/AppFetcher.php
+++ b/lib/private/App/AppStore/Fetcher/AppFetcher.php
@@ -180,10 +180,17 @@ class AppFetcher extends Fetcher {
 		$this->ignoreMaxVersion = $ignoreMaxVersion;
 	}
 
-
-	public function get($allowUnstable = false) {
+	public function get($allowUnstable = false): array {
 		$allowPreReleases = $allowUnstable || $this->getChannel() === 'beta' || $this->getChannel() === 'daily' || $this->getChannel() === 'git';
 
+		$appStoreEnabled = $this->config->getSystemValueBool('appstoreenabled', true);
+		$internetAvailable = $this->config->getSystemValueBool('has_internet_connection', true);
+
+		if (!$appStoreEnabled || !$internetAvailable) {
+			$this->logger->debug('AppStore is disabled or this instance has no Internet connection', ['app' => 'appstoreFetcher']);
+			return [];
+		}
+
 		$apps = parent::get($allowPreReleases);
 		if (empty($apps)) {
 			$this->logger->warning('Could not get apps from the appstore', ['app' => 'appstoreFetcher']);
-- 
cgit v1.2.3