Remove FollowRequest type and use mstdnAccount->createFromContactId instead

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index 224a895e294f88c2d83253b671c45bb464707cd3..9df62a4e776bdb49be18ec5e682cd2156364d5f9 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -25,6 +25,7 @@ use Exception;
 use Friendica\App\Arguments;
 use Friendica\App\BaseURL;
 use Friendica\Capabilities\ICanCreateResponses;
+use Friendica\Content\Nav;
 use Friendica\Core\Config\Factory\Config;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Database\Definition\DbaDefinition;
@@ -356,8 +357,6 @@ class App
                $this->profiler->reset();
 
                if ($this->mode->has(App\Mode::DBAVAILABLE)) {
-                       $this->profiler->update($this->config);
-
                        Core\Hook::loadHooks();
                        $loader = (new Config())->createConfigFileManager($this->getBasePath(), $_SERVER);
                        Core\Hook::callAll('load_config', $loader);
@@ -541,25 +540,6 @@ class App
                return Core\Theme::getStylesheetPath($this->getCurrentTheme());
        }
 
-       /**
-        * Sets the base url for use in cmdline programs which don't have
-        * $_SERVER variables
-        */
-       public function checkURL()
-       {
-               $url = $this->config->get('system', 'url');
-
-               // if the url isn't set or the stored url is radically different
-               // than the currently visited url, store the current value accordingly.
-               // "Radically different" ignores common variations such as http vs https
-               // and www.example.com vs example.com.
-               // We will only change the url to an ip address if there is no existing setting
-
-               if (empty($url) || (!Util\Strings::compareLink($url, $this->baseURL->get())) && (!preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/", $this->baseURL->getHostname()))) {
-                       $this->config->set('system', 'url', $this->baseURL->get());
-               }
-       }
-
        /**
         * Frontend App script
         *
@@ -579,7 +559,7 @@ class App
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public function runFrontend(App\Router $router, IManagePersonalConfigValues $pconfig, Authentication $auth, App\Page $page, ModuleHTTPException $httpException, HTTPInputData $httpInput, float $start_time)
+       public function runFrontend(App\Router $router, IManagePersonalConfigValues $pconfig, Authentication $auth, App\Page $page, Nav $nav, ModuleHTTPException $httpException, HTTPInputData $httpInput, float $start_time)
        {
                $this->profiler->set($start_time, 'start');
                $this->profiler->set(microtime(true), 'classinit');
@@ -658,7 +638,6 @@ class App
                        if ($this->mode->isInstall() && $moduleName !== 'install') {
                                $this->baseURL->redirect('install');
                        } else {
-                               $this->checkURL();
                                Core\Update::check($this->getBasePath(), false);
                                Core\Addon::loadAddons();
                                Core\Hook::loadHooks();
@@ -718,7 +697,7 @@ class App
                        $response = $module->run($httpException, $input);
                        $this->profiler->set(microtime(true) - $timestamp, 'content');
                        if ($response->getHeaderLine(ICanCreateResponses::X_HEADER) === ICanCreateResponses::TYPE_HTML) {
-                               $page->run($this, $this->baseURL, $this->args, $this->mode, $response, $this->l10n, $this->profiler, $this->config, $pconfig, $this->session->getLocalUserId());
+                               $page->run($this, $this->baseURL, $this->args, $this->mode, $response, $this->l10n, $this->profiler, $this->config, $pconfig, $nav, $this->session->getLocalUserId());
                        } else {
                                $page->exit($response);
                        }