Move Addon/Hook dependency where it belongs :)

diff --git a/src/App.php b/src/App.php
index d1b37a1ccd6a917dee81cab2cbdf3a2d8216b653..11392b2c5e70a9448a4cfd5b9e4b8eff8f9d949c 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -214,9 +214,6 @@ class App
 
                $this->registerTemplateEngine();
 
-               Addon::loadAddons();
-               Hook::loadHooks();
-
                (new \Friendica\Core\Console($this->container, $argv))->execute();
        }
 

diff --git a/src/Console/JetstreamDaemon.php b/src/Console/JetstreamDaemon.php
index c7db468888a97ff059b42a5365eadef44ec043e0..8dd726f4b90301b702409c5041435a1e80166b93 100644 (file)
--- a/src/Console/JetstreamDaemon.php
+++ b/src/Console/JetstreamDaemon.php
@@ -13,6 +13,7 @@ use Friendica\App\Mode;
 use Friendica\Core\Addon;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Asika\SimpleConsole\Console;
+use Friendica\Core\Hook;
 use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs;
 use Friendica\Protocol\ATProtocol\Jetstream;
 use Friendica\System\Daemon as SysDaemon;
@@ -94,6 +95,9 @@ HELP;
                        );
                }
 
+               Addon::loadAddons();
+               Hook::loadHooks();
+
                if (!Addon::isEnabled('bluesky')) {
                        throw new RuntimeException("Bluesky has to be enabled.\n");
                }