Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-27 19:50:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace calls of Addon::getVisibleList() with AddonHelper::getVisibleEnabledAddons()

Browse source
This commit is contained in:
Art4 2025-02-03 14:54:45 +00:00
parent 04df082d4e
commit 4ea648475f
3 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Core/Addon.php
View file

@ -275,7 +275,7 @@ class Addon
/** /**
* Checks if the provided addon is enabled * 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 * @param string $addon
* @return boolean * @return boolean
@ -288,7 +288,7 @@ class Addon
/** /**
* Returns a list of the enabled addon names * 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 * @return array
*/ */
@ -300,7 +300,7 @@ class Addon
/** /**
* Returns the list of non-hidden enabled addon names * 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 * @return array
* @throws \Exception * @throws \Exception

9
src/Module/Friendica.php
View file

@ -12,6 +12,7 @@ use Friendica\App\Arguments;
use Friendica\App\BaseURL; use Friendica\App\BaseURL;
use Friendica\BaseModule; use Friendica\BaseModule;
use Friendica\Core\Addon; use Friendica\Core\Addon;
use Friendica\Core\Addon\AddonHelper;
use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\Config\Capability\IManageConfigValues;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs; use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs;
@ -31,6 +32,7 @@ use Psr\Log\LoggerInterface;
*/ */
class Friendica extends BaseModule class Friendica extends BaseModule
{ {
private AddonHelper $addonHelper;
/** @var IManageConfigValues */ /** @var IManageConfigValues */
private $config; private $config;
/** @var IManageKeyValuePairs */ /** @var IManageKeyValuePairs */
@ -38,18 +40,19 @@ class Friendica extends BaseModule
/** @var IHandleUserSessions */ /** @var IHandleUserSessions */
private $session; 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); parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
$this->config = $config; $this->config = $config;
$this->keyValue = $keyValue; $this->keyValue = $keyValue;
$this->session = $session; $this->session = $session;
$this->addonHelper = $addonHelper;
} }
protected function content(array $request = []): string protected function content(array $request = []): string
{ {
$visibleAddonList = Addon::getVisibleList(); $visibleAddonList = $this->addonHelper->getVisibleEnabledAddons();
if (!empty($visibleAddonList)) { if (!empty($visibleAddonList)) {
$sorted = $visibleAddonList; $sorted = $visibleAddonList;
@ -157,7 +160,7 @@ class Friendica extends BaseModule
]; ];
} }
$visible_addons = Addon::getVisibleList(); $visible_addons = $this->addonHelper->getVisibleEnabledAddons();
$this->config->reload(); $this->config->reload();
$locked_features = []; $locked_features = [];

19
src/Protocol/ZOT.php
View file

@ -43,6 +43,11 @@ class ZOT
*/ */
public static function getSiteInfo(): array public static function getSiteInfo(): array
{ {
$baseUrl = (string) DI::baseUrl();
$keyValue = DI::keyValue();
$addonHelper = DI::addonHelper();
$config = DI::config();
$policies = [ $policies = [
Module\Register::OPEN => 'open', Module\Register::OPEN => 'open',
Module\Register::APPROVE => 'approve', Module\Register::APPROVE => 'approve',
@ -50,14 +55,14 @@ class ZOT
]; ];
return [ return [
'url' => (string)DI::baseUrl(), 'url' => $baseUrl,
'openWebAuth' => (string)DI::baseUrl() . '/owa', 'openWebAuth' => $baseUrl . '/owa',
'authRedirect' => (string)DI::baseUrl() . '/magic', 'authRedirect' => $baseUrl . '/magic',
'register_policy' => $policies[Register::getPolicy()], 'register_policy' => $policies[Register::getPolicy()],
'accounts' => DI::keyValue()->get('nodeinfo_total_users'), 'accounts' => $keyValue->get('nodeinfo_total_users'),
'plugins' => Addon::getVisibleList(), 'plugins' => $addonHelper->getVisibleEnabledAddons(),
'sitename' => DI::config()->get('config', 'sitename'), 'sitename' => $config->get('config', 'sitename'),
'about' => DI::config()->get('config', 'info'), 'about' => $config->get('config', 'info'),
'project' => App::PLATFORM, 'project' => App::PLATFORM,
'version' => App::VERSION, 'version' => App::VERSION,
]; ];