From 4ea648475f0571be3fc496570244825a169c68fe Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Mon, 3 Feb 2025 14:54:45 +0000
Subject: [PATCH] Replace calls of Addon::getVisibleList() with
 AddonHelper::getVisibleEnabledAddons()

---
 src/Core/Addon.php       |  6 +++---
 src/Module/Friendica.php |  9 ++++++---
 src/Protocol/ZOT.php     | 19 ++++++++++++-------
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/Core/Addon.php b/src/Core/Addon.php
index 1109bafd2d..4299b5ec0f 100644
--- a/src/Core/Addon.php
+++ b/src/Core/Addon.php
@@ -275,7 +275,7 @@ class Addon
 	/**
 	 * Checks if the provided addon is enabled
 	 *
-	 * @deprecated 2025.02 Use `Friendica\Core\Addon\AddonHelper::isEnabled()` instead
+	 * @deprecated 2025.02 Use `Friendica\Core\Addon\AddonHelper::isAddonEnabled()` instead
 	 *
 	 * @param string $addon
 	 * @return boolean
@@ -288,7 +288,7 @@ class Addon
 	/**
 	 * Returns a list of the enabled addon names
 	 *
-	 * @deprecated 2025.02 Use `Friendica\Core\Addon\AddonHelper::getEnabledList()` instead
+	 * @deprecated 2025.02 Use `Friendica\Core\Addon\AddonHelper::getEnabledAddons()` instead
 	 *
 	 * @return array
 	 */
@@ -300,7 +300,7 @@ class Addon
 	/**
 	 * Returns the list of non-hidden enabled addon names
 	 *
-	 * @deprecated 2025.02 Use `Friendica\Core\Addon\AddonHelper::getVisibleList()` instead
+	 * @deprecated 2025.02 Use `Friendica\Core\Addon\AddonHelper::getVisibleEnabledAddons()` instead
 	 *
 	 * @return array
 	 * @throws \Exception
diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php
index cd1362b3af..97fb8e27e5 100644
--- a/src/Module/Friendica.php
+++ b/src/Module/Friendica.php
@@ -12,6 +12,7 @@ use Friendica\App\Arguments;
 use Friendica\App\BaseURL;
 use Friendica\BaseModule;
 use Friendica\Core\Addon;
+use Friendica\Core\Addon\AddonHelper;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\Hook;
 use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs;
@@ -31,6 +32,7 @@ use Psr\Log\LoggerInterface;
  */
 class Friendica extends BaseModule
 {
+	private AddonHelper $addonHelper;
 	/** @var IManageConfigValues */
 	private $config;
 	/** @var IManageKeyValuePairs */
@@ -38,18 +40,19 @@ class Friendica extends BaseModule
 	/** @var IHandleUserSessions */
 	private $session;
 
-	public function __construct(IHandleUserSessions $session, IManageKeyValuePairs $keyValue, IManageConfigValues $config, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+	public function __construct(AddonHelper $addonHelper, IHandleUserSessions $session, IManageKeyValuePairs $keyValue, IManageConfigValues $config, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
 	{
 		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
 		$this->config = $config;
 		$this->keyValue = $keyValue;
 		$this->session = $session;
+		$this->addonHelper = $addonHelper;
 	}
 
 	protected function content(array $request = []): string
 	{
-		$visibleAddonList = Addon::getVisibleList();
+		$visibleAddonList = $this->addonHelper->getVisibleEnabledAddons();
 		if (!empty($visibleAddonList)) {
 
 			$sorted = $visibleAddonList;
@@ -157,7 +160,7 @@ class Friendica extends BaseModule
 			];
 		}
 
-		$visible_addons = Addon::getVisibleList();
+		$visible_addons = $this->addonHelper->getVisibleEnabledAddons();
 
 		$this->config->reload();
 		$locked_features = [];
diff --git a/src/Protocol/ZOT.php b/src/Protocol/ZOT.php
index b5604bcc84..0f9dd12653 100644
--- a/src/Protocol/ZOT.php
+++ b/src/Protocol/ZOT.php
@@ -43,6 +43,11 @@ class ZOT
 	 */
 	public static function getSiteInfo(): array
 	{
+		$baseUrl     = (string) DI::baseUrl();
+		$keyValue    = DI::keyValue();
+		$addonHelper = DI::addonHelper();
+		$config      = DI::config();
+
 		$policies = [
 			Module\Register::OPEN    => 'open',
 			Module\Register::APPROVE => 'approve',
@@ -50,14 +55,14 @@ class ZOT
 		];
 
 		return [
-			'url'             => (string)DI::baseUrl(),
-			'openWebAuth'     => (string)DI::baseUrl() . '/owa',
-			'authRedirect'    => (string)DI::baseUrl() . '/magic',
+			'url'             => $baseUrl,
+			'openWebAuth'     => $baseUrl . '/owa',
+			'authRedirect'    => $baseUrl . '/magic',
 			'register_policy' => $policies[Register::getPolicy()],
-			'accounts'        => DI::keyValue()->get('nodeinfo_total_users'),
-			'plugins'         => Addon::getVisibleList(),
-			'sitename'        => DI::config()->get('config', 'sitename'),
-			'about'           => DI::config()->get('config', 'info'),
+			'accounts'        => $keyValue->get('nodeinfo_total_users'),
+			'plugins'         => $addonHelper->getVisibleEnabledAddons(),
+			'sitename'        => $config->get('config', 'sitename'),
+			'about'           => $config->get('config', 'info'),
 			'project'         => App::PLATFORM,
 			'version'         => App::VERSION,
 		];