From 018275919ce1862e08c9aaf7f8098c610fe71916 Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Sun, 14 Nov 2021 20:28:36 +0100
Subject: [PATCH 01/17] Create interface for static Module calls

---
 index.php                               |  1 +
 src/App.php                             |  7 ++-
 src/App/Module.php                      | 57 ++++++++----------
 src/App/Page.php                        |  8 +--
 src/BaseModule.php                      | 71 +++++++++++-----------
 src/Capabilities/ICanHandleRequests.php | 79 +++++++++++++++++++++++++
 tests/src/App/ModeTest.php              | 12 ++--
 tests/src/App/ModuleTest.php            | 28 +++++----
 8 files changed, 170 insertions(+), 93 deletions(-)
 create mode 100644 src/Capabilities/ICanHandleRequests.php

diff --git a/index.php b/index.php
index 4f690ed518..cfb5937368 100644
--- a/index.php
+++ b/index.php
@@ -46,5 +46,6 @@ $a->runFrontend(
 	$dice->create(\Friendica\Core\PConfig\Capability\IManagePersonalConfigValues::class),
 	$dice->create(\Friendica\Security\Authentication::class),
 	$dice->create(\Friendica\App\Page::class),
+	$dice,
 	$start_time
 );
diff --git a/src/App.php b/src/App.php
index 75f5314af5..63d28fc80c 100644
--- a/src/App.php
+++ b/src/App.php
@@ -21,6 +21,7 @@
 
 namespace Friendica;
 
+use Dice\Dice;
 use Exception;
 use Friendica\App\Arguments;
 use Friendica\App\BaseURL;
@@ -575,7 +576,7 @@ class App
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public function runFrontend(App\Module $module, App\Router $router, IManagePersonalConfigValues $pconfig, Authentication $auth, App\Page $page, float $start_time)
+	public function runFrontend(App\Module $module, App\Router $router, IManagePersonalConfigValues $pconfig, Authentication $auth, App\Page $page, Dice $dice, float $start_time)
 	{
 		$this->profiler->set($start_time, 'start');
 		$this->profiler->set(microtime(true), 'classinit');
@@ -702,11 +703,11 @@ class App
 			$page['page_title'] = $moduleName;
 
 			if (!$this->mode->isInstall() && !$this->mode->has(App\Mode::MAINTENANCEDISABLED)) {
-				$module = new Module('maintenance', Maintenance::class);
+				$module = new Module('maintenance', new Maintenance());
 			} else {
 				// determine the module class and save it to the module instance
 				// @todo there's an implicit dependency due SESSION::start(), so it has to be called here (yet)
-				$module = $module->determineClass($this->args, $router, $this->config);
+				$module = $module->determineClass($this->args, $router, $this->config, $dice);
 			}
 
 			// Let the module run it's internal process (init, get, post, ...)
diff --git a/src/App/Module.php b/src/App/Module.php
index 5b7c3d1500..98d2d620d2 100644
--- a/src/App/Module.php
+++ b/src/App/Module.php
@@ -21,8 +21,9 @@
 
 namespace Friendica\App;
 
+use Dice\Dice;
 use Friendica\App;
-use Friendica\BaseModule;
+use Friendica\Capabilities\ICanHandleRequests;
 use Friendica\Core;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\LegacyModule;
@@ -80,15 +81,10 @@ class Module
 	private $module;
 
 	/**
-	 * @var BaseModule The module class
+	 * @var ICanHandleRequests The module class
 	 */
 	private $module_class;
 
-	/**
-	 * @var array The module parameters
-	 */
-	private $module_parameters;
-
 	/**
 	 * @var bool true, if the module is a backend module
 	 */
@@ -108,21 +104,13 @@ class Module
 	}
 
 	/**
-	 * @return string The base class name
+	 * @return ICanHandleRequests The base class name
 	 */
-	public function getClassName()
+	public function getClass(): ICanHandleRequests
 	{
 		return $this->module_class;
 	}
 
-	/**
-	 * @return array The module parameters extracted from the route
-	 */
-	public function getParameters()
-	{
-		return $this->module_parameters;
-	}
-
 	/**
 	 * @return bool True, if the current module is a backend module
 	 * @see Module::BACKEND_MODULES for a list
@@ -132,11 +120,12 @@ class Module
 		return $this->isBackend;
 	}
 
-	public function __construct(string $module = self::DEFAULT, string $moduleClass = self::DEFAULT_CLASS, array $moduleParameters = [], bool $isBackend = false, bool $printNotAllowedAddon = false)
+	public function __construct(string $module = self::DEFAULT, ICanHandleRequests $module_class = null, bool $isBackend = false, bool $printNotAllowedAddon = false)
 	{
+		$defaultClass = static::DEFAULT_CLASS;
+
 		$this->module               = $module;
-		$this->module_class         = $moduleClass;
-		$this->module_parameters    = $moduleParameters;
+		$this->module_class         = $module_class ?? new $defaultClass();
 		$this->isBackend            = $isBackend;
 		$this->printNotAllowedAddon = $printNotAllowedAddon;
 	}
@@ -164,21 +153,22 @@ class Module
 
 		$isBackend = in_array($module, Module::BACKEND_MODULES);;
 
-		return new Module($module, $this->module_class, [], $isBackend, $this->printNotAllowedAddon);
+		return new Module($module,null, $isBackend, $this->printNotAllowedAddon);
 	}
 
 	/**
 	 * Determine the class of the current module
 	 *
-	 * @param Arguments                                             $args   The Friendica execution arguments
-	 * @param Router                                                $router The Friendica routing instance
+	 * @param Arguments           $args   The Friendica execution arguments
+	 * @param Router              $router The Friendica routing instance
 	 * @param IManageConfigValues $config The Friendica Configuration
+	 * @param Dice                $dice   The Dependency Injection container
 	 *
 	 * @return Module The determined module of this call
 	 *
 	 * @throws \Exception
 	 */
-	public function determineClass(Arguments $args, Router $router, IManageConfigValues $config)
+	public function determineClass(Arguments $args, Router $router, IManageConfigValues $config, Dice $dice)
 	{
 		$printNotAllowedAddon = false;
 
@@ -222,7 +212,10 @@ class Module
 			$module_class = $module_class ?: PageNotFound::class;
 		}
 
-		return new Module($this->module, $module_class, $module_parameters, $this->isBackend, $printNotAllowedAddon);
+		/** @var ICanHandleRequests $module */
+		$module = $dice->create($module_class, [$module_parameters]);
+
+		return new Module($this->module, $module, $this->isBackend, $printNotAllowedAddon);
 	}
 
 	/**
@@ -304,32 +297,32 @@ class Module
 
 		Core\Hook::callAll($this->module . '_mod_init', $placeholder);
 
-		call_user_func([$this->module_class, 'init'], $this->module_parameters);
+		$this->module_class::init($this->module_class::getParameters());
 
 		$profiler->set(microtime(true) - $timestamp, 'init');
 
 		if ($server['REQUEST_METHOD'] === Router::DELETE) {
-			call_user_func([$this->module_class, 'delete'], $this->module_parameters);
+			$this->module_class::delete($this->module_class::getParameters());
 		}
 
 		if ($server['REQUEST_METHOD'] === Router::PATCH) {
-			call_user_func([$this->module_class, 'patch'], $this->module_parameters);
+			$this->module_class::patch($this->module_class::getParameters());
 		}
 
 		if ($server['REQUEST_METHOD'] === Router::POST) {
 			Core\Hook::callAll($this->module . '_mod_post', $post);
-			call_user_func([$this->module_class, 'post'], $this->module_parameters);
+			$this->module_class::post($this->module_class::getParameters());
 		}
 
 		if ($server['REQUEST_METHOD'] === Router::PUT) {
-			call_user_func([$this->module_class, 'put'], $this->module_parameters);
+			$this->module_class::put($this->module_class::getParameters());
 		}
 
 		Core\Hook::callAll($this->module . '_mod_afterpost', $placeholder);
-		call_user_func([$this->module_class, 'afterpost'], $this->module_parameters);
+		$this->module_class::afterpost($this->module_class::getParameters());
 
 		// "rawContent" is especially meant for technical endpoints.
 		// This endpoint doesn't need any theme initialization or other comparable stuff.
-		call_user_func([$this->module_class, 'rawContent'], $this->module_parameters);
+		$this->module_class::rawContent($this->module_class::getParameters());
 	}
 }
diff --git a/src/App/Page.php b/src/App/Page.php
index fcb2d18533..c20f26cefb 100644
--- a/src/App/Page.php
+++ b/src/App/Page.php
@@ -347,13 +347,13 @@ class Page implements ArrayAccess
 		$content = '';
 
 		try {
-			$moduleClass = $module->getClassName();
+			$moduleClass = $module->getClass();
 
 			$arr = ['content' => $content];
-			Hook::callAll($moduleClass . '_mod_content', $arr);
+			Hook::callAll( $moduleClass::getClassName() . '_mod_content', $arr);
 			$content = $arr['content'];
-			$arr     = ['content' => call_user_func([$moduleClass, 'content'], $module->getParameters())];
-			Hook::callAll($moduleClass . '_mod_aftercontent', $arr);
+			$arr     = ['content' => $moduleClass::content($moduleClass::getParameters())];
+			Hook::callAll($moduleClass::getClassName() . '_mod_aftercontent', $arr);
 			$content .= $arr['content'];
 		} catch (HTTPException $e) {
 			$content = ModuleHTTPException::content($e);
diff --git a/src/BaseModule.php b/src/BaseModule.php
index ced1e55c39..90ba9e1329 100644
--- a/src/BaseModule.php
+++ b/src/BaseModule.php
@@ -21,6 +21,7 @@
 
 namespace Friendica;
 
+use Friendica\Capabilities\ICanHandleRequests;
 use Friendica\Core\Logger;
 use Friendica\Model\User;
 
@@ -33,23 +34,33 @@ use Friendica\Model\User;
  *
  * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
-abstract class BaseModule
+abstract class BaseModule implements ICanHandleRequests
 {
+	/** @var array */
+	protected static $parameters = [];
+
+	public function __construct(array $parameters = [])
+	{
+		static::$parameters = $parameters;
+	}
+
 	/**
-	 * Initialization method common to both content() and post()
-	 *
-	 * Extend this method if you need to do any shared processing before both
-	 * content() or post()
+	 * @return array
+	 */
+	public static function getParameters(): array
+	{
+		return self::$parameters;
+	}
+
+	/**
+	 * {@inheritDoc}
 	 */
 	public static function init(array $parameters = [])
 	{
 	}
 
 	/**
-	 * Module GET method to display raw content from technical endpoints
-	 *
-	 * Extend this method if the module is supposed to return communication data,
-	 * e.g. from protocol implementations.
+	 * {@inheritDoc}
 	 */
 	public static function rawContent(array $parameters = [])
 	{
@@ -58,46 +69,29 @@ abstract class BaseModule
 	}
 
 	/**
-	 * Module GET method to display any content
-	 *
-	 * Extend this method if the module is supposed to return any display
-	 * through a GET request. It can be an HTML page through templating or a
-	 * XML feed or a JSON output.
-	 *
-	 * @return string
+	 * {@inheritDoc}
 	 */
 	public static function content(array $parameters = [])
 	{
-		$o = '';
-
-		return $o;
+		return '';
 	}
 
 	/**
-	 * Module DELETE method to process submitted data
-	 *
-	 * Extend this method if the module is supposed to process DELETE requests.
-	 * Doesn't display any content
+	 * {@inheritDoc}
 	 */
 	public static function delete(array $parameters = [])
 	{
 	}
 
 	/**
-	 * Module PATCH method to process submitted data
-	 *
-	 * Extend this method if the module is supposed to process PATCH requests.
-	 * Doesn't display any content
+	 * {@inheritDoc}
 	 */
 	public static function patch(array $parameters = [])
 	{
 	}
 
 	/**
-	 * Module POST method to process submitted data
-	 *
-	 * Extend this method if the module is supposed to process POST requests.
-	 * Doesn't display any content
+	 * {@inheritDoc}
 	 */
 	public static function post(array $parameters = [])
 	{
@@ -105,24 +99,25 @@ abstract class BaseModule
 	}
 
 	/**
-	 * Called after post()
-	 *
-	 * Unknown purpose
+	 * {@inheritDoc}
 	 */
 	public static function afterpost(array $parameters = [])
 	{
 	}
 
 	/**
-	 * Module PUT method to process submitted data
-	 *
-	 * Extend this method if the module is supposed to process PUT requests.
-	 * Doesn't display any content
+	 * {@inheritDoc}
 	 */
 	public static function put(array $parameters = [])
 	{
 	}
 
+	/** Gets the name of the current class */
+	public static function getClassName(): string
+	{
+		return static::class;
+	}
+
 	/*
 	 * Functions used to protect against Cross-Site Request Forgery
 	 * The security token has to base on at least one value that an attacker can't know - here it's the session ID and the private key.
diff --git a/src/Capabilities/ICanHandleRequests.php b/src/Capabilities/ICanHandleRequests.php
new file mode 100644
index 0000000000..0e1582bf64
--- /dev/null
+++ b/src/Capabilities/ICanHandleRequests.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace Friendica\Capabilities;
+
+/**
+ * This interface provides the capability to handle requests from clients and returns the desired outcome
+ */
+interface ICanHandleRequests
+{
+	/**
+	 * Initialization method common to both content() and post()
+	 *
+	 * Extend this method if you need to do any shared processing before both
+	 * content() or post()
+	 */
+	public static function init(array $parameters = []);
+
+	/**
+	 * Module GET method to display raw content from technical endpoints
+	 *
+	 * Extend this method if the module is supposed to return communication data,
+	 * e.g. from protocol implementations.
+	 */
+	public static function rawContent(array $parameters = []);
+
+	/**
+	 * Module GET method to display any content
+	 *
+	 * Extend this method if the module is supposed to return any display
+	 * through a GET request. It can be an HTML page through templating or a
+	 * XML feed or a JSON output.
+	 *
+	 * @return string
+	 */
+	public static function content(array $parameters = []);
+
+	/**
+	 * Module DELETE method to process submitted data
+	 *
+	 * Extend this method if the module is supposed to process DELETE requests.
+	 * Doesn't display any content
+	 */
+	public static function delete(array $parameters = []);
+
+	/**
+	 * Module PATCH method to process submitted data
+	 *
+	 * Extend this method if the module is supposed to process PATCH requests.
+	 * Doesn't display any content
+	 */
+	public static function patch(array $parameters = []);
+
+	/**
+	 * Module POST method to process submitted data
+	 *
+	 * Extend this method if the module is supposed to process POST requests.
+	 * Doesn't display any content
+	 */
+	public static function post(array $parameters = []);
+
+	/**
+	 * Called after post()
+	 *
+	 * Unknown purpose
+	 */
+	public static function afterpost(array $parameters = []);
+
+	/**
+	 * Module PUT method to process submitted data
+	 *
+	 * Extend this method if the module is supposed to process PUT requests.
+	 * Doesn't display any content
+	 */
+	public static function put(array $parameters = []);
+
+	public static function getClassName(): string;
+
+	public static function getParameters(): array;
+}
diff --git a/tests/src/App/ModeTest.php b/tests/src/App/ModeTest.php
index 9f38a25468..24371925b8 100644
--- a/tests/src/App/ModeTest.php
+++ b/tests/src/App/ModeTest.php
@@ -218,7 +218,7 @@ class ModeTest extends MockedTest
 	public function testIsBackendButIndex()
 	{
 		$server       = [];
-		$module       = new Module(Module::DEFAULT, Module::DEFAULT_CLASS, [], true);
+		$module       = new Module(Module::DEFAULT, null, true);
 		$mobileDetect = new MobileDetect();
 
 		$mode = (new Mode())->determineRunMode(false, $module, $server, $mobileDetect);
@@ -232,7 +232,7 @@ class ModeTest extends MockedTest
 	public function testIsNotBackend()
 	{
 		$server       = [];
-		$module       = new Module(Module::DEFAULT, Module::DEFAULT_CLASS, [], false);
+		$module       = new Module(Module::DEFAULT, null, false);
 		$mobileDetect = new MobileDetect();
 
 		$mode = (new Mode())->determineRunMode(false, $module, $server, $mobileDetect);
@@ -250,7 +250,7 @@ class ModeTest extends MockedTest
 			'HTTP_X_REQUESTED_WITH' => 'xmlhttprequest',
 		];
 
-		$module       = new Module(Module::DEFAULT, Module::DEFAULT_CLASS, [], false);
+		$module       = new Module(Module::DEFAULT, null, false);
 		$mobileDetect = new MobileDetect();
 
 		$mode = (new Mode())->determineRunMode(true, $module, $server, $mobileDetect);
@@ -264,7 +264,7 @@ class ModeTest extends MockedTest
 	public function testIsNotAjax()
 	{
 		$server       = [];
-		$module       = new Module(Module::DEFAULT, Module::DEFAULT_CLASS, [], false);
+		$module       = new Module(Module::DEFAULT, null, false);
 		$mobileDetect = new MobileDetect();
 
 		$mode = (new Mode())->determineRunMode(true, $module, $server, $mobileDetect);
@@ -278,7 +278,7 @@ class ModeTest extends MockedTest
 	public function testIsMobileIsTablet()
 	{
 		$server       = [];
-		$module       = new Module(Module::DEFAULT, Module::DEFAULT_CLASS, [], false);
+		$module       = new Module(Module::DEFAULT, null, false);
 		$mobileDetect = Mockery::mock(MobileDetect::class);
 		$mobileDetect->shouldReceive('isMobile')->andReturn(true);
 		$mobileDetect->shouldReceive('isTablet')->andReturn(true);
@@ -296,7 +296,7 @@ class ModeTest extends MockedTest
 	public function testIsNotMobileIsNotTablet()
 	{
 		$server       = [];
-		$module       = new Module(Module::DEFAULT, Module::DEFAULT_CLASS, [], false);
+		$module       = new Module(Module::DEFAULT, null, false);
 		$mobileDetect = Mockery::mock(MobileDetect::class);
 		$mobileDetect->shouldReceive('isMobile')->andReturn(false);
 		$mobileDetect->shouldReceive('isTablet')->andReturn(false);
diff --git a/tests/src/App/ModuleTest.php b/tests/src/App/ModuleTest.php
index c5d4e11faa..7f5d65fcf1 100644
--- a/tests/src/App/ModuleTest.php
+++ b/tests/src/App/ModuleTest.php
@@ -21,6 +21,7 @@
 
 namespace Friendica\Test\src\App;
 
+use Dice\Dice;
 use Friendica\App;
 use Friendica\Core\Cache\Capability\ICanCache;
 use Friendica\Core\Config\Capability\IManageConfigValues;
@@ -38,7 +39,7 @@ class ModuleTest extends DatabaseTest
 	{
 		self::assertEquals($assert['isBackend'], $module->isBackend());
 		self::assertEquals($assert['name'], $module->getName());
-		self::assertEquals($assert['class'], $module->getClassName());
+		self::assertEquals($assert['class'], $module->getClass());
 	}
 
 	/**
@@ -48,21 +49,25 @@ class ModuleTest extends DatabaseTest
 	{
 		$module = new App\Module();
 
+		$defaultClass = App\Module::DEFAULT_CLASS;
+
 		self::assertModule([
 			'isBackend' => false,
 			'name'      => App\Module::DEFAULT,
-			'class'     => App\Module::DEFAULT_CLASS,
+			'class'     => new $defaultClass(),
 		], $module);
 	}
 
 	public function dataModuleName()
 	{
+		$defaultClass = App\Module::DEFAULT_CLASS;
+
 		return [
 			'default'                   => [
 				'assert' => [
 					'isBackend' => false,
 					'name'      => 'network',
-					'class'     => App\Module::DEFAULT_CLASS,
+					'class'     => new $defaultClass(),
 				],
 				'args'   => new App\Arguments('network/data/in',
 					'network/data/in',
@@ -73,7 +78,7 @@ class ModuleTest extends DatabaseTest
 				'assert' => [
 					'isBackend' => false,
 					'name'      => 'with_strike_and_point',
-					'class'     => App\Module::DEFAULT_CLASS,
+					'class'     => new $defaultClass(),
 				],
 				'args'   => new App\Arguments('with-strike.and-point/data/in',
 					'with-strike.and-point/data/in',
@@ -84,7 +89,7 @@ class ModuleTest extends DatabaseTest
 				'assert' => [
 					'isBackend' => false,
 					'name'      => App\Module::DEFAULT,
-					'class'     => App\Module::DEFAULT_CLASS,
+					'class'     => new $defaultClass(),
 				],
 				'args'   => new App\Arguments(),
 			],
@@ -92,7 +97,7 @@ class ModuleTest extends DatabaseTest
 				'assert' => [
 					'isBackend' => false,
 					'name'      => App\Module::DEFAULT,
-					'class'     => App\Module::DEFAULT_CLASS,
+					'class'     => new $defaultClass(),
 				],
 				'args'   => new App\Arguments(),
 			],
@@ -100,7 +105,7 @@ class ModuleTest extends DatabaseTest
 				'assert' => [
 					'isBackend' => true,
 					'name'      => App\Module::BACKEND_MODULES[0],
-					'class'     => App\Module::DEFAULT_CLASS,
+					'class'     => new $defaultClass(),
 				],
 				'args'   => new App\Arguments(App\Module::BACKEND_MODULES[0] . '/data/in',
 					App\Module::BACKEND_MODULES[0] . '/data/in',
@@ -111,7 +116,7 @@ class ModuleTest extends DatabaseTest
 				'assert' => [
 					'isBackend' => false,
 					'name'      => 'login',
-					'class'     => App\Module::DEFAULT_CLASS,
+					'class'     => new $defaultClass(),
 				],
 				'args'   => new App\Arguments('users/sign_in',
 					'users/sign_in',
@@ -187,9 +192,12 @@ class ModuleTest extends DatabaseTest
 
 		$router = (new App\Router([], __DIR__ . '/../../../static/routes.config.php', $l10n, $cache, $lock));
 
-		$module = (new App\Module($name))->determineClass(new App\Arguments('', $command), $router, $config);
+		$dice = Mockery::mock(Dice::class);
+		$dice->shouldReceive('create')->andReturn(new $assert());
 
-		self::assertEquals($assert, $module->getClassName());
+		$module = (new App\Module($name))->determineClass(new App\Arguments('', $command), $router, $config, $dice);
+
+		self::assertEquals($assert, $module->getClass()::getClassName());
 	}
 
 	/**

From 714f0febc4918f5569eb09f8800b6739cff36347 Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Sun, 14 Nov 2021 20:46:25 +0100
Subject: [PATCH 02/17] Replace `$parameters` argument per method with
 `static::$parameters`

---
 src/App/Module.php                            | 14 ++++----
 src/App/Page.php                              |  2 +-
 src/BaseModule.php                            | 24 +++++--------
 src/Capabilities/ICanHandleRequests.php       | 18 +++++-----
 src/LegacyModule.php                          | 16 ++++-----
 .../AccountManagementControlDocument.php      |  2 +-
 src/Module/Acctlink.php                       |  2 +-
 src/Module/ActivityPub/Followers.php          |  6 ++--
 src/Module/ActivityPub/Following.php          |  6 ++--
 src/Module/ActivityPub/Inbox.php              |  8 ++---
 src/Module/ActivityPub/Objects.php            | 20 +++++------
 src/Module/ActivityPub/Outbox.php             |  6 ++--
 src/Module/Admin/Addons/Details.php           | 10 +++---
 src/Module/Admin/Addons/Index.php             |  4 +--
 src/Module/Admin/Blocklist/Contact.php        |  6 ++--
 src/Module/Admin/Blocklist/Server/Add.php     |  6 ++--
 src/Module/Admin/Blocklist/Server/Index.php   |  6 ++--
 src/Module/Admin/DBSync.php                   |  8 ++---
 src/Module/Admin/Features.php                 |  6 ++--
 src/Module/Admin/Federation.php               |  4 +--
 src/Module/Admin/Item/Delete.php              |  6 ++--
 src/Module/Admin/Item/Source.php              |  6 ++--
 src/Module/Admin/Logs/Settings.php            |  6 ++--
 src/Module/Admin/Logs/View.php                |  6 ++--
 src/Module/Admin/PhpInfo.php                  |  2 +-
 src/Module/Admin/Queue.php                    |  6 ++--
 src/Module/Admin/Site.php                     |  6 ++--
 src/Module/Admin/Storage.php                  |  8 ++---
 src/Module/Admin/Summary.php                  |  4 +--
 src/Module/Admin/Themes/Details.php           |  6 ++--
 src/Module/Admin/Themes/Embed.php             | 14 ++++----
 src/Module/Admin/Themes/Index.php             |  4 +--
 src/Module/Admin/Tos.php                      |  8 ++---
 src/Module/Admin/Users/Active.php             | 10 +++---
 src/Module/Admin/Users/Blocked.php            | 10 +++---
 src/Module/Admin/Users/Create.php             |  6 ++--
 src/Module/Admin/Users/Deleted.php            |  6 ++--
 src/Module/Admin/Users/Index.php              | 10 +++---
 src/Module/Admin/Users/Pending.php            | 10 +++---
 src/Module/Api/Friendica/Activity.php         | 10 +++---
 .../Api/Friendica/DirectMessages/Setseen.php  |  8 ++---
 src/Module/Api/Friendica/Events/Index.php     |  4 +--
 src/Module/Api/Friendica/Index.php            |  6 ++--
 src/Module/Api/Friendica/Notification.php     |  6 ++--
 src/Module/Api/Friendica/Photo/Delete.php     |  4 +--
 .../Api/Friendica/Photoalbum/Delete.php       |  4 +--
 .../Api/Friendica/Photoalbum/Update.php       |  4 +--
 src/Module/Api/Friendica/Profile/Show.php     |  6 ++--
 .../Api/GNUSocial/GNUSocial/Version.php       |  4 +--
 src/Module/Api/GNUSocial/Help/Test.php        |  6 ++--
 src/Module/Api/Mastodon/Accounts.php          | 13 ++++---
 src/Module/Api/Mastodon/Accounts/Block.php    |  8 ++---
 .../Api/Mastodon/Accounts/FeaturedTags.php    |  3 +-
 src/Module/Api/Mastodon/Accounts/Follow.php   |  6 ++--
 .../Api/Mastodon/Accounts/Followers.php       |  9 +++--
 .../Api/Mastodon/Accounts/Following.php       |  9 +++--
 .../Api/Mastodon/Accounts/IdentityProofs.php  |  3 +-
 src/Module/Api/Mastodon/Accounts/Lists.php    |  7 ++--
 src/Module/Api/Mastodon/Accounts/Mute.php     |  8 ++---
 src/Module/Api/Mastodon/Accounts/Note.php     |  8 ++---
 .../Api/Mastodon/Accounts/Relationships.php   |  3 +-
 src/Module/Api/Mastodon/Accounts/Search.php   |  3 +-
 src/Module/Api/Mastodon/Accounts/Statuses.php |  7 ++--
 src/Module/Api/Mastodon/Accounts/Unblock.php  |  8 ++---
 src/Module/Api/Mastodon/Accounts/Unfollow.php |  8 ++---
 src/Module/Api/Mastodon/Accounts/Unmute.php   |  8 ++---
 .../Mastodon/Accounts/UpdateCredentials.php   |  2 +-
 .../Mastodon/Accounts/VerifyCredentials.php   |  3 +-
 src/Module/Api/Mastodon/Announcements.php     |  3 +-
 src/Module/Api/Mastodon/Apps.php              |  3 +-
 .../Api/Mastodon/Apps/VerifyCredentials.php   |  2 +-
 src/Module/Api/Mastodon/Blocks.php            |  9 +++--
 src/Module/Api/Mastodon/Bookmarks.php         |  3 +-
 src/Module/Api/Mastodon/Conversations.php     | 11 +++---
 .../Api/Mastodon/Conversations/Read.php       |  8 ++---
 src/Module/Api/Mastodon/CustomEmojis.php      |  3 +-
 src/Module/Api/Mastodon/Directory.php         |  3 +-
 src/Module/Api/Mastodon/Endorsements.php      |  3 +-
 src/Module/Api/Mastodon/Favourited.php        |  3 +-
 src/Module/Api/Mastodon/Filters.php           |  5 ++-
 src/Module/Api/Mastodon/FollowRequests.php    | 10 +++---
 src/Module/Api/Mastodon/Instance.php          |  3 +-
 src/Module/Api/Mastodon/Instance/Peers.php    |  3 +-
 src/Module/Api/Mastodon/Instance/Rules.php    |  3 +-
 src/Module/Api/Mastodon/Lists.php             | 23 ++++++------
 src/Module/Api/Mastodon/Lists/Accounts.php    | 11 +++---
 src/Module/Api/Mastodon/Markers.php           |  5 ++-
 src/Module/Api/Mastodon/Media.php             | 17 +++++----
 src/Module/Api/Mastodon/Mutes.php             |  9 +++--
 src/Module/Api/Mastodon/Notifications.php     |  7 ++--
 .../Api/Mastodon/Notifications/Clear.php      |  2 +-
 .../Api/Mastodon/Notifications/Dismiss.php    |  6 ++--
 src/Module/Api/Mastodon/Preferences.php       |  3 +-
 src/Module/Api/Mastodon/Proofs.php            |  3 +-
 src/Module/Api/Mastodon/PushSubscription.php  |  8 ++---
 src/Module/Api/Mastodon/ScheduledStatuses.php | 17 +++++----
 src/Module/Api/Mastodon/Search.php            |  5 ++-
 src/Module/Api/Mastodon/Statuses.php          | 15 ++++----
 src/Module/Api/Mastodon/Statuses/Bookmark.php |  8 ++---
 src/Module/Api/Mastodon/Statuses/Card.php     |  7 ++--
 src/Module/Api/Mastodon/Statuses/Context.php  |  7 ++--
 .../Api/Mastodon/Statuses/Favourite.php       |  8 ++---
 .../Api/Mastodon/Statuses/FavouritedBy.php    |  7 ++--
 src/Module/Api/Mastodon/Statuses/Mute.php     | 10 +++---
 src/Module/Api/Mastodon/Statuses/Pin.php      | 10 +++---
 src/Module/Api/Mastodon/Statuses/Reblog.php   |  8 ++---
 .../Api/Mastodon/Statuses/RebloggedBy.php     |  7 ++--
 .../Api/Mastodon/Statuses/Unbookmark.php      |  8 ++---
 .../Api/Mastodon/Statuses/Unfavourite.php     |  8 ++---
 src/Module/Api/Mastodon/Statuses/Unmute.php   | 10 +++---
 src/Module/Api/Mastodon/Statuses/Unpin.php    | 10 +++---
 src/Module/Api/Mastodon/Statuses/Unreblog.php |  8 ++---
 src/Module/Api/Mastodon/Suggestions.php       |  3 +-
 src/Module/Api/Mastodon/Timelines/Direct.php  |  3 +-
 src/Module/Api/Mastodon/Timelines/Home.php    |  3 +-
 .../Api/Mastodon/Timelines/ListTimeline.php   |  7 ++--
 .../Api/Mastodon/Timelines/PublicTimeline.php |  3 +-
 src/Module/Api/Mastodon/Timelines/Tag.php     |  7 ++--
 src/Module/Api/Mastodon/Trends.php            |  3 +-
 src/Module/Api/Mastodon/Unimplemented.php     | 15 +++-----
 .../Api/Twitter/Account/RateLimitStatus.php   |  6 ++--
 src/Module/Api/Twitter/ContactEndpoint.php    |  4 +--
 src/Module/Api/Twitter/FollowersIds.php       |  2 +-
 src/Module/Api/Twitter/FollowersList.php      |  2 +-
 src/Module/Api/Twitter/FriendsIds.php         |  2 +-
 src/Module/Api/Twitter/FriendsList.php        |  2 +-
 src/Module/Api/Twitter/SavedSearches.php      |  4 +--
 src/Module/Apps.php                           |  4 +--
 src/Module/Attach.php                         |  6 ++--
 src/Module/BaseAdmin.php                      |  2 +-
 src/Module/BaseApi.php                        |  9 +++--
 src/Module/BaseNotifications.php              |  4 +--
 src/Module/BaseSettings.php                   |  2 +-
 src/Module/Bookmarklet.php                    |  2 +-
 src/Module/Contact.php                        |  4 +--
 src/Module/Contact/Advanced.php               | 10 +++---
 src/Module/Contact/Contacts.php               |  6 ++--
 src/Module/Contact/Hovercard.php              |  2 +-
 src/Module/Contact/Media.php                  |  4 +--
 src/Module/Contact/Poke.php                   | 14 ++++----
 src/Module/Contact/Revoke.php                 | 12 +++----
 src/Module/Conversation/Community.php         | 15 ++++----
 src/Module/Conversation/Network.php           | 16 ++++-----
 src/Module/Credits.php                        |  2 +-
 src/Module/DFRN/Notify.php                    |  6 ++--
 src/Module/DFRN/Poll.php                      |  4 +--
 src/Module/Debug/ActivityPubConversion.php    |  2 +-
 src/Module/Debug/Babel.php                    |  2 +-
 src/Module/Debug/Feed.php                     |  4 +--
 src/Module/Debug/ItemBody.php                 |  6 ++--
 src/Module/Debug/Localtime.php                |  4 +--
 src/Module/Debug/Probe.php                    |  2 +-
 src/Module/Debug/WebFinger.php                |  2 +-
 src/Module/Delegation.php                     |  4 +--
 src/Module/Diaspora/Fetch.php                 |  6 ++--
 src/Module/Diaspora/Receive.php               | 10 +++---
 src/Module/Directory.php                      |  2 +-
 src/Module/Events/Json.php                    |  2 +-
 src/Module/Feed.php                           |  4 +--
 src/Module/Filer/RemoveTag.php                |  4 +--
 src/Module/Filer/SaveTag.php                  |  6 ++--
 src/Module/FollowConfirm.php                  |  2 +-
 src/Module/FriendSuggest.php                  | 10 +++---
 src/Module/Friendica.php                      |  4 +--
 src/Module/Group.php                          |  4 +--
 src/Module/HCard.php                          |  8 ++---
 src/Module/HTTPException/MethodNotAllowed.php |  2 +-
 src/Module/HTTPException/PageNotFound.php     |  2 +-
 src/Module/Hashtag.php                        |  2 +-
 src/Module/Help.php                           |  2 +-
 src/Module/Home.php                           |  2 +-
 src/Module/Install.php                        |  6 ++--
 src/Module/Invite.php                         |  4 +--
 src/Module/Item/Activity.php                  |  8 ++---
 src/Module/Item/Compose.php                   |  6 ++--
 src/Module/Item/Follow.php                    |  6 ++--
 src/Module/Item/Ignore.php                    |  6 ++--
 src/Module/Item/Pin.php                       |  6 ++--
 src/Module/Item/Star.php                      |  6 ++--
 src/Module/Magic.php                          |  2 +-
 src/Module/Maintenance.php                    |  2 +-
 src/Module/Manifest.php                       |  2 +-
 src/Module/NoScrape.php                       |  8 ++---
 src/Module/NodeInfo110.php                    |  2 +-
 src/Module/NodeInfo120.php                    |  2 +-
 src/Module/NodeInfo210.php                    |  2 +-
 src/Module/Notifications/Introductions.php    |  2 +-
 src/Module/Notifications/Notification.php     | 10 +++---
 src/Module/Notifications/Notifications.php    |  2 +-
 src/Module/OAuth/Acknowledge.php              |  4 +--
 src/Module/OAuth/Authorize.php                |  5 ++-
 src/Module/OAuth/Revoke.php                   |  2 +-
 src/Module/OAuth/Token.php                    |  2 +-
 src/Module/Oembed.php                         |  2 +-
 src/Module/OpenSearch.php                     |  2 +-
 src/Module/Owa.php                            |  2 +-
 src/Module/ParseUrl.php                       |  2 +-
 src/Module/PermissionTooltip.php              |  6 ++--
 src/Module/Photo.php                          | 36 +++++++++----------
 src/Module/Profile/Common.php                 |  4 +--
 src/Module/Profile/Contacts.php               |  6 ++--
 src/Module/Profile/Index.php                  |  8 ++---
 src/Module/Profile/Media.php                  |  4 +--
 src/Module/Profile/Profile.php                | 16 ++++-----
 src/Module/Profile/Schedule.php               |  6 ++--
 src/Module/Profile/Status.php                 | 12 +++----
 src/Module/Proxy.php                          | 10 +++---
 src/Module/PublicRSAKey.php                   |  6 ++--
 src/Module/RandomProfile.php                  |  2 +-
 src/Module/ReallySimpleDiscovery.php          |  2 +-
 src/Module/Register.php                       |  6 ++--
 src/Module/RemoteFollow.php                   | 10 +++---
 src/Module/RobotsTxt.php                      |  2 +-
 src/Module/Search/Acl.php                     |  2 +-
 src/Module/Search/Directory.php               |  2 +-
 src/Module/Search/Filed.php                   |  2 +-
 src/Module/Search/Index.php                   |  2 +-
 src/Module/Search/Saved.php                   |  2 +-
 src/Module/Security/Login.php                 |  4 +--
 src/Module/Security/Logout.php                |  2 +-
 src/Module/Security/OpenID.php                |  2 +-
 src/Module/Security/TwoFactor/Recovery.php    |  6 ++--
 src/Module/Security/TwoFactor/Verify.php      |  4 +--
 src/Module/Settings/Delegation.php            |  6 ++--
 src/Module/Settings/Display.php               |  6 ++--
 src/Module/Settings/Profile/Index.php         |  4 +--
 src/Module/Settings/Profile/Photo/Crop.php    |  8 ++---
 src/Module/Settings/Profile/Photo/Index.php   |  4 +--
 src/Module/Settings/TwoFactor/AppSpecific.php |  8 ++---
 src/Module/Settings/TwoFactor/Index.php       |  6 ++--
 src/Module/Settings/TwoFactor/Recovery.php    |  8 ++---
 src/Module/Settings/TwoFactor/Trusted.php     |  8 ++---
 src/Module/Settings/TwoFactor/Verify.php      |  8 ++---
 src/Module/Settings/UserExport.php            |  8 ++---
 src/Module/Smilies.php                        |  4 +--
 src/Module/Statistics.php                     |  4 +--
 src/Module/Theme.php                          |  4 +--
 src/Module/ThemeDetails.php                   |  2 +-
 src/Module/ToggleMobile.php                   |  2 +-
 src/Module/Tos.php                            | 10 +++---
 src/Module/Update/Community.php               |  4 +--
 src/Module/Update/Network.php                 |  4 +--
 src/Module/Update/Profile.php                 |  2 +-
 src/Module/Welcome.php                        |  2 +-
 src/Module/WellKnown/HostMeta.php             |  2 +-
 src/Module/WellKnown/NodeInfo.php             |  2 +-
 src/Module/WellKnown/SecurityTxt.php          |  2 +-
 src/Module/WellKnown/XSocialRelay.php         |  2 +-
 src/Module/Xrd.php                            |  2 +-
 249 files changed, 710 insertions(+), 775 deletions(-)

diff --git a/src/App/Module.php b/src/App/Module.php
index 98d2d620d2..0f0cfa6562 100644
--- a/src/App/Module.php
+++ b/src/App/Module.php
@@ -297,32 +297,32 @@ class Module
 
 		Core\Hook::callAll($this->module . '_mod_init', $placeholder);
 
-		$this->module_class::init($this->module_class::getParameters());
+		$this->module_class::init();
 
 		$profiler->set(microtime(true) - $timestamp, 'init');
 
 		if ($server['REQUEST_METHOD'] === Router::DELETE) {
-			$this->module_class::delete($this->module_class::getParameters());
+			$this->module_class::delete();
 		}
 
 		if ($server['REQUEST_METHOD'] === Router::PATCH) {
-			$this->module_class::patch($this->module_class::getParameters());
+			$this->module_class::patch();
 		}
 
 		if ($server['REQUEST_METHOD'] === Router::POST) {
 			Core\Hook::callAll($this->module . '_mod_post', $post);
-			$this->module_class::post($this->module_class::getParameters());
+			$this->module_class::post();
 		}
 
 		if ($server['REQUEST_METHOD'] === Router::PUT) {
-			$this->module_class::put($this->module_class::getParameters());
+			$this->module_class::put();
 		}
 
 		Core\Hook::callAll($this->module . '_mod_afterpost', $placeholder);
-		$this->module_class::afterpost($this->module_class::getParameters());
+		$this->module_class::afterpost();
 
 		// "rawContent" is especially meant for technical endpoints.
 		// This endpoint doesn't need any theme initialization or other comparable stuff.
-		$this->module_class::rawContent($this->module_class::getParameters());
+		$this->module_class::rawContent();
 	}
 }
diff --git a/src/App/Page.php b/src/App/Page.php
index c20f26cefb..c29517b1c7 100644
--- a/src/App/Page.php
+++ b/src/App/Page.php
@@ -352,7 +352,7 @@ class Page implements ArrayAccess
 			$arr = ['content' => $content];
 			Hook::callAll( $moduleClass::getClassName() . '_mod_content', $arr);
 			$content = $arr['content'];
-			$arr     = ['content' => $moduleClass::content($moduleClass::getParameters())];
+			$arr     = ['content' => $moduleClass::content()];
 			Hook::callAll($moduleClass::getClassName() . '_mod_aftercontent', $arr);
 			$content .= $arr['content'];
 		} catch (HTTPException $e) {
diff --git a/src/BaseModule.php b/src/BaseModule.php
index 90ba9e1329..b9db1953e5 100644
--- a/src/BaseModule.php
+++ b/src/BaseModule.php
@@ -44,25 +44,17 @@ abstract class BaseModule implements ICanHandleRequests
 		static::$parameters = $parameters;
 	}
 
-	/**
-	 * @return array
-	 */
-	public static function getParameters(): array
-	{
-		return self::$parameters;
-	}
-
 	/**
 	 * {@inheritDoc}
 	 */
-	public static function init(array $parameters = [])
+	public static function init()
 	{
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		// echo '';
 		// exit;
@@ -71,7 +63,7 @@ abstract class BaseModule implements ICanHandleRequests
 	/**
 	 * {@inheritDoc}
 	 */
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		return '';
 	}
@@ -79,21 +71,21 @@ abstract class BaseModule implements ICanHandleRequests
 	/**
 	 * {@inheritDoc}
 	 */
-	public static function delete(array $parameters = [])
+	public static function delete()
 	{
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public static function patch(array $parameters = [])
+	public static function patch()
 	{
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		// DI::baseurl()->redirect('module');
 	}
@@ -101,14 +93,14 @@ abstract class BaseModule implements ICanHandleRequests
 	/**
 	 * {@inheritDoc}
 	 */
-	public static function afterpost(array $parameters = [])
+	public static function afterpost()
 	{
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public static function put(array $parameters = [])
+	public static function put()
 	{
 	}
 
diff --git a/src/Capabilities/ICanHandleRequests.php b/src/Capabilities/ICanHandleRequests.php
index 0e1582bf64..1d44208775 100644
--- a/src/Capabilities/ICanHandleRequests.php
+++ b/src/Capabilities/ICanHandleRequests.php
@@ -13,7 +13,7 @@ interface ICanHandleRequests
 	 * Extend this method if you need to do any shared processing before both
 	 * content() or post()
 	 */
-	public static function init(array $parameters = []);
+	public static function init();
 
 	/**
 	 * Module GET method to display raw content from technical endpoints
@@ -21,7 +21,7 @@ interface ICanHandleRequests
 	 * Extend this method if the module is supposed to return communication data,
 	 * e.g. from protocol implementations.
 	 */
-	public static function rawContent(array $parameters = []);
+	public static function rawContent();
 
 	/**
 	 * Module GET method to display any content
@@ -32,7 +32,7 @@ interface ICanHandleRequests
 	 *
 	 * @return string
 	 */
-	public static function content(array $parameters = []);
+	public static function content();
 
 	/**
 	 * Module DELETE method to process submitted data
@@ -40,7 +40,7 @@ interface ICanHandleRequests
 	 * Extend this method if the module is supposed to process DELETE requests.
 	 * Doesn't display any content
 	 */
-	public static function delete(array $parameters = []);
+	public static function delete();
 
 	/**
 	 * Module PATCH method to process submitted data
@@ -48,7 +48,7 @@ interface ICanHandleRequests
 	 * Extend this method if the module is supposed to process PATCH requests.
 	 * Doesn't display any content
 	 */
-	public static function patch(array $parameters = []);
+	public static function patch();
 
 	/**
 	 * Module POST method to process submitted data
@@ -56,14 +56,14 @@ interface ICanHandleRequests
 	 * Extend this method if the module is supposed to process POST requests.
 	 * Doesn't display any content
 	 */
-	public static function post(array $parameters = []);
+	public static function post();
 
 	/**
 	 * Called after post()
 	 *
 	 * Unknown purpose
 	 */
-	public static function afterpost(array $parameters = []);
+	public static function afterpost();
 
 	/**
 	 * Module PUT method to process submitted data
@@ -71,9 +71,7 @@ interface ICanHandleRequests
 	 * Extend this method if the module is supposed to process PUT requests.
 	 * Doesn't display any content
 	 */
-	public static function put(array $parameters = []);
+	public static function put();
 
 	public static function getClassName(): string;
-
-	public static function getParameters(): array;
 }
diff --git a/src/LegacyModule.php b/src/LegacyModule.php
index 224b94debe..ac4d5cd2c0 100644
--- a/src/LegacyModule.php
+++ b/src/LegacyModule.php
@@ -54,24 +54,24 @@ class LegacyModule extends BaseModule
 		require_once $file_path;
 	}
 
-	public static function init(array $parameters = [])
+	public static function init()
 	{
-		self::runModuleFunction('init', $parameters);
+		self::runModuleFunction('init', static::$parameters);
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		return self::runModuleFunction('content', $parameters);
+		return self::runModuleFunction('content', static::$parameters);
 	}
 
-	public static function post(array $parameters = [])
+	public static function post()
 	{
-		self::runModuleFunction('post', $parameters);
+		self::runModuleFunction('post', static::$parameters);
 	}
 
-	public static function afterpost(array $parameters = [])
+	public static function afterpost()
 	{
-		self::runModuleFunction('afterpost', $parameters);
+		self::runModuleFunction('afterpost', static::$parameters);
 	}
 
 	/**
diff --git a/src/Module/AccountManagementControlDocument.php b/src/Module/AccountManagementControlDocument.php
index ddd22dc3df..8c87343d55 100644
--- a/src/Module/AccountManagementControlDocument.php
+++ b/src/Module/AccountManagementControlDocument.php
@@ -30,7 +30,7 @@ use Friendica\BaseModule;
  */
 class AccountManagementControlDocument extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$output = [
 			'version' => 1,
diff --git a/src/Module/Acctlink.php b/src/Module/Acctlink.php
index 898386f3fd..f8184c82f1 100644
--- a/src/Module/Acctlink.php
+++ b/src/Module/Acctlink.php
@@ -30,7 +30,7 @@ use Friendica\Model\Contact;
  */
 class Acctlink extends BaseModule
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		$addr = trim($_GET['addr'] ?? '');
 
diff --git a/src/Module/ActivityPub/Followers.php b/src/Module/ActivityPub/Followers.php
index e1f1ccc4c1..8c90b2ac06 100644
--- a/src/Module/ActivityPub/Followers.php
+++ b/src/Module/ActivityPub/Followers.php
@@ -31,14 +31,14 @@ use Friendica\Protocol\ActivityPub;
  */
 class Followers extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
-		if (empty($parameters['nickname'])) {
+		if (empty(static::$parameters['nickname'])) {
 			throw new \Friendica\Network\HTTPException\NotFoundException();
 		}
 
 		// @TODO: Replace with parameter from router
-		$owner = User::getOwnerDataByNick($parameters['nickname']);
+		$owner = User::getOwnerDataByNick(static::$parameters['nickname']);
 		if (empty($owner)) {
 			throw new \Friendica\Network\HTTPException\NotFoundException();
 		}
diff --git a/src/Module/ActivityPub/Following.php b/src/Module/ActivityPub/Following.php
index e9cb10be1f..08574b546f 100644
--- a/src/Module/ActivityPub/Following.php
+++ b/src/Module/ActivityPub/Following.php
@@ -31,13 +31,13 @@ use Friendica\Protocol\ActivityPub;
  */
 class Following extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
-		if (empty($parameters['nickname'])) {
+		if (empty(static::$parameters['nickname'])) {
 			throw new \Friendica\Network\HTTPException\NotFoundException();
 		}
 
-		$owner = User::getOwnerDataByNick($parameters['nickname']);
+		$owner = User::getOwnerDataByNick(static::$parameters['nickname']);
 		if (empty($owner)) {
 			throw new \Friendica\Network\HTTPException\NotFoundException();
 		}
diff --git a/src/Module/ActivityPub/Inbox.php b/src/Module/ActivityPub/Inbox.php
index 2ef12a83d8..3e0ca18562 100644
--- a/src/Module/ActivityPub/Inbox.php
+++ b/src/Module/ActivityPub/Inbox.php
@@ -35,7 +35,7 @@ use Friendica\Util\Network;
  */
 class Inbox extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$postdata = Network::postdata();
 
@@ -50,12 +50,12 @@ class Inbox extends BaseModule
 				$filename = 'failed-activitypub';
 			}
 			$tempfile = tempnam(System::getTempPath(), $filename);
-			file_put_contents($tempfile, json_encode(['parameters' => $parameters, 'header' => $_SERVER, 'body' => $postdata], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
+			file_put_contents($tempfile, json_encode(['parameters' => static::$parameters, 'header' => $_SERVER, 'body' => $postdata], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
 			Logger::notice('Incoming message stored', ['file' => $tempfile]);
 		}
 
-		if (!empty($parameters['nickname'])) {
-			$user = DBA::selectFirst('user', ['uid'], ['nickname' => $parameters['nickname']]);
+		if (!empty(static::$parameters['nickname'])) {
+			$user = DBA::selectFirst('user', ['uid'], ['nickname' => static::$parameters['nickname']]);
 			if (!DBA::isResult($user)) {
 				throw new \Friendica\Network\HTTPException\NotFoundException();
 			}
diff --git a/src/Module/ActivityPub/Objects.php b/src/Module/ActivityPub/Objects.php
index 232c80e5bd..826bfd10cf 100644
--- a/src/Module/ActivityPub/Objects.php
+++ b/src/Module/ActivityPub/Objects.php
@@ -41,9 +41,9 @@ use Friendica\Util\Strings;
  */
 class Objects extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
-		if (empty($parameters['guid'])) {
+		if (empty(static::$parameters['guid'])) {
 			throw new HTTPException\BadRequestException();
 		}
 
@@ -51,10 +51,10 @@ class Objects extends BaseModule
 			DI::baseUrl()->redirect(str_replace('objects/', 'display/', DI::args()->getQueryString()));
 		}
 
-		$itemuri = DBA::selectFirst('item-uri', ['id'], ['guid' => $parameters['guid']]);
+		$itemuri = DBA::selectFirst('item-uri', ['id'], ['guid' => static::$parameters['guid']]);
 
 		if (DBA::isResult($itemuri)) {
-			Logger::info('Provided GUID found.', ['guid' => $parameters['guid'], 'uri-id' => $itemuri['id']]);
+			Logger::info('Provided GUID found.', ['guid' => static::$parameters['guid'], 'uri-id' => $itemuri['id']]);
 		} else {
 			// The item URI does not always contain the GUID. This means that we have to search the URL instead
 			$url = DI::baseUrl()->get() . '/' . DI::args()->getQueryString();
@@ -104,11 +104,11 @@ class Objects extends BaseModule
 			throw new HTTPException\NotFoundException();
 		}
 
-		$etag          = md5($parameters['guid'] . '-' . $item['changed']);
+		$etag          = md5(static::$parameters['guid'] . '-' . $item['changed']);
 		$last_modified = $item['changed'];
 		Network::checkEtagModified($etag, $last_modified);
 
-		if (empty($parameters['activity']) && ($item['gravity'] != GRAVITY_ACTIVITY)) {
+		if (empty(static::$parameters['activity']) && ($item['gravity'] != GRAVITY_ACTIVITY)) {
 			$activity = ActivityPub\Transmitter::createActivityFromItem($item['id'], true);
 			if (empty($activity['type'])) {
 				throw new HTTPException\NotFoundException();
@@ -123,16 +123,16 @@ class Objects extends BaseModule
 
 			$data = ['@context' => ActivityPub::CONTEXT];
 			$data = array_merge($data, $activity['object']);
-		} elseif (empty($parameters['activity']) || in_array($parameters['activity'],
+		} elseif (empty(static::$parameters['activity']) || in_array(static::$parameters['activity'],
 			['Create', 'Announce', 'Update', 'Like', 'Dislike', 'Accept', 'Reject',
 			'TentativeAccept', 'Follow', 'Add'])) {
 			$data = ActivityPub\Transmitter::createActivityFromItem($item['id']);
 			if (empty($data)) {
 				throw new HTTPException\NotFoundException();
 			}
-			if (!empty($parameters['activity']) && ($parameters['activity'] != 'Create')) {
-				$data['type'] = $parameters['activity'];
-				$data['id'] = str_replace('/Create', '/' . $parameters['activity'], $data['id']);
+			if (!empty(static::$parameters['activity']) && (static::$parameters['activity'] != 'Create')) {
+				$data['type'] = static::$parameters['activity'];
+				$data['id'] = str_replace('/Create', '/' . static::$parameters['activity'], $data['id']);
 			}
 		} else {
 			throw new HTTPException\NotFoundException();
diff --git a/src/Module/ActivityPub/Outbox.php b/src/Module/ActivityPub/Outbox.php
index fe838960d5..a2ae10839d 100644
--- a/src/Module/ActivityPub/Outbox.php
+++ b/src/Module/ActivityPub/Outbox.php
@@ -31,13 +31,13 @@ use Friendica\Util\HTTPSignature;
  */
 class Outbox extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
-		if (empty($parameters['nickname'])) {
+		if (empty(static::$parameters['nickname'])) {
 			throw new \Friendica\Network\HTTPException\NotFoundException();
 		}
 
-		$owner = User::getOwnerDataByNick($parameters['nickname']);
+		$owner = User::getOwnerDataByNick(static::$parameters['nickname']);
 		if (empty($owner)) {
 			throw new \Friendica\Network\HTTPException\NotFoundException();
 		}
diff --git a/src/Module/Admin/Addons/Details.php b/src/Module/Admin/Addons/Details.php
index 79660dee38..dbb2a67a07 100644
--- a/src/Module/Admin/Addons/Details.php
+++ b/src/Module/Admin/Addons/Details.php
@@ -30,11 +30,11 @@ use Friendica\Util\Strings;
 
 class Details extends BaseAdmin
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAdminAccess();
 
-		$addon = Strings::sanitizeFilePathItem($parameters['addon']);
+		$addon = Strings::sanitizeFilePathItem(static::$parameters['addon']);
 
 		$redirect = 'admin/addons/' . $addon;
 
@@ -52,15 +52,15 @@ class Details extends BaseAdmin
 		DI::baseUrl()->redirect($redirect);
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		parent::content($parameters);
+		parent::content();
 
 		$a = DI::app();
 
 		$addons_admin = Addon::getAdminList();
 
-		$addon = Strings::sanitizeFilePathItem($parameters['addon']);
+		$addon = Strings::sanitizeFilePathItem(static::$parameters['addon']);
 		if (!is_file("addon/$addon/$addon.php")) {
 			notice(DI::l10n()->t('Addon not found.'));
 			Addon::uninstall($addon);
diff --git a/src/Module/Admin/Addons/Index.php b/src/Module/Admin/Addons/Index.php
index 56d570b28e..e018b7c70f 100644
--- a/src/Module/Admin/Addons/Index.php
+++ b/src/Module/Admin/Addons/Index.php
@@ -28,9 +28,9 @@ use Friendica\Module\BaseAdmin;
 
 class Index extends BaseAdmin
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		parent::content($parameters);
+		parent::content();
 
 		// reload active themes
 		if (!empty($_GET['action'])) {
diff --git a/src/Module/Admin/Blocklist/Contact.php b/src/Module/Admin/Blocklist/Contact.php
index bd30e2f8dd..33041ee9bb 100644
--- a/src/Module/Admin/Blocklist/Contact.php
+++ b/src/Module/Admin/Blocklist/Contact.php
@@ -32,7 +32,7 @@ use Friendica\Util\Network;
 
 class Contact extends BaseAdmin
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAdminAccess();
 
@@ -76,9 +76,9 @@ class Contact extends BaseAdmin
 		DI::baseUrl()->redirect('admin/blocklist/contact');
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		parent::content($parameters);
+		parent::content();
 
 		$condition = ['uid' => 0, 'blocked' => true];
 
diff --git a/src/Module/Admin/Blocklist/Server/Add.php b/src/Module/Admin/Blocklist/Server/Add.php
index 03f1026401..56b7400f15 100644
--- a/src/Module/Admin/Blocklist/Server/Add.php
+++ b/src/Module/Admin/Blocklist/Server/Add.php
@@ -32,7 +32,7 @@ use GuzzleHttp\Psr7\Uri;
 
 class Add extends BaseAdmin
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAdminAccess();
 
@@ -66,9 +66,9 @@ class Add extends BaseAdmin
 		DI::baseUrl()->redirect('admin/blocklist/server');
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		parent::content($parameters);
+		parent::content();
 
 		$gservers = [];
 
diff --git a/src/Module/Admin/Blocklist/Server/Index.php b/src/Module/Admin/Blocklist/Server/Index.php
index 7dd59678a4..e819c9366f 100644
--- a/src/Module/Admin/Blocklist/Server/Index.php
+++ b/src/Module/Admin/Blocklist/Server/Index.php
@@ -27,7 +27,7 @@ use Friendica\Module\BaseAdmin;
 
 class Index extends BaseAdmin
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAdminAccess();
 
@@ -56,9 +56,9 @@ class Index extends BaseAdmin
 		DI::baseUrl()->redirect('admin/blocklist/server');
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		parent::content($parameters);
+		parent::content();
 
 		$blocklist     = DI::config()->get('system', 'blocklist');
 		$blocklistform = [];
diff --git a/src/Module/Admin/DBSync.php b/src/Module/Admin/DBSync.php
index 9449e3be70..ef9df44911 100644
--- a/src/Module/Admin/DBSync.php
+++ b/src/Module/Admin/DBSync.php
@@ -30,14 +30,14 @@ use Friendica\Module\BaseAdmin;
 
 class DBSync extends BaseAdmin
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		parent::content($parameters);
+		parent::content();
 
 		$a = DI::app();
 
-		$action = $parameters['action'] ?? '';
-		$update = $parameters['update'] ?? 0;
+		$action = static::$parameters['action'] ?? '';
+		$update = static::$parameters['update'] ?? 0;
 
 		switch ($action) {
 			case 'mark':
diff --git a/src/Module/Admin/Features.php b/src/Module/Admin/Features.php
index d3af3ebc02..76bb35f53a 100644
--- a/src/Module/Admin/Features.php
+++ b/src/Module/Admin/Features.php
@@ -28,7 +28,7 @@ use Friendica\Module\BaseAdmin;
 
 class Features extends BaseAdmin
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAdminAccess();
 
@@ -60,9 +60,9 @@ class Features extends BaseAdmin
 		DI::baseUrl()->redirect('admin/features');
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		parent::content($parameters);
+		parent::content();
 
 		$features = [];
 
diff --git a/src/Module/Admin/Federation.php b/src/Module/Admin/Federation.php
index 4be2319759..9d0070e2d7 100644
--- a/src/Module/Admin/Federation.php
+++ b/src/Module/Admin/Federation.php
@@ -28,9 +28,9 @@ use Friendica\Module\BaseAdmin;
 
 class Federation extends BaseAdmin
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		parent::content($parameters);
+		parent::content();
 
 		// get counts on active federation systems this node is knowing
 		// We list the more common systems by name. The rest is counted as "other"
diff --git a/src/Module/Admin/Item/Delete.php b/src/Module/Admin/Item/Delete.php
index 7afc3b0903..9380b02e0b 100644
--- a/src/Module/Admin/Item/Delete.php
+++ b/src/Module/Admin/Item/Delete.php
@@ -29,7 +29,7 @@ use Friendica\Util\Strings;
 
 class Delete extends BaseAdmin
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAdminAccess();
 
@@ -55,9 +55,9 @@ class Delete extends BaseAdmin
 		DI::baseUrl()->redirect('admin/item/delete');
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		parent::content($parameters);
+		parent::content();
 
 		$t = Renderer::getMarkupTemplate('admin/item/delete.tpl');
 
diff --git a/src/Module/Admin/Item/Source.php b/src/Module/Admin/Item/Source.php
index 61e598a68f..a6dac1a1a1 100644
--- a/src/Module/Admin/Item/Source.php
+++ b/src/Module/Admin/Item/Source.php
@@ -29,11 +29,11 @@ use Friendica\Module\BaseAdmin;
 class Source extends BaseAdmin
 
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		parent::content($parameters);
+		parent::content();
 
-		$guid = basename($_REQUEST['guid'] ?? $parameters['guid'] ?? '');
+		$guid = basename($_REQUEST['guid'] ?? static::$parameters['guid'] ?? '');
 
 		$source = '';
 		$item_uri = '';
diff --git a/src/Module/Admin/Logs/Settings.php b/src/Module/Admin/Logs/Settings.php
index b0fcaebc33..faf7426638 100644
--- a/src/Module/Admin/Logs/Settings.php
+++ b/src/Module/Admin/Logs/Settings.php
@@ -29,7 +29,7 @@ use Psr\Log\LogLevel;
 
 class Settings extends BaseAdmin
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAdminAccess();
 
@@ -56,9 +56,9 @@ class Settings extends BaseAdmin
 		DI::baseUrl()->redirect('admin/logs');
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		parent::content($parameters);
+		parent::content();
 
 		$log_choices = [
 			LogLevel::ERROR   => 'Error',
diff --git a/src/Module/Admin/Logs/View.php b/src/Module/Admin/Logs/View.php
index e0e12760bc..d1d44c00f5 100644
--- a/src/Module/Admin/Logs/View.php
+++ b/src/Module/Admin/Logs/View.php
@@ -31,9 +31,9 @@ class View extends BaseAdmin
 {
 	const LIMIT = 500;
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		parent::content($parameters);
+		parent::content();
 
 		$t = Renderer::getMarkupTemplate('admin/logs/view.tpl');
 		DI::page()->registerFooterScript(Theme::getPathForFile('js/module/admin/logs/view.js'));
@@ -75,7 +75,7 @@ class View extends BaseAdmin
 						->withLimit(self::LIMIT)
 						->withFilters($filters)
 						->withSearch($search);
-			} catch (Exception $e) {
+			} catch (\Exception $e) {
 				$error = DI::l10n()->t('Couldn\'t open <strong>%1$s</strong> log file.<br/>Check to see if file %1$s is readable.', $f);
 			}
 		}
diff --git a/src/Module/Admin/PhpInfo.php b/src/Module/Admin/PhpInfo.php
index 74cbc3d901..8bf15cb0e4 100644
--- a/src/Module/Admin/PhpInfo.php
+++ b/src/Module/Admin/PhpInfo.php
@@ -25,7 +25,7 @@ use Friendica\Module\BaseAdmin;
 
 class PhpInfo extends BaseAdmin
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAdminAccess();
 
diff --git a/src/Module/Admin/Queue.php b/src/Module/Admin/Queue.php
index f0883b361f..69c16c39d2 100644
--- a/src/Module/Admin/Queue.php
+++ b/src/Module/Admin/Queue.php
@@ -38,11 +38,11 @@ use Friendica\Util\DateTimeFormat;
  */
 class Queue extends BaseAdmin
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		parent::content($parameters);
+		parent::content();
 
-		$status = $parameters['status'] ?? '';
+		$status = static::$parameters['status'] ?? '';
 
 		// get jobs from the workerqueue table
 		if ($status == 'deferred') {
diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php
index 0edc713ae6..e8d463f809 100644
--- a/src/Module/Admin/Site.php
+++ b/src/Module/Admin/Site.php
@@ -43,7 +43,7 @@ require_once __DIR__ . '/../../../boot.php';
 
 class Site extends BaseAdmin
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAdminAccess();
 
@@ -384,9 +384,9 @@ class Site extends BaseAdmin
 		DI::baseUrl()->redirect('admin/site' . $active_panel);
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		parent::content($parameters);
+		parent::content();
 
 		/* Installed langs */
 		$lang_choices = DI::l10n()->getAvailableLanguages();
diff --git a/src/Module/Admin/Storage.php b/src/Module/Admin/Storage.php
index 51e70d841e..1f598c1a23 100644
--- a/src/Module/Admin/Storage.php
+++ b/src/Module/Admin/Storage.php
@@ -31,13 +31,13 @@ use Friendica\Util\Strings;
 
 class Storage extends BaseAdmin
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAdminAccess();
 
 		self::checkFormSecurityTokenRedirectOnError('/admin/storage', 'admin_storage');
 
-		$storagebackend = trim($parameters['name'] ?? '');
+		$storagebackend = trim(static::$parameters['name'] ?? '');
 
 		try {
 			/** @var ICanConfigureStorage|false $newStorageConfig */
@@ -91,9 +91,9 @@ class Storage extends BaseAdmin
 		DI::baseUrl()->redirect('admin/storage');
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		parent::content($parameters);
+		parent::content();
 
 		$current_storage_backend = DI::storage();
 		$available_storage_forms = [];
diff --git a/src/Module/Admin/Summary.php b/src/Module/Admin/Summary.php
index ca244260f6..1eeba4883d 100644
--- a/src/Module/Admin/Summary.php
+++ b/src/Module/Admin/Summary.php
@@ -37,9 +37,9 @@ use Friendica\Util\DateTimeFormat;
 
 class Summary extends BaseAdmin
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		parent::content($parameters);
+		parent::content();
 
 		$a = DI::app();
 
diff --git a/src/Module/Admin/Themes/Details.php b/src/Module/Admin/Themes/Details.php
index b8ecfe1ce6..bd02572684 100644
--- a/src/Module/Admin/Themes/Details.php
+++ b/src/Module/Admin/Themes/Details.php
@@ -30,11 +30,11 @@ use Friendica\Util\Strings;
 
 class Details extends BaseAdmin
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		parent::content($parameters);
+		parent::content();
 
-		$theme = Strings::sanitizeFilePathItem($parameters['theme']);
+		$theme = Strings::sanitizeFilePathItem(static::$parameters['theme']);
 		if (!is_dir("view/theme/$theme")) {
 			notice(DI::l10n()->t("Item not found."));
 			return '';
diff --git a/src/Module/Admin/Themes/Embed.php b/src/Module/Admin/Themes/Embed.php
index dabc9209e6..59855b13b2 100644
--- a/src/Module/Admin/Themes/Embed.php
+++ b/src/Module/Admin/Themes/Embed.php
@@ -28,19 +28,19 @@ use Friendica\Util\Strings;
 
 class Embed extends BaseAdmin
 {
-	public static function init(array $parameters = [])
+	public static function init()
 	{
-		$theme = Strings::sanitizeFilePathItem($parameters['theme']);
+		$theme = Strings::sanitizeFilePathItem(static::$parameters['theme']);
 		if (is_file("view/theme/$theme/config.php")) {
 			DI::app()->setCurrentTheme($theme);
 		}
 	}
 
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAdminAccess();
 
-		$theme = Strings::sanitizeFilePathItem($parameters['theme']);
+		$theme = Strings::sanitizeFilePathItem(static::$parameters['theme']);
 		if (is_file("view/theme/$theme/config.php")) {
 			require_once "view/theme/$theme/config.php";
 			if (function_exists('theme_admin_post')) {
@@ -56,11 +56,11 @@ class Embed extends BaseAdmin
 		DI::baseUrl()->redirect('admin/themes/' . $theme . '/embed?mode=minimal');
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		parent::content($parameters);
+		parent::content();
 
-		$theme = Strings::sanitizeFilePathItem($parameters['theme']);
+		$theme = Strings::sanitizeFilePathItem(static::$parameters['theme']);
 		if (!is_dir("view/theme/$theme")) {
 			notice(DI::l10n()->t('Unknown theme.'));
 			return '';
diff --git a/src/Module/Admin/Themes/Index.php b/src/Module/Admin/Themes/Index.php
index d9cb326b44..7bd09695ec 100644
--- a/src/Module/Admin/Themes/Index.php
+++ b/src/Module/Admin/Themes/Index.php
@@ -29,9 +29,9 @@ use Friendica\Util\Strings;
 
 class Index extends BaseAdmin
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		parent::content($parameters);
+		parent::content();
 
 		$allowed_themes = Theme::getAllowedList();
 
diff --git a/src/Module/Admin/Tos.php b/src/Module/Admin/Tos.php
index 282e5daf1d..a31b403f97 100644
--- a/src/Module/Admin/Tos.php
+++ b/src/Module/Admin/Tos.php
@@ -27,7 +27,7 @@ use Friendica\Module\BaseAdmin;
 
 class Tos extends BaseAdmin
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAdminAccess();
 
@@ -48,11 +48,11 @@ class Tos extends BaseAdmin
 		DI::baseUrl()->redirect('admin/tos');
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		parent::content($parameters);
+		parent::content();
 
-		$tos = new \Friendica\Module\Tos();
+		$tos = new \Friendica\Module\Tos(static::$parameters);
 		$t = Renderer::getMarkupTemplate('admin/tos.tpl');
 		return Renderer::replaceMacros($t, [
 			'$title' => DI::l10n()->t('Administration'),
diff --git a/src/Module/Admin/Users/Active.php b/src/Module/Admin/Users/Active.php
index 7eac47d116..4882ac4eb5 100644
--- a/src/Module/Admin/Users/Active.php
+++ b/src/Module/Admin/Users/Active.php
@@ -30,7 +30,7 @@ use Friendica\Module\Admin\BaseUsers;
 
 class Active extends BaseUsers
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAdminAccess();
 
@@ -60,12 +60,12 @@ class Active extends BaseUsers
 		DI::baseUrl()->redirect(DI::args()->getQueryString());
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		parent::content($parameters);
+		parent::content();
 
-		$action = $parameters['action'] ?? '';
-		$uid = $parameters['uid'] ?? 0;
+		$action = static::$parameters['action'] ?? '';
+		$uid = static::$parameters['uid'] ?? 0;
 
 		if ($uid) {
 			$user = User::getById($uid, ['username', 'blocked']);
diff --git a/src/Module/Admin/Users/Blocked.php b/src/Module/Admin/Users/Blocked.php
index 35e7c25bfa..6b80081655 100644
--- a/src/Module/Admin/Users/Blocked.php
+++ b/src/Module/Admin/Users/Blocked.php
@@ -31,7 +31,7 @@ use Friendica\Util\Temporal;
 
 class Blocked extends BaseUsers
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAdminAccess();
 
@@ -61,12 +61,12 @@ class Blocked extends BaseUsers
 		DI::baseUrl()->redirect('admin/users/blocked');
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		parent::content($parameters);
+		parent::content();
 
-		$action = $parameters['action'] ?? '';
-		$uid = $parameters['uid'] ?? 0;
+		$action = static::$parameters['action'] ?? '';
+		$uid = static::$parameters['uid'] ?? 0;
 
 		if ($uid) {
 			$user = User::getById($uid, ['username', 'blocked']);
diff --git a/src/Module/Admin/Users/Create.php b/src/Module/Admin/Users/Create.php
index 078547f469..b808666030 100644
--- a/src/Module/Admin/Users/Create.php
+++ b/src/Module/Admin/Users/Create.php
@@ -28,7 +28,7 @@ use Friendica\Module\Admin\BaseUsers;
 
 class Create extends BaseUsers
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAdminAccess();
 
@@ -51,9 +51,9 @@ class Create extends BaseUsers
 		DI::baseUrl()->redirect('admin/users/create');
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		parent::content($parameters);
+		parent::content();
 
 		$t = Renderer::getMarkupTemplate('admin/users/create.tpl');
 		return self::getTabsHTML('all') . Renderer::replaceMacros($t, [
diff --git a/src/Module/Admin/Users/Deleted.php b/src/Module/Admin/Users/Deleted.php
index 2ebaec8b7f..8d71b4792a 100644
--- a/src/Module/Admin/Users/Deleted.php
+++ b/src/Module/Admin/Users/Deleted.php
@@ -33,7 +33,7 @@ use Friendica\Util\Temporal;
 
 class Deleted extends BaseUsers
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAdminAccess();
 
@@ -44,9 +44,9 @@ class Deleted extends BaseUsers
 		DI::baseUrl()->redirect('admin/users/deleted');
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		parent::content($parameters);
+		parent::content();
 
 		$pager = new Pager(DI::l10n(), DI::args()->getQueryString(), 100);
 
diff --git a/src/Module/Admin/Users/Index.php b/src/Module/Admin/Users/Index.php
index d391feb447..1137b2cf96 100644
--- a/src/Module/Admin/Users/Index.php
+++ b/src/Module/Admin/Users/Index.php
@@ -30,7 +30,7 @@ use Friendica\Module\Admin\BaseUsers;
 
 class Index extends BaseUsers
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAdminAccess();
 
@@ -67,12 +67,12 @@ class Index extends BaseUsers
 		DI::baseUrl()->redirect(DI::args()->getQueryString());
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		parent::content($parameters);
+		parent::content();
 
-		$action = $parameters['action'] ?? '';
-		$uid = $parameters['uid'] ?? 0;
+		$action = static::$parameters['action'] ?? '';
+		$uid = static::$parameters['uid'] ?? 0;
 
 		if ($uid) {
 			$user = User::getById($uid, ['username', 'blocked']);
diff --git a/src/Module/Admin/Users/Pending.php b/src/Module/Admin/Users/Pending.php
index 14381682fd..ef7d7b12ef 100644
--- a/src/Module/Admin/Users/Pending.php
+++ b/src/Module/Admin/Users/Pending.php
@@ -33,7 +33,7 @@ use Friendica\Util\Temporal;
 
 class Pending extends BaseUsers
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAdminAccess();
 
@@ -58,12 +58,12 @@ class Pending extends BaseUsers
 		DI::baseUrl()->redirect('admin/users/pending');
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		parent::content($parameters);
+		parent::content();
 
-		$action = $parameters['action'] ?? '';
-		$uid = $parameters['uid'] ?? 0;
+		$action = static::$parameters['action'] ?? '';
+		$uid = static::$parameters['uid'] ?? 0;
 
 		if ($uid) {
 			$user = User::getById($uid, ['username', 'blocked']);
diff --git a/src/Module/Api/Friendica/Activity.php b/src/Module/Api/Friendica/Activity.php
index 00228c0ccc..b80d0585bc 100644
--- a/src/Module/Api/Friendica/Activity.php
+++ b/src/Module/Api/Friendica/Activity.php
@@ -40,7 +40,7 @@ use Friendica\Module\BaseApi;
  */
 class Activity extends BaseApi
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
@@ -49,17 +49,17 @@ class Activity extends BaseApi
 			'id' => 0, // Id of the post
 		]);
 
-		$res = Item::performActivity($request['id'], $parameters['verb'], $uid);
+		$res = Item::performActivity($request['id'], static::$parameters['verb'], $uid);
 
 		if ($res) {
-			if (!empty($parameters['extension']) && ($parameters['extension'] == 'xml')) {
+			if (!empty(static::$parameters['extension']) && (static::$parameters['extension'] == 'xml')) {
 				$ok = 'true';
 			} else {
 				$ok = 'ok';
 			}
-			DI::apiResponse()->exit('ok', ['ok' => $ok], $parameters['extension'] ?? null);
+			DI::apiResponse()->exit('ok', ['ok' => $ok], static::$parameters['extension'] ?? null);
 		} else {
-			DI::apiResponse()->error(500, 'Error adding activity', '', $parameters['extension'] ?? null);
+			DI::apiResponse()->error(500, 'Error adding activity', '', static::$parameters['extension'] ?? null);
 		}
 	}
 }
diff --git a/src/Module/Api/Friendica/DirectMessages/Setseen.php b/src/Module/Api/Friendica/DirectMessages/Setseen.php
index e55ad74b96..dfffe3bbf0 100644
--- a/src/Module/Api/Friendica/DirectMessages/Setseen.php
+++ b/src/Module/Api/Friendica/DirectMessages/Setseen.php
@@ -30,7 +30,7 @@ use Friendica\Module\BaseApi;
  */
 class Setseen extends BaseApi
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
@@ -42,13 +42,13 @@ class Setseen extends BaseApi
 		// return error if id is zero
 		if (empty($request['id'])) {
 			$answer = ['result' => 'error', 'message' => 'message id not specified'];
-			DI::apiResponse()->exit('direct_messages_setseen', ['$result' => $answer], $parameters['extension'] ?? null);
+			DI::apiResponse()->exit('direct_messages_setseen', ['$result' => $answer], static::$parameters['extension'] ?? null);
 		}
 
 		// error message if specified id is not in database
 		if (!DBA::exists('mail', ['id' => $request['id'], 'uid' => $uid])) {
 			$answer = ['result' => 'error', 'message' => 'message id not in database'];
-			DI::apiResponse()->exit('direct_messages_setseen', ['$result' => $answer], $parameters['extension'] ?? null);
+			DI::apiResponse()->exit('direct_messages_setseen', ['$result' => $answer], static::$parameters['extension'] ?? null);
 		}
 
 		// update seen indicator
@@ -58,6 +58,6 @@ class Setseen extends BaseApi
 			$answer = ['result' => 'error', 'message' => 'unknown error'];
 		}
 
-		DI::apiResponse()->exit('direct_messages_setseen', ['$result' => $answer], $parameters['extension'] ?? null);
+		DI::apiResponse()->exit('direct_messages_setseen', ['$result' => $answer], static::$parameters['extension'] ?? null);
 	}
 }
diff --git a/src/Module/Api/Friendica/Events/Index.php b/src/Module/Api/Friendica/Events/Index.php
index 31c55069da..8a610c9d18 100644
--- a/src/Module/Api/Friendica/Events/Index.php
+++ b/src/Module/Api/Friendica/Events/Index.php
@@ -33,7 +33,7 @@ use Friendica\Module\BaseApi;
  */
 class Index extends BaseApi
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
@@ -70,6 +70,6 @@ class Index extends BaseApi
 			];
 		}
 
-		DI::apiResponse()->exit('events', ['events' => $items], $parameters['extension'] ?? null);
+		DI::apiResponse()->exit('events', ['events' => $items], static::$parameters['extension'] ?? null);
 	}
 }
diff --git a/src/Module/Api/Friendica/Index.php b/src/Module/Api/Friendica/Index.php
index 8891d218a9..b028d8bb6f 100644
--- a/src/Module/Api/Friendica/Index.php
+++ b/src/Module/Api/Friendica/Index.php
@@ -31,17 +31,17 @@ use Friendica\Module\BaseApi;
  */
 class Index extends BaseApi
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);		
 	}
 
-	public static function delete(array $parameters = [])
+	public static function delete()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 	}
 
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		echo api_call(DI::app());
 		exit();
diff --git a/src/Module/Api/Friendica/Notification.php b/src/Module/Api/Friendica/Notification.php
index 2a50bde7b5..6dc4f78319 100644
--- a/src/Module/Api/Friendica/Notification.php
+++ b/src/Module/Api/Friendica/Notification.php
@@ -31,7 +31,7 @@ use Friendica\Object\Api\Friendica\Notification as ApiNotification;
  */
 class Notification extends BaseApi
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
@@ -43,7 +43,7 @@ class Notification extends BaseApi
 			$notifications[] = new ApiNotification($Notify);
 		}
 
-		if (!empty($parameters['extension']) && ($parameters['extension'] == 'xml')) {
+		if (!empty(static::$parameters['extension']) && (static::$parameters['extension'] == 'xml')) {
 			$xmlnotes = [];
 			foreach ($notifications as $notification) {
 				$xmlnotes[] = ['@attributes' => $notification->toArray()];
@@ -56,6 +56,6 @@ class Notification extends BaseApi
 			$result = false;
 		}
 
-		DI::apiResponse()->exit('notes', ['note' => $result], $parameters['extension'] ?? null);
+		DI::apiResponse()->exit('notes', ['note' => $result], static::$parameters['extension'] ?? null);
 	}
 }
diff --git a/src/Module/Api/Friendica/Photo/Delete.php b/src/Module/Api/Friendica/Photo/Delete.php
index cf287d3d33..4eb8e0dcc5 100644
--- a/src/Module/Api/Friendica/Photo/Delete.php
+++ b/src/Module/Api/Friendica/Photo/Delete.php
@@ -33,7 +33,7 @@ use Friendica\Network\HTTPException\InternalServerErrorException;
  */
 class Delete extends BaseApi
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
@@ -64,7 +64,7 @@ class Delete extends BaseApi
 			Item::deleteForUser($condition, $uid);
 
 			$result = ['result' => 'deleted', 'message' => 'photo with id `' . $request['photo_id'] . '` has been deleted from server.'];
-			DI::apiResponse()->exit('photo_delete', ['$result' => $result], $parameters['extension'] ?? null);
+			DI::apiResponse()->exit('photo_delete', ['$result' => $result], static::$parameters['extension'] ?? null);
 		} else {
 			throw new InternalServerErrorException("unknown error on deleting photo from database table");
 		}
diff --git a/src/Module/Api/Friendica/Photoalbum/Delete.php b/src/Module/Api/Friendica/Photoalbum/Delete.php
index dd18365b46..f6dc85fcea 100644
--- a/src/Module/Api/Friendica/Photoalbum/Delete.php
+++ b/src/Module/Api/Friendica/Photoalbum/Delete.php
@@ -34,7 +34,7 @@ use Friendica\Network\HTTPException\InternalServerErrorException;
  */
 class Delete extends BaseApi
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
@@ -67,7 +67,7 @@ class Delete extends BaseApi
 		// return success of deletion or error message
 		if ($result) {
 			$answer = ['result' => 'deleted', 'message' => 'album `' . $request['album'] . '` with all containing photos has been deleted.'];
-			DI::apiResponse()->exit('photoalbum_delete', ['$result' => $answer], $parameters['extension'] ?? null);
+			DI::apiResponse()->exit('photoalbum_delete', ['$result' => $answer], static::$parameters['extension'] ?? null);
 		} else {
 			throw new InternalServerErrorException("unknown error - deleting from database failed");
 		}
diff --git a/src/Module/Api/Friendica/Photoalbum/Update.php b/src/Module/Api/Friendica/Photoalbum/Update.php
index 369d33e825..311396db37 100644
--- a/src/Module/Api/Friendica/Photoalbum/Update.php
+++ b/src/Module/Api/Friendica/Photoalbum/Update.php
@@ -32,7 +32,7 @@ use Friendica\Network\HTTPException\InternalServerErrorException;
  */
 class Update extends BaseApi
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
@@ -59,7 +59,7 @@ class Update extends BaseApi
 		// return success of updating or error message
 		if ($result) {
 			$answer = ['result' => 'updated', 'message' => 'album `' . $request['album'] . '` with all containing photos has been renamed to `' . $request['album_new'] . '`.'];
-			DI::apiResponse()->exit('photoalbum_update', ['$result' => $answer], $parameters['extension'] ?? null);
+			DI::apiResponse()->exit('photoalbum_update', ['$result' => $answer], static::$parameters['extension'] ?? null);
 		} else {
 			throw new InternalServerErrorException("unknown error - updating in database failed");
 		}
diff --git a/src/Module/Api/Friendica/Profile/Show.php b/src/Module/Api/Friendica/Profile/Show.php
index e388405eff..ae14c8d41a 100644
--- a/src/Module/Api/Friendica/Profile/Show.php
+++ b/src/Module/Api/Friendica/Profile/Show.php
@@ -34,7 +34,7 @@ use Friendica\Network\HTTPException;
  */
 class Show extends BaseApi
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
@@ -49,7 +49,7 @@ class Show extends BaseApi
 		$profile = self::formatProfile($profile, $profileFields);
 
 		$profiles = [];
-		if (!empty($parameters['extension']) && ($parameters['extension'] == 'xml')) {
+		if (!empty(static::$parameters['extension']) && (static::$parameters['extension'] == 'xml')) {
 			$profiles['0:profile'] = $profile;
 		} else {
 			$profiles[] = $profile;
@@ -65,7 +65,7 @@ class Show extends BaseApi
 			'profiles' => $profiles
 		];
 
-		DI::apiResponse()->exit('friendica_profiles', ['$result' => $result], $parameters['extension'] ?? null);
+		DI::apiResponse()->exit('friendica_profiles', ['$result' => $result], static::$parameters['extension'] ?? null);
 	}
 
 	/**
diff --git a/src/Module/Api/GNUSocial/GNUSocial/Version.php b/src/Module/Api/GNUSocial/GNUSocial/Version.php
index 52393702f9..34fc3c6927 100644
--- a/src/Module/Api/GNUSocial/GNUSocial/Version.php
+++ b/src/Module/Api/GNUSocial/GNUSocial/Version.php
@@ -29,8 +29,8 @@ use Friendica\DI;
  */
 class Version extends BaseApi
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
-		DI::apiResponse()->exit('version', ['version' => '0.9.7'], $parameters['extension'] ?? null);
+		DI::apiResponse()->exit('version', ['version' => '0.9.7'], static::$parameters['extension'] ?? null);
 	}
 }
diff --git a/src/Module/Api/GNUSocial/Help/Test.php b/src/Module/Api/GNUSocial/Help/Test.php
index 3df694c859..6eedfc1ca9 100644
--- a/src/Module/Api/GNUSocial/Help/Test.php
+++ b/src/Module/Api/GNUSocial/Help/Test.php
@@ -29,14 +29,14 @@ use Friendica\DI;
  */
 class Test extends BaseApi
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
-		if (!empty($parameters['extension']) && ($parameters['extension'] == 'xml')) {
+		if (!empty(static::$parameters['extension']) && (static::$parameters['extension'] == 'xml')) {
 			$ok = 'true';
 		} else {
 			$ok = 'ok';
 		}
 
-		DI::apiResponse()->exit('ok', ['ok' => $ok], $parameters['extension'] ?? null);
+		DI::apiResponse()->exit('ok', ['ok' => $ok], static::$parameters['extension'] ?? null);
 	}
 }
diff --git a/src/Module/Api/Mastodon/Accounts.php b/src/Module/Api/Mastodon/Accounts.php
index 781547854a..360993397a 100644
--- a/src/Module/Api/Mastodon/Accounts.php
+++ b/src/Module/Api/Mastodon/Accounts.php
@@ -33,27 +33,26 @@ use Friendica\Module\BaseApi;
 class Accounts extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id']) && empty($parameters['name'])) {
+		if (empty(static::$parameters['id']) && empty(static::$parameters['name'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		if (!empty($parameters['id'])) {
-			$id = $parameters['id'];
+		if (!empty(static::$parameters['id'])) {
+			$id = static::$parameters['id'];
 			if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) {
 				DI::mstdnError()->RecordNotFound();
 			}
 		} else {
-			$contact = Contact::selectFirst(['id'], ['nick' => $parameters['name'], 'uid' => 0]);
+			$contact = Contact::selectFirst(['id'], ['nick' => static::$parameters['name'], 'uid' => 0]);
 			if (!empty($contact['id'])) {
 				$id = $contact['id'];
-			} elseif (!($id = Contact::getIdForURL($parameters['name'], 0, false))) {
+			} elseif (!($id = Contact::getIdForURL(static::$parameters['name'], 0, false))) {
 				DI::mstdnError()->RecordNotFound();
 			}
 		}
diff --git a/src/Module/Api/Mastodon/Accounts/Block.php b/src/Module/Api/Mastodon/Accounts/Block.php
index 463383df71..c32862ca48 100644
--- a/src/Module/Api/Mastodon/Accounts/Block.php
+++ b/src/Module/Api/Mastodon/Accounts/Block.php
@@ -32,12 +32,12 @@ use Friendica\Module\BaseApi;
  */
 class Block extends BaseApi
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAllowedScope(self::SCOPE_FOLLOW);
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
@@ -46,7 +46,7 @@ class Block extends BaseApi
 			DI::mstdnError()->Forbidden();
 		}
 
-		$cdata = Contact::getPublicAndUserContactID($parameters['id'], $uid);
+		$cdata = Contact::getPublicAndUserContactID(static::$parameters['id'], $uid);
 		if (empty($cdata['user'])) {
 			DI::mstdnError()->RecordNotFound();
 		}
@@ -62,6 +62,6 @@ class Block extends BaseApi
 		Contact::terminateFriendship($owner, $contact);
 		Contact::revokeFollow($contact);
 
-		System::jsonExit(DI::mstdnRelationship()->createFromContactId($parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnRelationship()->createFromContactId(static::$parameters['id'], $uid)->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/Accounts/FeaturedTags.php b/src/Module/Api/Mastodon/Accounts/FeaturedTags.php
index c4a4a561c6..cbb409d1b4 100644
--- a/src/Module/Api/Mastodon/Accounts/FeaturedTags.php
+++ b/src/Module/Api/Mastodon/Accounts/FeaturedTags.php
@@ -30,10 +30,9 @@ use Friendica\Module\BaseApi;
 class FeaturedTags extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 
diff --git a/src/Module/Api/Mastodon/Accounts/Follow.php b/src/Module/Api/Mastodon/Accounts/Follow.php
index ab7038e979..b02ee18022 100644
--- a/src/Module/Api/Mastodon/Accounts/Follow.php
+++ b/src/Module/Api/Mastodon/Accounts/Follow.php
@@ -31,16 +31,16 @@ use Friendica\Module\BaseApi;
  */
 class Follow extends BaseApi
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAllowedScope(self::SCOPE_FOLLOW);
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$cid = Contact::follow($parameters['id'], $uid);
+		$cid = Contact::follow(static::$parameters['id'], $uid);
 
 		System::jsonExit(DI::mstdnRelationship()->createFromContactId($cid, $uid)->toArray());
 	}
diff --git a/src/Module/Api/Mastodon/Accounts/Followers.php b/src/Module/Api/Mastodon/Accounts/Followers.php
index e1f864acbe..3d24da2dfa 100644
--- a/src/Module/Api/Mastodon/Accounts/Followers.php
+++ b/src/Module/Api/Mastodon/Accounts/Followers.php
@@ -32,19 +32,18 @@ use Friendica\Module\BaseApi;
 class Followers extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$id = $parameters['id'];
+		$id = static::$parameters['id'];
 		if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) {
 			DI::mstdnError()->RecordNotFound();
 		}
@@ -73,7 +72,7 @@ class Followers extends BaseApi
 			$params['order'] = ['cid'];
 		}
 
-		$followers = DBA::select('contact-relation', ['relation-cid'], $condition, $parameters);
+		$followers = DBA::select('contact-relation', ['relation-cid'], $condition, static::$parameters);
 		while ($follower = DBA::fetch($followers)) {
 			self::setBoundaries($follower['relation-cid']);
 			$accounts[] = DI::mstdnAccount()->createFromContactId($follower['relation-cid'], $uid);
diff --git a/src/Module/Api/Mastodon/Accounts/Following.php b/src/Module/Api/Mastodon/Accounts/Following.php
index e2b963e0c3..d3d8047041 100644
--- a/src/Module/Api/Mastodon/Accounts/Following.php
+++ b/src/Module/Api/Mastodon/Accounts/Following.php
@@ -32,19 +32,18 @@ use Friendica\Module\BaseApi;
 class Following extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$id = $parameters['id'];
+		$id = static::$parameters['id'];
 		if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) {
 			DI::mstdnError()->RecordNotFound();
 		}
@@ -73,7 +72,7 @@ class Following extends BaseApi
 			$params['order'] = ['cid'];
 		}
 
-		$followers = DBA::select('contact-relation', ['cid'], $condition, $parameters);
+		$followers = DBA::select('contact-relation', ['cid'], $condition, static::$parameters);
 		while ($follower = DBA::fetch($followers)) {
 			self::setBoundaries($follower['cid']);
 			$accounts[] = DI::mstdnAccount()->createFromContactId($follower['cid'], $uid);
diff --git a/src/Module/Api/Mastodon/Accounts/IdentityProofs.php b/src/Module/Api/Mastodon/Accounts/IdentityProofs.php
index 6abb416d1d..f36d656f5a 100644
--- a/src/Module/Api/Mastodon/Accounts/IdentityProofs.php
+++ b/src/Module/Api/Mastodon/Accounts/IdentityProofs.php
@@ -30,10 +30,9 @@ use Friendica\Module\BaseApi;
 class IdentityProofs extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 
diff --git a/src/Module/Api/Mastodon/Accounts/Lists.php b/src/Module/Api/Mastodon/Accounts/Lists.php
index 9086749405..3ec24bcc1a 100644
--- a/src/Module/Api/Mastodon/Accounts/Lists.php
+++ b/src/Module/Api/Mastodon/Accounts/Lists.php
@@ -33,19 +33,18 @@ use Friendica\Module\BaseApi;
 class Lists extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$id = $parameters['id'];
+		$id = static::$parameters['id'];
 		if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) {
 			DI::mstdnError()->RecordNotFound();
 		}
diff --git a/src/Module/Api/Mastodon/Accounts/Mute.php b/src/Module/Api/Mastodon/Accounts/Mute.php
index 1d878269dc..b0b14a6146 100644
--- a/src/Module/Api/Mastodon/Accounts/Mute.php
+++ b/src/Module/Api/Mastodon/Accounts/Mute.php
@@ -31,17 +31,17 @@ use Friendica\Module\BaseApi;
  */
 class Mute extends BaseApi
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAllowedScope(self::SCOPE_FOLLOW);
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		Contact\User::setIgnored($parameters['id'], $uid, true);
+		Contact\User::setIgnored(static::$parameters['id'], $uid, true);
 
-		System::jsonExit(DI::mstdnRelationship()->createFromContactId($parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnRelationship()->createFromContactId(static::$parameters['id'], $uid)->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/Accounts/Note.php b/src/Module/Api/Mastodon/Accounts/Note.php
index e631922024..ae6e582e87 100644
--- a/src/Module/Api/Mastodon/Accounts/Note.php
+++ b/src/Module/Api/Mastodon/Accounts/Note.php
@@ -32,12 +32,12 @@ use Friendica\Module\BaseApi;
  */
 class Note extends BaseApi
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
@@ -45,13 +45,13 @@ class Note extends BaseApi
 			'comment' => '',
 		]);
 
-		$cdata = Contact::getPublicAndUserContactID($parameters['id'], $uid);
+		$cdata = Contact::getPublicAndUserContactID(static::$parameters['id'], $uid);
 		if (empty($cdata['user'])) {
 			DI::mstdnError()->RecordNotFound();
 		}
 
 		Contact::update(['info' => $request['comment']], ['id' => $cdata['user']]);
 
-		System::jsonExit(DI::mstdnRelationship()->createFromContactId($parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnRelationship()->createFromContactId(static::$parameters['id'], $uid)->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/Accounts/Relationships.php b/src/Module/Api/Mastodon/Accounts/Relationships.php
index 5631952d2a..28135e5eba 100644
--- a/src/Module/Api/Mastodon/Accounts/Relationships.php
+++ b/src/Module/Api/Mastodon/Accounts/Relationships.php
@@ -32,10 +32,9 @@ use Friendica\Module\BaseApi;
 class Relationships extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Accounts/Search.php b/src/Module/Api/Mastodon/Accounts/Search.php
index c31189a424..6b9d2d43f9 100644
--- a/src/Module/Api/Mastodon/Accounts/Search.php
+++ b/src/Module/Api/Mastodon/Accounts/Search.php
@@ -35,10 +35,9 @@ use Friendica\Object\Search\ContactResult;
 class Search extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Accounts/Statuses.php b/src/Module/Api/Mastodon/Accounts/Statuses.php
index 0e7a7fb337..c3252d59fe 100644
--- a/src/Module/Api/Mastodon/Accounts/Statuses.php
+++ b/src/Module/Api/Mastodon/Accounts/Statuses.php
@@ -37,18 +37,17 @@ use Friendica\Protocol\Activity;
 class Statuses extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$id = $parameters['id'];
+		$id = static::$parameters['id'];
 		if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) {
 			DI::mstdnError()->RecordNotFound();
 		}
diff --git a/src/Module/Api/Mastodon/Accounts/Unblock.php b/src/Module/Api/Mastodon/Accounts/Unblock.php
index b1c93ea362..26a1150424 100644
--- a/src/Module/Api/Mastodon/Accounts/Unblock.php
+++ b/src/Module/Api/Mastodon/Accounts/Unblock.php
@@ -31,17 +31,17 @@ use Friendica\Module\BaseApi;
  */
 class Unblock extends BaseApi
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAllowedScope(self::SCOPE_FOLLOW);
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		Contact\User::setBlocked($parameters['id'], $uid, false);
+		Contact\User::setBlocked(static::$parameters['id'], $uid, false);
 
-		System::jsonExit(DI::mstdnRelationship()->createFromContactId($parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnRelationship()->createFromContactId(static::$parameters['id'], $uid)->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/Accounts/Unfollow.php b/src/Module/Api/Mastodon/Accounts/Unfollow.php
index 447b1cd652..cd7aef7ab1 100644
--- a/src/Module/Api/Mastodon/Accounts/Unfollow.php
+++ b/src/Module/Api/Mastodon/Accounts/Unfollow.php
@@ -31,17 +31,17 @@ use Friendica\Module\BaseApi;
  */
 class Unfollow extends BaseApi
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAllowedScope(self::SCOPE_FOLLOW);
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		Contact::unfollow($parameters['id'], $uid);
+		Contact::unfollow(static::$parameters['id'], $uid);
 
-		System::jsonExit(DI::mstdnRelationship()->createFromContactId($parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnRelationship()->createFromContactId(static::$parameters['id'], $uid)->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/Accounts/Unmute.php b/src/Module/Api/Mastodon/Accounts/Unmute.php
index bc2e50be91..eb1ad8bfa1 100644
--- a/src/Module/Api/Mastodon/Accounts/Unmute.php
+++ b/src/Module/Api/Mastodon/Accounts/Unmute.php
@@ -31,17 +31,17 @@ use Friendica\Module\BaseApi;
  */
 class Unmute extends BaseApi
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAllowedScope(self::SCOPE_FOLLOW);
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		Contact\User::setIgnored($parameters['id'], $uid, false);
+		Contact\User::setIgnored(static::$parameters['id'], $uid, false);
 
-		System::jsonExit(DI::mstdnRelationship()->createFromContactId($parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnRelationship()->createFromContactId(static::$parameters['id'], $uid)->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php b/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php
index 449e26fb96..264a2a4a8b 100644
--- a/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php
+++ b/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php
@@ -32,7 +32,7 @@ use Friendica\Util\HTTPInputData;
  */
 class UpdateCredentials extends BaseApi
 {
-	public static function patch(array $parameters = [])
+	public static function patch()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Accounts/VerifyCredentials.php b/src/Module/Api/Mastodon/Accounts/VerifyCredentials.php
index 1c1945438b..f91545ee10 100644
--- a/src/Module/Api/Mastodon/Accounts/VerifyCredentials.php
+++ b/src/Module/Api/Mastodon/Accounts/VerifyCredentials.php
@@ -33,10 +33,9 @@ use Friendica\Module\BaseApi;
 class VerifyCredentials extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Announcements.php b/src/Module/Api/Mastodon/Announcements.php
index 5a414fda10..23ad0feeb8 100644
--- a/src/Module/Api/Mastodon/Announcements.php
+++ b/src/Module/Api/Mastodon/Announcements.php
@@ -30,10 +30,9 @@ use Friendica\Module\BaseApi;
 class Announcements extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 
diff --git a/src/Module/Api/Mastodon/Apps.php b/src/Module/Api/Mastodon/Apps.php
index 040607137c..adbcd723da 100644
--- a/src/Module/Api/Mastodon/Apps.php
+++ b/src/Module/Api/Mastodon/Apps.php
@@ -33,10 +33,9 @@ use Friendica\Util\Network;
 class Apps extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		$request = self::getRequest([
 			'client_name'   => '',
diff --git a/src/Module/Api/Mastodon/Apps/VerifyCredentials.php b/src/Module/Api/Mastodon/Apps/VerifyCredentials.php
index e4105f142f..baa3aa7faa 100644
--- a/src/Module/Api/Mastodon/Apps/VerifyCredentials.php
+++ b/src/Module/Api/Mastodon/Apps/VerifyCredentials.php
@@ -30,7 +30,7 @@ use Friendica\Module\BaseApi;
  */
 class VerifyCredentials extends BaseApi
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$application = self::getCurrentApplication();
diff --git a/src/Module/Api/Mastodon/Blocks.php b/src/Module/Api/Mastodon/Blocks.php
index 305914c1aa..fbcaf2ded3 100644
--- a/src/Module/Api/Mastodon/Blocks.php
+++ b/src/Module/Api/Mastodon/Blocks.php
@@ -32,19 +32,18 @@ use Friendica\Module\BaseApi;
 class Blocks extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$id = $parameters['id'];
+		$id = static::$parameters['id'];
 		if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) {
 			DI::mstdnError()->RecordNotFound();
 		}
@@ -73,7 +72,7 @@ class Blocks extends BaseApi
 			$params['order'] = ['cid'];
 		}
 
-		$followers = DBA::select('user-contact', ['cid'], $condition, $parameters);
+		$followers = DBA::select('user-contact', ['cid'], $condition, static::$parameters);
 		while ($follower = DBA::fetch($followers)) {
 			self::setBoundaries($follower['cid']);
 			$accounts[] = DI::mstdnAccount()->createFromContactId($follower['cid'], $uid);
diff --git a/src/Module/Api/Mastodon/Bookmarks.php b/src/Module/Api/Mastodon/Bookmarks.php
index a7141e3dcb..6cfa087722 100644
--- a/src/Module/Api/Mastodon/Bookmarks.php
+++ b/src/Module/Api/Mastodon/Bookmarks.php
@@ -34,10 +34,9 @@ use Friendica\Network\HTTPException;
 class Bookmarks extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Conversations.php b/src/Module/Api/Mastodon/Conversations.php
index 22774b57ce..af2632ae63 100644
--- a/src/Module/Api/Mastodon/Conversations.php
+++ b/src/Module/Api/Mastodon/Conversations.php
@@ -31,26 +31,25 @@ use Friendica\Module\BaseApi;
  */
 class Conversations extends BaseApi
 {
-	public static function delete(array $parameters = [])
+	public static function delete()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		if (!empty($parameters['id'])) {
+		if (!empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		DBA::delete('conv', ['id' => $parameters['id'], 'uid' => $uid]);
-		DBA::delete('mail', ['convid' => $parameters['id'], 'uid' => $uid]);
+		DBA::delete('conv', ['id' => static::$parameters['id'], 'uid' => $uid]);
+		DBA::delete('mail', ['convid' => static::$parameters['id'], 'uid' => $uid]);
 
 		System::jsonExit([]);
 	}
 
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Conversations/Read.php b/src/Module/Api/Mastodon/Conversations/Read.php
index c469eea346..b23a95b5e1 100644
--- a/src/Module/Api/Mastodon/Conversations/Read.php
+++ b/src/Module/Api/Mastodon/Conversations/Read.php
@@ -31,17 +31,17 @@ use Friendica\Module\BaseApi;
  */
 class Read extends BaseApi
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		if (!empty($parameters['id'])) {
+		if (!empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		DBA::update('mail', ['seen' => true], ['convid' => $parameters['id'], 'uid' => $uid]);
+		DBA::update('mail', ['seen' => true], ['convid' => static::$parameters['id'], 'uid' => $uid]);
 
-		System::jsonExit(DI::mstdnConversation()->CreateFromConvId($parameters['id'])->toArray());
+		System::jsonExit(DI::mstdnConversation()->CreateFromConvId(static::$parameters['id'])->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/CustomEmojis.php b/src/Module/Api/Mastodon/CustomEmojis.php
index a9723414d2..a16eedf2f3 100644
--- a/src/Module/Api/Mastodon/CustomEmojis.php
+++ b/src/Module/Api/Mastodon/CustomEmojis.php
@@ -33,12 +33,11 @@ use Friendica\Network\HTTPException;
 class CustomEmojis extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 * @see https://docs.joinmastodon.org/methods/accounts/follow_requests#pending-follows
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$emojis = DI::mstdnEmoji()->createCollectionFromSmilies(Smilies::getList());
 
diff --git a/src/Module/Api/Mastodon/Directory.php b/src/Module/Api/Mastodon/Directory.php
index 115b02a86f..ec579d2da5 100644
--- a/src/Module/Api/Mastodon/Directory.php
+++ b/src/Module/Api/Mastodon/Directory.php
@@ -35,12 +35,11 @@ use Friendica\Network\HTTPException;
 class Directory extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 * @see https://docs.joinmastodon.org/methods/instance/directory/
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$request = self::getRequest([
 			'offset' => 0,        // How many accounts to skip before returning results. Default 0.
diff --git a/src/Module/Api/Mastodon/Endorsements.php b/src/Module/Api/Mastodon/Endorsements.php
index 9c5e853bc7..5b90cc48a9 100644
--- a/src/Module/Api/Mastodon/Endorsements.php
+++ b/src/Module/Api/Mastodon/Endorsements.php
@@ -30,10 +30,9 @@ use Friendica\Module\BaseApi;
 class Endorsements extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		System::jsonExit([]);
 	}
diff --git a/src/Module/Api/Mastodon/Favourited.php b/src/Module/Api/Mastodon/Favourited.php
index 31e760d3b8..f49d35a7bf 100644
--- a/src/Module/Api/Mastodon/Favourited.php
+++ b/src/Module/Api/Mastodon/Favourited.php
@@ -35,10 +35,9 @@ use Friendica\Protocol\Activity;
 class Favourited extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Filters.php b/src/Module/Api/Mastodon/Filters.php
index f14b74a0bd..365ed65f35 100644
--- a/src/Module/Api/Mastodon/Filters.php
+++ b/src/Module/Api/Mastodon/Filters.php
@@ -31,7 +31,7 @@ use Friendica\Module\BaseApi;
  */
 class Filters extends BaseApi
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 
@@ -39,10 +39,9 @@ class Filters extends BaseApi
 	}
 
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 
diff --git a/src/Module/Api/Mastodon/FollowRequests.php b/src/Module/Api/Mastodon/FollowRequests.php
index bc7cc31bbe..2fb548b356 100644
--- a/src/Module/Api/Mastodon/FollowRequests.php
+++ b/src/Module/Api/Mastodon/FollowRequests.php
@@ -33,7 +33,6 @@ use Friendica\Network\HTTPException;
 class FollowRequests extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws HTTPException\BadRequestException
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws HTTPException\NotFoundException
@@ -43,16 +42,16 @@ class FollowRequests extends BaseApi
 	 * @see https://docs.joinmastodon.org/methods/accounts/follow_requests#accept-follow
 	 * @see https://docs.joinmastodon.org/methods/accounts/follow_requests#reject-follow
 	 */
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAllowedScope(self::SCOPE_FOLLOW);
 		$uid = self::getCurrentUserID();
 
-		$introduction = DI::intro()->selectOneById($parameters['id'], $uid);
+		$introduction = DI::intro()->selectOneById(static::$parameters['id'], $uid);
 
 		$contactId = $introduction->cid;
 
-		switch ($parameters['action']) {
+		switch (static::$parameters['action']) {
 			case 'authorize':
 				Contact\Introduction::confirm($introduction);
 				$relationship = DI::mstdnRelationship()->createFromContactId($contactId, $uid);
@@ -79,12 +78,11 @@ class FollowRequests extends BaseApi
 	}
 
 	/**
-	 * @param array $parameters
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 * @see https://docs.joinmastodon.org/methods/accounts/follow_requests/
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Instance.php b/src/Module/Api/Mastodon/Instance.php
index 2e73a440d0..5f33458534 100644
--- a/src/Module/Api/Mastodon/Instance.php
+++ b/src/Module/Api/Mastodon/Instance.php
@@ -31,10 +31,9 @@ use Friendica\Object\Api\Mastodon\Instance as InstanceEntity;
 class Instance extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		System::jsonExit(InstanceEntity::get());
 	}
diff --git a/src/Module/Api/Mastodon/Instance/Peers.php b/src/Module/Api/Mastodon/Instance/Peers.php
index be18a5aa14..5d4642e0b4 100644
--- a/src/Module/Api/Mastodon/Instance/Peers.php
+++ b/src/Module/Api/Mastodon/Instance/Peers.php
@@ -34,10 +34,9 @@ use Friendica\Util\Network;
 class Peers extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$return = [];
 
diff --git a/src/Module/Api/Mastodon/Instance/Rules.php b/src/Module/Api/Mastodon/Instance/Rules.php
index 9b7d2dc77f..bb5822702a 100644
--- a/src/Module/Api/Mastodon/Instance/Rules.php
+++ b/src/Module/Api/Mastodon/Instance/Rules.php
@@ -34,10 +34,9 @@ use Friendica\Network\HTTPException;
 class Rules extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$rules = [];
 		$id    = 0;
diff --git a/src/Module/Api/Mastodon/Lists.php b/src/Module/Api/Mastodon/Lists.php
index 8be4207eae..f977ce1039 100644
--- a/src/Module/Api/Mastodon/Lists.php
+++ b/src/Module/Api/Mastodon/Lists.php
@@ -31,27 +31,27 @@ use Friendica\Model\Group;
  */
 class Lists extends BaseApi
 {
-	public static function delete(array $parameters = [])
+	public static function delete()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		if (!Group::exists($parameters['id'], $uid)) {
+		if (!Group::exists(static::$parameters['id'], $uid)) {
 			DI::mstdnError()->RecordNotFound();
 		}
 
-		if (!Group::remove($parameters['id'])) {
+		if (!Group::remove(static::$parameters['id'])) {
 			DI::mstdnError()->InternalError();
 		}
 
 		System::jsonExit([]);
 	}
 
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
@@ -74,30 +74,29 @@ class Lists extends BaseApi
 		System::jsonExit(DI::mstdnList()->createFromGroupId($id));
 	}
 
-	public static function put(array $parameters = [])
+	public static function put()
 	{
 		$request = self::getRequest([
 			'title'          => '', // The title of the list to be updated.
 			'replies_policy' => '', // One of: "followed", "list", or "none".
 		]);
 
-		if (empty($request['title']) || empty($parameters['id'])) {
+		if (empty($request['title']) || empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		Group::update($parameters['id'], $request['title']);
+		Group::update(static::$parameters['id'], $request['title']);
 	}
 
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			$lists = [];
 
 			$groups = Group::getByUserId($uid);
@@ -106,7 +105,7 @@ class Lists extends BaseApi
 				$lists[] = DI::mstdnList()->createFromGroupId($group['id']);
 			}
 		} else {
-			$id = $parameters['id'];
+			$id = static::$parameters['id'];
 
 			if (!Group::exists($id, $uid)) {
 				DI::mstdnError()->RecordNotFound();
diff --git a/src/Module/Api/Mastodon/Lists/Accounts.php b/src/Module/Api/Mastodon/Lists/Accounts.php
index b83f4903a9..0e008602d4 100644
--- a/src/Module/Api/Mastodon/Lists/Accounts.php
+++ b/src/Module/Api/Mastodon/Lists/Accounts.php
@@ -35,30 +35,29 @@ use Friendica\Module\BaseApi;
  */
 class Accounts extends BaseApi
 {
-	public static function delete(array $parameters = [])
+	public static function delete()
 	{
 		DI::apiResponse()->unsupported(Router::DELETE);
 	}
 
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		DI::apiResponse()->unsupported(Router::POST);
 	}
 
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$id = $parameters['id'];
+		$id = static::$parameters['id'];
 		if (!DBA::exists('group', ['id' => $id, 'uid' => $uid])) {
 			DI::mstdnError()->RecordNotFound();
 		}
diff --git a/src/Module/Api/Mastodon/Markers.php b/src/Module/Api/Mastodon/Markers.php
index 394d508d77..5843585e24 100644
--- a/src/Module/Api/Mastodon/Markers.php
+++ b/src/Module/Api/Mastodon/Markers.php
@@ -31,7 +31,7 @@ use Friendica\Module\BaseApi;
  */
 class Markers extends BaseApi
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 
@@ -39,10 +39,9 @@ class Markers extends BaseApi
 	}
 
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 
diff --git a/src/Module/Api/Mastodon/Media.php b/src/Module/Api/Mastodon/Media.php
index b93a06288f..65aa281392 100644
--- a/src/Module/Api/Mastodon/Media.php
+++ b/src/Module/Api/Mastodon/Media.php
@@ -32,7 +32,7 @@ use Friendica\Module\BaseApi;
  */
 class Media extends BaseApi
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
@@ -53,7 +53,7 @@ class Media extends BaseApi
 		System::jsonExit(DI::mstdnAttachment()->createFromPhoto($media['id']));
 	}
 
-	public static function put(array $parameters = [])
+	public static function put()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
@@ -65,34 +65,33 @@ class Media extends BaseApi
 			'focus'       => '', // Two floating points (x,y), comma-delimited ranging from -1.0 to 1.0
 		]);
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$photo = Photo::selectFirst(['resource-id'], ['id' => $parameters['id'], 'uid' => $uid]);
+		$photo = Photo::selectFirst(['resource-id'], ['id' => static::$parameters['id'], 'uid' => $uid]);
 		if (empty($photo['resource-id'])) {
 			DI::mstdnError()->RecordNotFound();
 		}
 
 		Photo::update(['desc' => $request['description']], ['resource-id' => $photo['resource-id']]);
 
-		System::jsonExit(DI::mstdnAttachment()->createFromPhoto($parameters['id']));
+		System::jsonExit(DI::mstdnAttachment()->createFromPhoto(static::$parameters['id']));
 	}
 
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$id = $parameters['id'];
+		$id = static::$parameters['id'];
 		if (!Photo::exists(['id' => $id, 'uid' => $uid])) {
 			DI::mstdnError()->RecordNotFound();
 		}
diff --git a/src/Module/Api/Mastodon/Mutes.php b/src/Module/Api/Mastodon/Mutes.php
index 7939da114b..da9b75dd99 100644
--- a/src/Module/Api/Mastodon/Mutes.php
+++ b/src/Module/Api/Mastodon/Mutes.php
@@ -32,19 +32,18 @@ use Friendica\Module\BaseApi;
 class Mutes extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$id = $parameters['id'];
+		$id = static::$parameters['id'];
 		if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) {
 			DI::mstdnError()->RecordNotFound();
 		}
@@ -73,7 +72,7 @@ class Mutes extends BaseApi
 			$params['order'] = ['cid'];
 		}
 
-		$followers = DBA::select('user-contact', ['cid'], $condition, $parameters);
+		$followers = DBA::select('user-contact', ['cid'], $condition, static::$parameters);
 		while ($follower = DBA::fetch($followers)) {
 			self::setBoundaries($follower['cid']);
 			$accounts[] = DI::mstdnAccount()->createFromContactId($follower['cid'], $uid);
diff --git a/src/Module/Api/Mastodon/Notifications.php b/src/Module/Api/Mastodon/Notifications.php
index a6a024d9b1..3c2e0d4386 100644
--- a/src/Module/Api/Mastodon/Notifications.php
+++ b/src/Module/Api/Mastodon/Notifications.php
@@ -38,16 +38,15 @@ use Friendica\Protocol\Activity;
 class Notifications extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
 
-		if (!empty($parameters['id'])) {
-			$id = $parameters['id'];
+		if (!empty(static::$parameters['id'])) {
+			$id = static::$parameters['id'];
 			try {
 				$notification = DI::notification()->selectOneForUser($uid, ['id' => $id]);
 				System::jsonExit(DI::mstdnNotification()->createFromNotification($notification));
diff --git a/src/Module/Api/Mastodon/Notifications/Clear.php b/src/Module/Api/Mastodon/Notifications/Clear.php
index 9dca0bf655..93639d8a63 100644
--- a/src/Module/Api/Mastodon/Notifications/Clear.php
+++ b/src/Module/Api/Mastodon/Notifications/Clear.php
@@ -30,7 +30,7 @@ use Friendica\Module\BaseApi;
  */
 class Clear extends BaseApi
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Notifications/Dismiss.php b/src/Module/Api/Mastodon/Notifications/Dismiss.php
index b615c5e890..e3fc3290a1 100644
--- a/src/Module/Api/Mastodon/Notifications/Dismiss.php
+++ b/src/Module/Api/Mastodon/Notifications/Dismiss.php
@@ -32,16 +32,16 @@ use Friendica\Network\HTTPException\ForbiddenException;
  */
 class Dismiss extends BaseApi
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$Notification = DI::notification()->selectOneForUser($uid, $parameters['id']);
+		$Notification = DI::notification()->selectOneForUser($uid, static::$parameters['id']);
 		$Notification->setSeen();
 		DI::notification()->save($Notification);
 
diff --git a/src/Module/Api/Mastodon/Preferences.php b/src/Module/Api/Mastodon/Preferences.php
index d54bd85fa1..21361e1f37 100644
--- a/src/Module/Api/Mastodon/Preferences.php
+++ b/src/Module/Api/Mastodon/Preferences.php
@@ -32,10 +32,9 @@ use Friendica\Module\BaseApi;
 class Preferences extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Proofs.php b/src/Module/Api/Mastodon/Proofs.php
index 1d09a92113..9bdc77f490 100644
--- a/src/Module/Api/Mastodon/Proofs.php
+++ b/src/Module/Api/Mastodon/Proofs.php
@@ -30,10 +30,9 @@ use Friendica\Module\BaseApi;
 class Proofs extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		System::jsonError(404, ['error' => 'Record not found']);
 	}
diff --git a/src/Module/Api/Mastodon/PushSubscription.php b/src/Module/Api/Mastodon/PushSubscription.php
index 3bc77aeb6f..7150416439 100644
--- a/src/Module/Api/Mastodon/PushSubscription.php
+++ b/src/Module/Api/Mastodon/PushSubscription.php
@@ -33,7 +33,7 @@ use Friendica\Object\Api\Mastodon\Notification;
  */
 class PushSubscription extends BaseApi
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAllowedScope(self::SCOPE_PUSH);
 		$uid         = self::getCurrentUserID();
@@ -66,7 +66,7 @@ class PushSubscription extends BaseApi
 		return DI::mstdnSubscription()->createForApplicationIdAndUserId($application['id'], $uid)->toArray();
 	}
 
-	public static function put(array $parameters = [])
+	public static function put()
 	{
 		self::checkAllowedScope(self::SCOPE_PUSH);
 		$uid         = self::getCurrentUserID();
@@ -99,7 +99,7 @@ class PushSubscription extends BaseApi
 		return DI::mstdnSubscription()->createForApplicationIdAndUserId($application['id'], $uid)->toArray();
 	}
 
-	public static function delete(array $parameters = [])
+	public static function delete()
 	{
 		self::checkAllowedScope(self::SCOPE_PUSH);
 		$uid         = self::getCurrentUserID();
@@ -112,7 +112,7 @@ class PushSubscription extends BaseApi
 		System::jsonExit([]);
 	}
 
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_PUSH);
 		$uid         = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/ScheduledStatuses.php b/src/Module/Api/Mastodon/ScheduledStatuses.php
index 82be0d6e7b..6a4971860f 100644
--- a/src/Module/Api/Mastodon/ScheduledStatuses.php
+++ b/src/Module/Api/Mastodon/ScheduledStatuses.php
@@ -34,7 +34,7 @@ use Friendica\Module\BaseApi;
  */
 class ScheduledStatuses extends BaseApi
 {
-	public static function put(array $parameters = [])
+	public static function put()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
@@ -42,35 +42,34 @@ class ScheduledStatuses extends BaseApi
 		DI::apiResponse()->unsupported(Router::PUT);
 	}
 
-	public static function delete(array $parameters = [])
+	public static function delete()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		if (!DBA::exists('delayed-post', ['id' => $parameters['id'], 'uid' => $uid])) {
+		if (!DBA::exists('delayed-post', ['id' => static::$parameters['id'], 'uid' => $uid])) {
 			DI::mstdnError()->RecordNotFound();
 		}
 
-		Post\Delayed::deleteById($parameters['id']);
+		Post\Delayed::deleteById(static::$parameters['id']);
 
 		System::jsonExit([]);
 	}
 
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
 
-		if (isset($parameters['id'])) {
-			System::jsonExit(DI::mstdnScheduledStatus()->createFromDelayedPostId($parameters['id'], $uid)->toArray());
+		if (isset(static::$parameters['id'])) {
+			System::jsonExit(DI::mstdnScheduledStatus()->createFromDelayedPostId(static::$parameters['id'], $uid)->toArray());
 		}
 
 		$request = self::getRequest([
diff --git a/src/Module/Api/Mastodon/Search.php b/src/Module/Api/Mastodon/Search.php
index 63190151d7..d17db271fd 100644
--- a/src/Module/Api/Mastodon/Search.php
+++ b/src/Module/Api/Mastodon/Search.php
@@ -38,10 +38,9 @@ use Friendica\Object\Search\ContactResult;
 class Search extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
@@ -74,7 +73,7 @@ class Search extends BaseApi
 			$result['statuses'] = self::searchStatuses($uid, $request['q'], $request['account_id'], $request['max_id'], $request['min_id'], $limit, $request['offset']);
 		}
 		if ((empty($request['type']) || ($request['type'] == 'hashtags')) && (strpos($request['q'], '@') == false)) {
-			$result['hashtags'] = self::searchHashtags($request['q'], $request['exclude_unreviewed'], $limit, $request['offset'], $parameters['version']);
+			$result['hashtags'] = self::searchHashtags($request['q'], $request['exclude_unreviewed'], $limit, $request['offset'], static::$parameters['version']);
 		}
 
 		System::jsonExit($result);
diff --git a/src/Module/Api/Mastodon/Statuses.php b/src/Module/Api/Mastodon/Statuses.php
index ed5abf1996..75e22802e2 100644
--- a/src/Module/Api/Mastodon/Statuses.php
+++ b/src/Module/Api/Mastodon/Statuses.php
@@ -41,7 +41,7 @@ use Friendica\Util\Images;
  */
 class Statuses extends BaseApi
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
@@ -207,16 +207,16 @@ class Statuses extends BaseApi
 		DI::mstdnError()->InternalError();
 	}
 
-	public static function delete(array $parameters = [])
+	public static function delete()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$item = Post::selectFirstForUser($uid, ['id'], ['uri-id' => $parameters['id'], 'uid' => $uid]);
+		$item = Post::selectFirstForUser($uid, ['id'], ['uri-id' => static::$parameters['id'], 'uid' => $uid]);
 		if (empty($item['id'])) {
 			DI::mstdnError()->RecordNotFound();
 		}
@@ -229,17 +229,16 @@ class Statuses extends BaseApi
 	}
 
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId($parameters['id'], $uid));
+		System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid));
 	}
 }
diff --git a/src/Module/Api/Mastodon/Statuses/Bookmark.php b/src/Module/Api/Mastodon/Statuses/Bookmark.php
index 79be11a4a2..e12c6ecd22 100644
--- a/src/Module/Api/Mastodon/Statuses/Bookmark.php
+++ b/src/Module/Api/Mastodon/Statuses/Bookmark.php
@@ -33,16 +33,16 @@ use Friendica\Module\BaseApi;
  */
 class Bookmark extends BaseApi
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => $parameters['id'], 'uid' => [$uid, 0]]);
+		$item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => static::$parameters['id'], 'uid' => [$uid, 0]]);
 		if (!DBA::isResult($item)) {
 			DI::mstdnError()->RecordNotFound();
 		}
@@ -53,6 +53,6 @@ class Bookmark extends BaseApi
 
 		Item::update(['starred' => true], ['id' => $item['id']]);
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId($parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid)->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/Statuses/Card.php b/src/Module/Api/Mastodon/Statuses/Card.php
index 2fe4825544..3c8cf706ed 100644
--- a/src/Module/Api/Mastodon/Statuses/Card.php
+++ b/src/Module/Api/Mastodon/Statuses/Card.php
@@ -33,18 +33,17 @@ use Friendica\Network\HTTPException;
 class Card extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$id = $parameters['id'];
+		$id = static::$parameters['id'];
 
 		if (!Post::exists(['uri-id' => $id, 'uid' => [0, $uid]])) {
 			throw new HTTPException\NotFoundException('Item with URI ID ' . $id . ' not found' . ($uid ? ' for user ' . $uid : '.'));
diff --git a/src/Module/Api/Mastodon/Statuses/Context.php b/src/Module/Api/Mastodon/Statuses/Context.php
index 62397afdbc..b8a8007212 100644
--- a/src/Module/Api/Mastodon/Statuses/Context.php
+++ b/src/Module/Api/Mastodon/Statuses/Context.php
@@ -33,14 +33,13 @@ use Friendica\Module\BaseApi;
 class Context extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
@@ -48,7 +47,7 @@ class Context extends BaseApi
 			'limit'    => 40, // Maximum number of results to return. Defaults to 40.
 		]);
 
-		$id = $parameters['id'];
+		$id = static::$parameters['id'];
 
 		$parents  = [];
 		$children = [];
diff --git a/src/Module/Api/Mastodon/Statuses/Favourite.php b/src/Module/Api/Mastodon/Statuses/Favourite.php
index a30ad0fe78..00844c544b 100644
--- a/src/Module/Api/Mastodon/Statuses/Favourite.php
+++ b/src/Module/Api/Mastodon/Statuses/Favourite.php
@@ -33,22 +33,22 @@ use Friendica\Module\BaseApi;
  */
 class Favourite extends BaseApi
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$item = Post::selectFirstForUser($uid, ['id'], ['uri-id' => $parameters['id'], 'uid' => [$uid, 0]]);
+		$item = Post::selectFirstForUser($uid, ['id'], ['uri-id' => static::$parameters['id'], 'uid' => [$uid, 0]]);
 		if (!DBA::isResult($item)) {
 			DI::mstdnError()->RecordNotFound();
 		}
 
 		Item::performActivity($item['id'], 'like', $uid);
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId($parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid)->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/Statuses/FavouritedBy.php b/src/Module/Api/Mastodon/Statuses/FavouritedBy.php
index 67dc4b67fb..5a1a6116a3 100644
--- a/src/Module/Api/Mastodon/Statuses/FavouritedBy.php
+++ b/src/Module/Api/Mastodon/Statuses/FavouritedBy.php
@@ -33,18 +33,17 @@ use Friendica\Protocol\Activity;
 class FavouritedBy extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$id = $parameters['id'];
+		$id = static::$parameters['id'];
 		if (!Post::exists(['uri-id' => $id, 'uid' => [0, $uid]])) {
 			DI::mstdnError()->RecordNotFound();
 		}
diff --git a/src/Module/Api/Mastodon/Statuses/Mute.php b/src/Module/Api/Mastodon/Statuses/Mute.php
index 812daff4d4..f9200197f0 100644
--- a/src/Module/Api/Mastodon/Statuses/Mute.php
+++ b/src/Module/Api/Mastodon/Statuses/Mute.php
@@ -32,16 +32,16 @@ use Friendica\Module\BaseApi;
  */
 class Mute extends BaseApi
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => $parameters['id'], 'uid' => [$uid, 0]]);
+		$item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => static::$parameters['id'], 'uid' => [$uid, 0]]);
 		if (!DBA::isResult($item)) {
 			DI::mstdnError()->RecordNotFound();
 		}
@@ -50,8 +50,8 @@ class Mute extends BaseApi
 			DI::mstdnError()->UnprocessableEntity(DI::l10n()->t('Only starting posts can be muted'));
 		}
 
-		Post\ThreadUser::setIgnored($parameters['id'], $uid, true);
+		Post\ThreadUser::setIgnored(static::$parameters['id'], $uid, true);
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId($parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid)->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/Statuses/Pin.php b/src/Module/Api/Mastodon/Statuses/Pin.php
index 1d5498167e..bf6f5bb399 100644
--- a/src/Module/Api/Mastodon/Statuses/Pin.php
+++ b/src/Module/Api/Mastodon/Statuses/Pin.php
@@ -32,16 +32,16 @@ use Friendica\Module\BaseApi;
  */
 class Pin extends BaseApi
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => $parameters['id'], 'uid' => [$uid, 0]]);
+		$item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => static::$parameters['id'], 'uid' => [$uid, 0]]);
 		if (!DBA::isResult($item)) {
 			DI::mstdnError()->RecordNotFound();
 		}
@@ -50,8 +50,8 @@ class Pin extends BaseApi
 			DI::mstdnError()->UnprocessableEntity(DI::l10n()->t('Only starting posts can be pinned'));
 		}
 
-		Post\ThreadUser::setPinned($parameters['id'], $uid, true);
+		Post\ThreadUser::setPinned(static::$parameters['id'], $uid, true);
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId($parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid)->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/Statuses/Reblog.php b/src/Module/Api/Mastodon/Statuses/Reblog.php
index 1af7efb827..0bba905f76 100644
--- a/src/Module/Api/Mastodon/Statuses/Reblog.php
+++ b/src/Module/Api/Mastodon/Statuses/Reblog.php
@@ -35,16 +35,16 @@ use Friendica\Module\BaseApi;
  */
 class Reblog extends BaseApi
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$item = Post::selectFirstForUser($uid, ['id', 'network'], ['uri-id' => $parameters['id'], 'uid' => [$uid, 0]]);
+		$item = Post::selectFirstForUser($uid, ['id', 'network'], ['uri-id' => static::$parameters['id'], 'uid' => [$uid, 0]]);
 		if (!DBA::isResult($item)) {
 			DI::mstdnError()->RecordNotFound();
 		}
@@ -55,6 +55,6 @@ class Reblog extends BaseApi
 
 		Item::performActivity($item['id'], 'announce', $uid);
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId($parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid)->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/Statuses/RebloggedBy.php b/src/Module/Api/Mastodon/Statuses/RebloggedBy.php
index 11c15b41e1..06431969ad 100644
--- a/src/Module/Api/Mastodon/Statuses/RebloggedBy.php
+++ b/src/Module/Api/Mastodon/Statuses/RebloggedBy.php
@@ -33,18 +33,17 @@ use Friendica\Protocol\Activity;
 class RebloggedBy extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$id = $parameters['id'];
+		$id = static::$parameters['id'];
 		if (!Post::exists(['uri-id' => $id, 'uid' => [0, $uid]])) {
 			DI::mstdnError()->RecordNotFound();
 		}
diff --git a/src/Module/Api/Mastodon/Statuses/Unbookmark.php b/src/Module/Api/Mastodon/Statuses/Unbookmark.php
index f65b07a345..0ddc5891d8 100644
--- a/src/Module/Api/Mastodon/Statuses/Unbookmark.php
+++ b/src/Module/Api/Mastodon/Statuses/Unbookmark.php
@@ -33,16 +33,16 @@ use Friendica\Module\BaseApi;
  */
 class Unbookmark extends BaseApi
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => $parameters['id'], 'uid' => [$uid, 0]]);
+		$item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => static::$parameters['id'], 'uid' => [$uid, 0]]);
 		if (!DBA::isResult($item)) {
 			DI::mstdnError()->RecordNotFound();
 		}
@@ -53,6 +53,6 @@ class Unbookmark extends BaseApi
 
 		Item::update(['starred' => false], ['id' => $item['id']]);
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId($parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid)->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/Statuses/Unfavourite.php b/src/Module/Api/Mastodon/Statuses/Unfavourite.php
index b3fee36822..4d6460d444 100644
--- a/src/Module/Api/Mastodon/Statuses/Unfavourite.php
+++ b/src/Module/Api/Mastodon/Statuses/Unfavourite.php
@@ -33,22 +33,22 @@ use Friendica\Module\BaseApi;
  */
 class Unfavourite extends BaseApi
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$item = Post::selectFirstForUser($uid, ['id'], ['uri-id' => $parameters['id'], 'uid' => [$uid, 0]]);
+		$item = Post::selectFirstForUser($uid, ['id'], ['uri-id' => static::$parameters['id'], 'uid' => [$uid, 0]]);
 		if (!DBA::isResult($item)) {
 			DI::mstdnError()->RecordNotFound();
 		}
 
 		Item::performActivity($item['id'], 'unlike', $uid);
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId($parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid)->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/Statuses/Unmute.php b/src/Module/Api/Mastodon/Statuses/Unmute.php
index ee9b85cc4b..715462880c 100644
--- a/src/Module/Api/Mastodon/Statuses/Unmute.php
+++ b/src/Module/Api/Mastodon/Statuses/Unmute.php
@@ -32,16 +32,16 @@ use Friendica\Module\BaseApi;
  */
 class Unmute extends BaseApi
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => $parameters['id'], 'uid' => [$uid, 0]]);
+		$item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => static::$parameters['id'], 'uid' => [$uid, 0]]);
 		if (!DBA::isResult($item)) {
 			DI::mstdnError()->RecordNotFound();
 		}
@@ -50,8 +50,8 @@ class Unmute extends BaseApi
 			DI::mstdnError()->UnprocessableEntity(DI::l10n()->t('Only starting posts can be unmuted'));
 		}
 
-		Post\ThreadUser::setIgnored($parameters['id'], $uid, false);
+		Post\ThreadUser::setIgnored(static::$parameters['id'], $uid, false);
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId($parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid)->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/Statuses/Unpin.php b/src/Module/Api/Mastodon/Statuses/Unpin.php
index 1f4195cca3..80afaf7015 100644
--- a/src/Module/Api/Mastodon/Statuses/Unpin.php
+++ b/src/Module/Api/Mastodon/Statuses/Unpin.php
@@ -32,16 +32,16 @@ use Friendica\Module\BaseApi;
  */
 class Unpin extends BaseApi
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => $parameters['id'], 'uid' => [$uid, 0]]);
+		$item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => static::$parameters['id'], 'uid' => [$uid, 0]]);
 		if (!DBA::isResult($item)) {
 			DI::mstdnError()->RecordNotFound();
 		}
@@ -50,8 +50,8 @@ class Unpin extends BaseApi
 			DI::mstdnError()->UnprocessableEntity(DI::l10n()->t('Only starting posts can be pinned'));
 		}
 
-		Post\ThreadUser::setPinned($parameters['id'], $uid, false);
+		Post\ThreadUser::setPinned(static::$parameters['id'], $uid, false);
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId($parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid)->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/Statuses/Unreblog.php b/src/Module/Api/Mastodon/Statuses/Unreblog.php
index 9450e0f413..f00d762558 100644
--- a/src/Module/Api/Mastodon/Statuses/Unreblog.php
+++ b/src/Module/Api/Mastodon/Statuses/Unreblog.php
@@ -35,16 +35,16 @@ use Friendica\Module\BaseApi;
  */
 class Unreblog extends BaseApi
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$item = Post::selectFirstForUser($uid, ['id', 'network'], ['uri-id' => $parameters['id'], 'uid' => [$uid, 0]]);
+		$item = Post::selectFirstForUser($uid, ['id', 'network'], ['uri-id' => static::$parameters['id'], 'uid' => [$uid, 0]]);
 		if (!DBA::isResult($item)) {
 			DI::mstdnError()->RecordNotFound();
 		}
@@ -55,6 +55,6 @@ class Unreblog extends BaseApi
 
 		Item::performActivity($item['id'], 'unannounce', $uid);
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId($parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid)->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/Suggestions.php b/src/Module/Api/Mastodon/Suggestions.php
index e0bb75b2de..e7999040ba 100644
--- a/src/Module/Api/Mastodon/Suggestions.php
+++ b/src/Module/Api/Mastodon/Suggestions.php
@@ -32,10 +32,9 @@ use Friendica\Module\BaseApi;
 class Suggestions extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Timelines/Direct.php b/src/Module/Api/Mastodon/Timelines/Direct.php
index 3c3b9c052b..5f8a2e0d74 100644
--- a/src/Module/Api/Mastodon/Timelines/Direct.php
+++ b/src/Module/Api/Mastodon/Timelines/Direct.php
@@ -33,10 +33,9 @@ use Friendica\Network\HTTPException;
 class Direct extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Timelines/Home.php b/src/Module/Api/Mastodon/Timelines/Home.php
index 2b556d7ce7..7b53171e16 100644
--- a/src/Module/Api/Mastodon/Timelines/Home.php
+++ b/src/Module/Api/Mastodon/Timelines/Home.php
@@ -34,10 +34,9 @@ use Friendica\Network\HTTPException;
 class Home extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Timelines/ListTimeline.php b/src/Module/Api/Mastodon/Timelines/ListTimeline.php
index 8d4a432c57..9e32190388 100644
--- a/src/Module/Api/Mastodon/Timelines/ListTimeline.php
+++ b/src/Module/Api/Mastodon/Timelines/ListTimeline.php
@@ -34,15 +34,14 @@ use Friendica\Network\HTTPException;
 class ListTimeline extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
@@ -61,7 +60,7 @@ class ListTimeline extends BaseApi
 		$params = ['order' => ['uri-id' => true], 'limit' => $request['limit']];
 
 		$condition = ["`uid` = ? AND `gravity` IN (?, ?) AND `contact-id` IN (SELECT `contact-id` FROM `group_member` WHERE `gid` = ?)",
-			$uid, GRAVITY_PARENT, GRAVITY_COMMENT, $parameters['id']];
+			$uid, GRAVITY_PARENT, GRAVITY_COMMENT, static::$parameters['id']];
 
 		if (!empty($request['max_id'])) {
 			$condition = DBA::mergeConditions($condition, ["`uri-id` < ?", $request['max_id']]);
diff --git a/src/Module/Api/Mastodon/Timelines/PublicTimeline.php b/src/Module/Api/Mastodon/Timelines/PublicTimeline.php
index ca0141691b..aa55310a7f 100644
--- a/src/Module/Api/Mastodon/Timelines/PublicTimeline.php
+++ b/src/Module/Api/Mastodon/Timelines/PublicTimeline.php
@@ -37,10 +37,9 @@ use Friendica\Network\HTTPException;
 class PublicTimeline extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$uid = self::getCurrentUserID();
 
diff --git a/src/Module/Api/Mastodon/Timelines/Tag.php b/src/Module/Api/Mastodon/Timelines/Tag.php
index 0437be2771..3d87e00948 100644
--- a/src/Module/Api/Mastodon/Timelines/Tag.php
+++ b/src/Module/Api/Mastodon/Timelines/Tag.php
@@ -35,15 +35,14 @@ use Friendica\Network\HTTPException;
 class Tag extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
 
-		if (empty($parameters['hashtag'])) {
+		if (empty(static::$parameters['hashtag'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
@@ -70,7 +69,7 @@ class Tag extends BaseApi
 
 		$condition = ["`name` = ? AND (`uid` = ? OR (`uid` = ? AND NOT `global`))
 			AND (`network` IN (?, ?, ?, ?) OR (`uid` = ? AND `uid` != ?))",
-			$parameters['hashtag'], 0, $uid, Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, $uid, 0];
+			static::$parameters['hashtag'], 0, $uid, Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, $uid, 0];
 
 		if ($request['local']) {
 			$condition = DBA::mergeConditions($condition, ["`uri-id` IN (SELECT `uri-id` FROM `post-user` WHERE `origin`)"]);
diff --git a/src/Module/Api/Mastodon/Trends.php b/src/Module/Api/Mastodon/Trends.php
index 505cdbabd1..c7bfa02891 100644
--- a/src/Module/Api/Mastodon/Trends.php
+++ b/src/Module/Api/Mastodon/Trends.php
@@ -32,10 +32,9 @@ use Friendica\Module\BaseApi;
 class Trends extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$request = self::getRequest([
 			'limit' => 20, // Maximum number of results to return. Defaults to 10.
diff --git a/src/Module/Api/Mastodon/Unimplemented.php b/src/Module/Api/Mastodon/Unimplemented.php
index 6a0a100c31..d346dc7577 100644
--- a/src/Module/Api/Mastodon/Unimplemented.php
+++ b/src/Module/Api/Mastodon/Unimplemented.php
@@ -31,46 +31,41 @@ use Friendica\Module\BaseApi;
 class Unimplemented extends BaseApi
 {
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function delete(array $parameters = [])
+	public static function delete()
 	{
 		DI::apiResponse()->unsupported(Router::DELETE);
 	}
 
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function patch(array $parameters = [])
+	public static function patch()
 	{
 		DI::apiResponse()->unsupported(Router::PATCH);
 	}
 
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		DI::apiResponse()->unsupported(Router::POST);
 	}
 
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function put(array $parameters = [])
+	public static function put()
 	{
 		DI::apiResponse()->unsupported(Router::PUT);
 	}
 
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		DI::apiResponse()->unsupported(Router::GET);
 	}
diff --git a/src/Module/Api/Twitter/Account/RateLimitStatus.php b/src/Module/Api/Twitter/Account/RateLimitStatus.php
index fe422c79f1..8dca51c43e 100644
--- a/src/Module/Api/Twitter/Account/RateLimitStatus.php
+++ b/src/Module/Api/Twitter/Account/RateLimitStatus.php
@@ -30,9 +30,9 @@ use Friendica\Util\DateTimeFormat;
  */
 class RateLimitStatus extends BaseApi
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
-		if (!empty($parameters['extension']) && ($parameters['extension'] == 'xml')) {
+		if (!empty(static::$parameters['extension']) && (static::$parameters['extension'] == 'xml')) {
 			$hash = [
 				'remaining-hits'        => '150',
 				'@attributes'           => ["type" => "integer"],
@@ -52,6 +52,6 @@ class RateLimitStatus extends BaseApi
 			];
 		}
 
-		DI::apiResponse()->exit('hash', ['hash' => $hash], $parameters['extension'] ?? null);
+		DI::apiResponse()->exit('hash', ['hash' => $hash], static::$parameters['extension'] ?? null);
 	}
 }
diff --git a/src/Module/Api/Twitter/ContactEndpoint.php b/src/Module/Api/Twitter/ContactEndpoint.php
index 7e5f11cc65..ddbbfc027a 100644
--- a/src/Module/Api/Twitter/ContactEndpoint.php
+++ b/src/Module/Api/Twitter/ContactEndpoint.php
@@ -35,9 +35,9 @@ abstract class ContactEndpoint extends BaseApi
 	const DEFAULT_COUNT = 20;
 	const MAX_COUNT = 200;
 
-	public static function init(array $parameters = [])
+	public static function init()
 	{
-		parent::init($parameters);
+		parent::init();
 
 		self::checkAllowedScope(self::SCOPE_READ);
 	}
diff --git a/src/Module/Api/Twitter/FollowersIds.php b/src/Module/Api/Twitter/FollowersIds.php
index 01be503de0..0318b5a686 100644
--- a/src/Module/Api/Twitter/FollowersIds.php
+++ b/src/Module/Api/Twitter/FollowersIds.php
@@ -29,7 +29,7 @@ use Friendica\Model\Contact;
  */
 class FollowersIds extends ContactEndpoint
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		// Expected value for user_id parameter: public/user contact id
 		$contact_id    = filter_input(INPUT_GET, 'user_id'      , FILTER_VALIDATE_INT);
diff --git a/src/Module/Api/Twitter/FollowersList.php b/src/Module/Api/Twitter/FollowersList.php
index 8e39f22019..53e56e88ee 100644
--- a/src/Module/Api/Twitter/FollowersList.php
+++ b/src/Module/Api/Twitter/FollowersList.php
@@ -29,7 +29,7 @@ use Friendica\Model\Contact;
  */
 class FollowersList extends ContactEndpoint
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		// Expected value for user_id parameter: public/user contact id
 		$contact_id    = filter_input(INPUT_GET, 'user_id'      , FILTER_VALIDATE_INT);
diff --git a/src/Module/Api/Twitter/FriendsIds.php b/src/Module/Api/Twitter/FriendsIds.php
index 3500a4043b..4df2f7068e 100644
--- a/src/Module/Api/Twitter/FriendsIds.php
+++ b/src/Module/Api/Twitter/FriendsIds.php
@@ -29,7 +29,7 @@ use Friendica\Model\Contact;
  */
 class FriendsIds extends ContactEndpoint
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		// Expected value for user_id parameter: public/user contact id
 		$contact_id    = filter_input(INPUT_GET, 'user_id'      , FILTER_VALIDATE_INT);
diff --git a/src/Module/Api/Twitter/FriendsList.php b/src/Module/Api/Twitter/FriendsList.php
index 114e391cc3..59ae03601b 100644
--- a/src/Module/Api/Twitter/FriendsList.php
+++ b/src/Module/Api/Twitter/FriendsList.php
@@ -29,7 +29,7 @@ use Friendica\Model\Contact;
  */
 class FriendsList extends ContactEndpoint
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		// Expected value for user_id parameter: public/user contact id
 		$contact_id    = filter_input(INPUT_GET, 'user_id'      , FILTER_VALIDATE_INT);
diff --git a/src/Module/Api/Twitter/SavedSearches.php b/src/Module/Api/Twitter/SavedSearches.php
index b2e2c5f0d6..d978af807f 100644
--- a/src/Module/Api/Twitter/SavedSearches.php
+++ b/src/Module/Api/Twitter/SavedSearches.php
@@ -31,7 +31,7 @@ use Friendica\Module\BaseApi;
  */
 class SavedSearches extends BaseApi
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
@@ -45,6 +45,6 @@ class SavedSearches extends BaseApi
 
 		DBA::close($terms);
 
-		DI::apiResponse()->exit('terms', ['terms' => $result], $parameters['extension'] ?? null);
+		DI::apiResponse()->exit('terms', ['terms' => $result], static::$parameters['extension'] ?? null);
 	}
 }
diff --git a/src/Module/Apps.php b/src/Module/Apps.php
index 46dfe41c95..dc3d1d10d7 100644
--- a/src/Module/Apps.php
+++ b/src/Module/Apps.php
@@ -31,7 +31,7 @@ use Friendica\DI;
  */
 class Apps extends BaseModule
 {
-	public static function init(array $parameters = [])
+	public static function init()
 	{
 		$privateaddons = DI::config()->get('config', 'private_addons');
 		if ($privateaddons === "1" && !local_user()) {
@@ -39,7 +39,7 @@ class Apps extends BaseModule
 		}
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		$apps = Nav::getAppMenu();
 
diff --git a/src/Module/Attach.php b/src/Module/Attach.php
index a4bb9b4221..4f9da85c92 100644
--- a/src/Module/Attach.php
+++ b/src/Module/Attach.php
@@ -34,14 +34,14 @@ class Attach extends BaseModule
 	/**
 	 * Return to user an attached file given the id
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$a = DI::app();
-		if (empty($parameters['item'])) {
+		if (empty(static::$parameters['item'])) {
 			throw new \Friendica\Network\HTTPException\BadRequestException();
 		}
 
-		$item_id = intval($parameters['item']);
+		$item_id = intval(static::$parameters['item']);
 
 		// Check for existence
 		$item = MAttach::exists(['id' => $item_id]);
diff --git a/src/Module/BaseAdmin.php b/src/Module/BaseAdmin.php
index 69c2879de6..822b6bdf5c 100644
--- a/src/Module/BaseAdmin.php
+++ b/src/Module/BaseAdmin.php
@@ -68,7 +68,7 @@ abstract class BaseAdmin extends BaseModule
 		}
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		self::checkAdminAccess(true);
 
diff --git a/src/Module/BaseApi.php b/src/Module/BaseApi.php
index a0a94c336f..b42e9462dc 100644
--- a/src/Module/BaseApi.php
+++ b/src/Module/BaseApi.php
@@ -53,7 +53,7 @@ class BaseApi extends BaseModule
 	 */
 	protected static $request = [];
 
-	public static function delete(array $parameters = [])
+	public static function delete()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 
@@ -62,7 +62,7 @@ class BaseApi extends BaseModule
 		}
 	}
 
-	public static function patch(array $parameters = [])
+	public static function patch()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 
@@ -71,7 +71,7 @@ class BaseApi extends BaseModule
 		}
 	}
 
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 
@@ -80,7 +80,7 @@ class BaseApi extends BaseModule
 		}
 	}
 
-	public static function put(array $parameters = [])
+	public static function put()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 
@@ -139,7 +139,6 @@ class BaseApi extends BaseModule
 	 * Set boundaries for the "link" header
 	 * @param array $boundaries
 	 * @param int $id
-	 * @return array
 	 */
 	protected static function setBoundaries(int $id)
 	{
diff --git a/src/Module/BaseNotifications.php b/src/Module/BaseNotifications.php
index e7f9bdabe3..3987c90567 100644
--- a/src/Module/BaseNotifications.php
+++ b/src/Module/BaseNotifications.php
@@ -82,7 +82,7 @@ abstract class BaseNotifications extends BaseModule
 	 */
 	abstract public static function getNotifications();
 
-	public static function init(array $parameters = [])
+	public static function init()
 	{
 		if (!local_user()) {
 			throw new ForbiddenException(DI::l10n()->t('Permission denied.'));
@@ -94,7 +94,7 @@ abstract class BaseNotifications extends BaseModule
 		self::$showAll      = ($_REQUEST['show'] ?? '') === 'all';
 	}
 
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		// If the last argument of the query is NOT json, return
 		if (DI::args()->get(DI::args()->getArgc() - 1) !== 'json') {
diff --git a/src/Module/BaseSettings.php b/src/Module/BaseSettings.php
index c2516e134c..1a20fc3dc9 100644
--- a/src/Module/BaseSettings.php
+++ b/src/Module/BaseSettings.php
@@ -28,7 +28,7 @@ use Friendica\DI;
 
 class BaseSettings extends BaseModule
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		$a = DI::app();
 
diff --git a/src/Module/Bookmarklet.php b/src/Module/Bookmarklet.php
index 3551cfd175..408fb50b25 100644
--- a/src/Module/Bookmarklet.php
+++ b/src/Module/Bookmarklet.php
@@ -34,7 +34,7 @@ use Friendica\Util\Strings;
  */
 class Bookmarklet extends BaseModule
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		$_GET['mode'] = 'minimal';
 
diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 4f13b28433..d80abe4702 100644
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -96,7 +96,7 @@ class Contact extends BaseModule
 		DI::baseUrl()->redirect($redirectUrl);
 	}
 
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		if (!local_user()) {
 			return;
@@ -226,7 +226,7 @@ class Contact extends BaseModule
 		Model\Contact\User::setIgnored($contact_id, local_user(), $ignored);
 	}
 
-	public static function content(array $parameters = [], $update = 0)
+	public static function content($update = 0)
 	{
 		if (!local_user()) {
 			return Login::form($_SERVER['REQUEST_URI']);
diff --git a/src/Module/Contact/Advanced.php b/src/Module/Contact/Advanced.php
index 29de7bd6fe..521e4f469f 100644
--- a/src/Module/Contact/Advanced.php
+++ b/src/Module/Contact/Advanced.php
@@ -38,16 +38,16 @@ use Friendica\Util\Strings;
  */
 class Advanced extends BaseModule
 {
-	public static function init(array $parameters = [])
+	public static function init()
 	{
 		if (!Session::isAuthenticated()) {
 			throw new ForbiddenException(DI::l10n()->t('Permission denied.'));
 		}
 	}
 
-	public static function post(array $parameters = [])
+	public static function post()
 	{
-		$cid = $parameters['id'];
+		$cid = static::$parameters['id'];
 
 		$contact = Model\Contact::selectFirst([], ['id' => $cid, 'uid' => local_user()]);
 		if (empty($contact)) {
@@ -96,9 +96,9 @@ class Advanced extends BaseModule
 		return;
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		$cid = $parameters['id'];
+		$cid = static::$parameters['id'];
 
 		$contact = Model\Contact::selectFirst([], ['id' => $cid, 'uid' => local_user()]);
 		if (empty($contact)) {
diff --git a/src/Module/Contact/Contacts.php b/src/Module/Contact/Contacts.php
index b75dea43db..1e3e582c0e 100644
--- a/src/Module/Contact/Contacts.php
+++ b/src/Module/Contact/Contacts.php
@@ -14,7 +14,7 @@ use Friendica\Network\HTTPException;
 
 class Contacts extends BaseModule
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		$app = DI::app();
 
@@ -22,8 +22,8 @@ class Contacts extends BaseModule
 			throw new HTTPException\ForbiddenException();
 		}
 
-		$cid = $parameters['id'];
-		$type = $parameters['type'] ?? 'all';
+		$cid = static::$parameters['id'];
+		$type = static::$parameters['type'] ?? 'all';
 		$accounttype = $_GET['accounttype'] ?? '';
 		$accounttypeid = User::getAccountTypeByString($accounttype);
 
diff --git a/src/Module/Contact/Hovercard.php b/src/Module/Contact/Hovercard.php
index 57d4ac6ab6..2de1a0f8ae 100644
--- a/src/Module/Contact/Hovercard.php
+++ b/src/Module/Contact/Hovercard.php
@@ -35,7 +35,7 @@ use Friendica\Util\Strings;
  */
 class Hovercard extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$contact_url = $_REQUEST['url'] ?? '';
 
diff --git a/src/Module/Contact/Media.php b/src/Module/Contact/Media.php
index 956c33ac8d..d854aa9d63 100644
--- a/src/Module/Contact/Media.php
+++ b/src/Module/Contact/Media.php
@@ -34,9 +34,9 @@ use Friendica\Network\HTTPException\BadRequestException;
  */
 class Media extends BaseModule
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		$cid = $parameters['id'];
+		$cid = static::$parameters['id'];
 
 		$contact = Model\Contact::selectFirst([], ['id' => $cid]);
 		if (empty($contact)) {
diff --git a/src/Module/Contact/Poke.php b/src/Module/Contact/Poke.php
index d9dd7e27aa..7f3e596db7 100644
--- a/src/Module/Contact/Poke.php
+++ b/src/Module/Contact/Poke.php
@@ -18,9 +18,9 @@ use Friendica\Util\XML;
 
 class Poke extends BaseModule
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
-		if (!local_user() || empty($parameters['id'])) {
+		if (!local_user() || empty(static::$parameters['id'])) {
 			return self::postReturn(false);
 		}
 
@@ -39,14 +39,14 @@ class Poke extends BaseModule
 
 		$activity = Activity::POKE . '#' . urlencode($verbs[$verb][0]);
 
-		$contact_id = intval($parameters['id']);
+		$contact_id = intval(static::$parameters['id']);
 		if (!$contact_id) {
 			return self::postReturn(false);
 		}
 
 		Logger::info('verb ' . $verb . ' contact ' . $contact_id);
 
-		$contact = DBA::selectFirst('contact', ['id', 'name', 'url', 'photo'], ['id' => $parameters['id'], 'uid' => local_user()]);
+		$contact = DBA::selectFirst('contact', ['id', 'name', 'url', 'photo'], ['id' => static::$parameters['id'], 'uid' => local_user()]);
 		if (!DBA::isResult($contact)) {
 			return self::postReturn(false);
 		}
@@ -123,17 +123,17 @@ class Poke extends BaseModule
 		return $success;
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		if (!local_user()) {
 			throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this module.'));
 		}
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			throw new HTTPException\BadRequestException();
 		}
 
-		$contact = DBA::selectFirst('contact', ['id', 'url', 'name'], ['id' => $parameters['id'], 'uid' => local_user()]);
+		$contact = DBA::selectFirst('contact', ['id', 'url', 'name'], ['id' => static::$parameters['id'], 'uid' => local_user()]);
 		if (!DBA::isResult($contact)) {
 			throw new HTTPException\NotFoundException();
 		}
diff --git a/src/Module/Contact/Revoke.php b/src/Module/Contact/Revoke.php
index e9b5a44243..5730d569a3 100644
--- a/src/Module/Contact/Revoke.php
+++ b/src/Module/Contact/Revoke.php
@@ -37,13 +37,13 @@ class Revoke extends BaseModule
 	/** @var array */
 	private static $contact;
 
-	public static function init(array $parameters = [])
+	public static function init()
 	{
 		if (!local_user()) {
 			return;
 		}
 
-		$data = Model\Contact::getPublicAndUserContactID($parameters['id'], local_user());
+		$data = Model\Contact::getPublicAndUserContactID(static::$parameters['id'], local_user());
 		if (!DBA::isResult($data)) {
 			throw new HTTPException\NotFoundException(DI::l10n()->t('Unknown contact.'));
 		}
@@ -63,13 +63,13 @@ class Revoke extends BaseModule
 		}
 	}
 
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		if (!local_user()) {
 			throw new HTTPException\UnauthorizedException();
 		}
 
-		self::checkFormSecurityTokenRedirectOnError('contact/' . $parameters['id'], 'contact_revoke');
+		self::checkFormSecurityTokenRedirectOnError('contact/' . static::$parameters['id'], 'contact_revoke');
 
 		$result = Model\Contact::revokeFollow(self::$contact);
 		if ($result === true) {
@@ -80,10 +80,10 @@ class Revoke extends BaseModule
 			notice(DI::l10n()->t('Unable to revoke follow, please try again later or contact the administrator.'));
 		}
 
-		DI::baseUrl()->redirect('contact/' . $parameters['id']);
+		DI::baseUrl()->redirect('contact/' . static::$parameters['id']);
 	}
 
-	public static function content(array $parameters = []): string
+	public static function content(): string
 	{
 		if (!local_user()) {
 			return Login::form($_SERVER['REQUEST_URI']);
diff --git a/src/Module/Conversation/Community.php b/src/Module/Conversation/Community.php
index 3a30f37995..9a6e0709f1 100644
--- a/src/Module/Conversation/Community.php
+++ b/src/Module/Conversation/Community.php
@@ -49,9 +49,9 @@ class Community extends BaseModule
 	protected static $max_id;
 	protected static $item_id;
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		self::parseRequest($parameters);
+		self::parseRequest();
 
 		if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) {
 			$tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl');
@@ -94,8 +94,8 @@ class Community extends BaseModule
 	
 			if (local_user() && DI::config()->get('system', 'community_no_sharer')) {
 				$path = self::$content;
-				if (!empty($parameters['accounttype'])) {
-					$path .= '/' . $parameters['accounttype'];
+				if (!empty(static::$parameters['accounttype'])) {
+					$path .= '/' . static::$parameters['accounttype'];
 				}
 				$query_parameters = [];
 		
@@ -166,11 +166,10 @@ class Community extends BaseModule
 	/**
 	 * Computes module parameters from the request and local configuration
 	 *
-	 * @param array $parameters
 	 * @throws HTTPException\BadRequestException
 	 * @throws HTTPException\ForbiddenException
 	 */
-	protected static function parseRequest(array $parameters)
+	protected static function parseRequest()
 	{
 		if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Public access denied.'));
@@ -182,10 +181,10 @@ class Community extends BaseModule
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Access denied.'));
 		}
 
-		self::$accountTypeString = $_GET['accounttype'] ?? $parameters['accounttype'] ?? '';
+		self::$accountTypeString = $_GET['accounttype'] ?? static::$parameters['accounttype'] ?? '';
 		self::$accountType = User::getAccountTypeByString(self::$accountTypeString);
 
-		self::$content = $parameters['content'] ?? '';
+		self::$content = static::$parameters['content'] ?? '';
 		if (!self::$content) {
 			if (!empty(DI::config()->get('system', 'singleuser'))) {
 				// On single user systems only the global page does make sense
diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php
index f2dc1fae1c..87bce10307 100644
--- a/src/Module/Conversation/Network.php
+++ b/src/Module/Conversation/Network.php
@@ -57,13 +57,13 @@ class Network extends BaseModule
 	/** @var string */
 	protected static $order;
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		if (!local_user()) {
 			return Login::form();
 		}
 
-		self::parseRequest($parameters, $_GET);
+		self::parseRequest($_GET);
 
 		$module = 'network';
 
@@ -272,11 +272,11 @@ class Network extends BaseModule
 		return Renderer::replaceMacros($tpl, ['$tabs' => $arr['tabs']]);
 	}
 
-	protected static function parseRequest(array $parameters, array $get)
+	protected static function parseRequest(array $get)
 	{
-		self::$groupId = $parameters['group_id'] ?? 0;
+		self::$groupId = static::$parameters['group_id'] ?? 0;
 
-		self::$forumContactId = $parameters['contact_id'] ?? 0;
+		self::$forumContactId = static::$parameters['contact_id'] ?? 0;
 
 		self::$selectedTab = Session::get('network-tab', DI::pConfig()->get(local_user(), 'network.view', 'selected_tab', ''));
 
@@ -317,13 +317,13 @@ class Network extends BaseModule
 		Session::set('network-tab', self::$selectedTab);
 		DI::pConfig()->set(local_user(), 'network.view', 'selected_tab', self::$selectedTab);
 
-		self::$accountTypeString = $get['accounttype'] ?? $parameters['accounttype'] ?? '';
+		self::$accountTypeString = $get['accounttype'] ?? static::$parameters['accounttype'] ?? '';
 		self::$accountType = User::getAccountTypeByString(self::$accountTypeString);
 
 		self::$network = $get['nets'] ?? '';
 
-		self::$dateFrom = $parameters['from'] ?? '';
-		self::$dateTo = $parameters['to'] ?? '';
+		self::$dateFrom = static::$parameters['from'] ?? '';
+		self::$dateTo = static::$parameters['to'] ?? '';
 
 		if (DI::mode()->isMobile()) {
 			self::$itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network',
diff --git a/src/Module/Credits.php b/src/Module/Credits.php
index 1a586a808d..cf3a4ca342 100644
--- a/src/Module/Credits.php
+++ b/src/Module/Credits.php
@@ -32,7 +32,7 @@ use Friendica\DI;
  */
 class Credits extends BaseModule
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		/* fill the page with credits */
 		$credits_string = file_get_contents('CREDITS.txt');
diff --git a/src/Module/DFRN/Notify.php b/src/Module/DFRN/Notify.php
index 6aeb23417e..a02913adad 100644
--- a/src/Module/DFRN/Notify.php
+++ b/src/Module/DFRN/Notify.php
@@ -38,7 +38,7 @@ use Friendica\Network\HTTPException;
  */
 class Notify extends BaseModule
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		$postdata = Network::postdata();
 
@@ -47,8 +47,8 @@ class Notify extends BaseModule
 		}
 
 		$data = json_decode($postdata);
-		if (is_object($data) && !empty($parameters['nickname'])) {
-			$user = User::getByNickname($parameters['nickname']);
+		if (is_object($data) && !empty(static::$parameters['nickname'])) {
+			$user = User::getByNickname(static::$parameters['nickname']);
 			if (empty($user)) {
 				throw new \Friendica\Network\HTTPException\InternalServerErrorException();
 			}
diff --git a/src/Module/DFRN/Poll.php b/src/Module/DFRN/Poll.php
index d9c7884ec0..9a2ab4b69f 100644
--- a/src/Module/DFRN/Poll.php
+++ b/src/Module/DFRN/Poll.php
@@ -29,11 +29,11 @@ use Friendica\Protocol\OStatus;
  */
 class Poll extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		header("Content-type: application/atom+xml");
 		$last_update = $_GET['last_update'] ?? '';
-		echo OStatus::feed($parameters['nickname'], $last_update, 10);
+		echo OStatus::feed(static::$parameters['nickname'], $last_update, 10);
 		exit();
 	}
 }
diff --git a/src/Module/Debug/ActivityPubConversion.php b/src/Module/Debug/ActivityPubConversion.php
index 854f557d0c..2a06a672c9 100644
--- a/src/Module/Debug/ActivityPubConversion.php
+++ b/src/Module/Debug/ActivityPubConversion.php
@@ -34,7 +34,7 @@ use Friendica\Util\XML;
 
 class ActivityPubConversion extends BaseModule
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		function visible_whitespace($s)
 		{
diff --git a/src/Module/Debug/Babel.php b/src/Module/Debug/Babel.php
index ff8bc87411..4901684b6a 100644
--- a/src/Module/Debug/Babel.php
+++ b/src/Module/Debug/Babel.php
@@ -35,7 +35,7 @@ use Friendica\Util\XML;
  */
 class Babel extends BaseModule
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		function visible_whitespace($s)
 		{
diff --git a/src/Module/Debug/Feed.php b/src/Module/Debug/Feed.php
index 5ef6816682..0c0c0ded4d 100644
--- a/src/Module/Debug/Feed.php
+++ b/src/Module/Debug/Feed.php
@@ -32,7 +32,7 @@ use Friendica\Protocol;
  */
 class Feed extends BaseModule
 {
-	public static function init(array $parameters = [])
+	public static function init()
 	{
 		if (!local_user()) {
 			notice(DI::l10n()->t('You must be logged in to use this module'));
@@ -40,7 +40,7 @@ class Feed extends BaseModule
 		}
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		$result = [];
 		if (!empty($_REQUEST['url'])) {
diff --git a/src/Module/Debug/ItemBody.php b/src/Module/Debug/ItemBody.php
index 2299b3cb21..7030896468 100644
--- a/src/Module/Debug/ItemBody.php
+++ b/src/Module/Debug/ItemBody.php
@@ -31,17 +31,17 @@ use Friendica\Network\HTTPException;
  */
 class ItemBody extends BaseModule
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		if (!local_user()) {
 			throw new HTTPException\UnauthorizedException(DI::l10n()->t('Access denied.'));
 		}
 
-		if (empty($parameters['item'])) {
+		if (empty(static::$parameters['item'])) {
 			throw new HTTPException\NotFoundException(DI::l10n()->t('Item not found.'));
 		}
 
-		$itemId = intval($parameters['item']);
+		$itemId = intval(static::$parameters['item']);
 
 		$item = Post::selectFirst(['body'], ['uid' => [0, local_user()], 'uri-id' => $itemId]);
 
diff --git a/src/Module/Debug/Localtime.php b/src/Module/Debug/Localtime.php
index ff1466408e..2d784765dd 100644
--- a/src/Module/Debug/Localtime.php
+++ b/src/Module/Debug/Localtime.php
@@ -31,7 +31,7 @@ class Localtime extends BaseModule
 {
 	static $mod_localtime = '';
 
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		$time = ($_REQUEST['time'] ?? '') ?: 'now';
 
@@ -42,7 +42,7 @@ class Localtime extends BaseModule
 		}
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		$time = ($_REQUEST['time'] ?? '') ?: 'now';
 
diff --git a/src/Module/Debug/Probe.php b/src/Module/Debug/Probe.php
index 304096b2ec..24c8d745c5 100644
--- a/src/Module/Debug/Probe.php
+++ b/src/Module/Debug/Probe.php
@@ -32,7 +32,7 @@ use Friendica\Network\Probe as NetworkProbe;
  */
 class Probe extends BaseModule
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		if (!local_user()) {
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Only logged in users are permitted to perform a probing.'));
diff --git a/src/Module/Debug/WebFinger.php b/src/Module/Debug/WebFinger.php
index e8a619f0b9..f95d7a2b96 100644
--- a/src/Module/Debug/WebFinger.php
+++ b/src/Module/Debug/WebFinger.php
@@ -31,7 +31,7 @@ use Friendica\Network\Probe;
  */
 class WebFinger extends BaseModule
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		if (!local_user()) {
 			throw new \Friendica\Network\HTTPException\ForbiddenException(DI::l10n()->t('Only logged in users are permitted to perform a probing.'));
diff --git a/src/Module/Delegation.php b/src/Module/Delegation.php
index 12f8c5074c..b4845764c3 100644
--- a/src/Module/Delegation.php
+++ b/src/Module/Delegation.php
@@ -37,7 +37,7 @@ use Friendica\Util\Proxy;
  */
 class Delegation extends BaseModule
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		if (!local_user()) {
 			return;
@@ -112,7 +112,7 @@ class Delegation extends BaseModule
 		// NOTREACHED
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		if (!local_user()) {
 			throw new ForbiddenException(DI::l10n()->t('Permission denied.'));
diff --git a/src/Module/Diaspora/Fetch.php b/src/Module/Diaspora/Fetch.php
index 55eeea9b55..dc3e76b010 100644
--- a/src/Module/Diaspora/Fetch.php
+++ b/src/Module/Diaspora/Fetch.php
@@ -38,13 +38,13 @@ use Friendica\Util\Strings;
  */
 class Fetch extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
-		if (empty($parameters['guid'])) {
+		if (empty(static::$parameters['guid'])) {
 			throw new HTTPException\NotFoundException();
 		}
 
-		$guid = $parameters['guid'];
+		$guid = static::$parameters['guid'];
 
 		// Fetch the item
 		$condition = ['origin' => true, 'private' => [Item::PUBLIC, Item::UNLISTED], 'guid' => $guid,
diff --git a/src/Module/Diaspora/Receive.php b/src/Module/Diaspora/Receive.php
index dc6fb716b7..2fde1fe3f2 100644
--- a/src/Module/Diaspora/Receive.php
+++ b/src/Module/Diaspora/Receive.php
@@ -38,12 +38,12 @@ class Receive extends BaseModule
 	/** @var LoggerInterface */
 	private static $logger;
 
-	public static function init(array $parameters = [])
+	public static function init()
 	{
 		self::$logger = DI::logger();
 	}
 
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		$enabled = DI::config()->get('system', 'diaspora_enabled', false);
 		if (!$enabled) {
@@ -51,10 +51,10 @@ class Receive extends BaseModule
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Access denied.'));
 		}
 
-		if ($parameters['type'] === 'public') {
+		if (static::$parameters['type'] === 'public') {
 			self::receivePublic();
-		} else if ($parameters['type'] === 'users') {
-			self::receiveUser($parameters['guid']);
+		} else if (static::$parameters['type'] === 'users') {
+			self::receiveUser(static::$parameters['guid']);
 		}
 	}
 
diff --git a/src/Module/Directory.php b/src/Module/Directory.php
index 0172612d51..799b18ea10 100644
--- a/src/Module/Directory.php
+++ b/src/Module/Directory.php
@@ -38,7 +38,7 @@ use Friendica\Network\HTTPException;
  */
 class Directory extends BaseModule
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		$app = DI::app();
 		$config = DI::config();
diff --git a/src/Module/Events/Json.php b/src/Module/Events/Json.php
index 50e468a9c7..befd8d7aae 100644
--- a/src/Module/Events/Json.php
+++ b/src/Module/Events/Json.php
@@ -13,7 +13,7 @@ use Friendica\Util\Temporal;
 
 class Json extends \Friendica\BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		if (!local_user()) {
 			throw new HTTPException\UnauthorizedException();
diff --git a/src/Module/Feed.php b/src/Module/Feed.php
index 788f9da7c2..0eca46b1ab 100644
--- a/src/Module/Feed.php
+++ b/src/Module/Feed.php
@@ -41,7 +41,7 @@ use Friendica\Protocol\Feed as ProtocolFeed;
  */
 class Feed extends BaseModule
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		$a = DI::app();
 
@@ -68,7 +68,7 @@ class Feed extends BaseModule
 		}
 
 		header("Content-type: application/atom+xml; charset=utf-8");
-		echo ProtocolFeed::atom($parameters['nickname'], $last_update, 10, $type, $nocache, true);
+		echo ProtocolFeed::atom(static::$parameters['nickname'], $last_update, 10, $type, $nocache, true);
 		exit();
 	}
 }
diff --git a/src/Module/Filer/RemoveTag.php b/src/Module/Filer/RemoveTag.php
index 8c65f43814..e52db81c12 100644
--- a/src/Module/Filer/RemoveTag.php
+++ b/src/Module/Filer/RemoveTag.php
@@ -33,7 +33,7 @@ use Friendica\Util\XML;
  */
 class RemoveTag extends BaseModule
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		if (!local_user()) {
 			throw new HTTPException\ForbiddenException();
@@ -41,7 +41,7 @@ class RemoveTag extends BaseModule
 
 		$logger = DI::logger();
 
-		$item_id = $parameters['id'] ?? 0;
+		$item_id = static::$parameters['id'] ?? 0;
 
 		$term = XML::unescape(trim($_GET['term'] ?? ''));
 		$cat = XML::unescape(trim($_GET['cat'] ?? ''));
diff --git a/src/Module/Filer/SaveTag.php b/src/Module/Filer/SaveTag.php
index 50f6c2e9b1..363e51c210 100644
--- a/src/Module/Filer/SaveTag.php
+++ b/src/Module/Filer/SaveTag.php
@@ -34,7 +34,7 @@ use Friendica\Util\XML;
  */
 class SaveTag extends BaseModule
 {
-	public static function init(array $parameters = [])
+	public static function init()
 	{
 		if (!local_user()) {
 			notice(DI::l10n()->t('You must be logged in to use this module'));
@@ -42,13 +42,13 @@ class SaveTag extends BaseModule
 		}
 	}
 
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$logger = DI::logger();
 
 		$term = XML::unescape(trim($_GET['term'] ?? ''));
 
-		$item_id = $parameters['id'] ?? 0;
+		$item_id = static::$parameters['id'] ?? 0;
 
 		$logger->info('filer', ['tag' => $term, 'item' => $item_id]);
 
diff --git a/src/Module/FollowConfirm.php b/src/Module/FollowConfirm.php
index 75153512b6..6e6b4da1df 100644
--- a/src/Module/FollowConfirm.php
+++ b/src/Module/FollowConfirm.php
@@ -10,7 +10,7 @@ use Friendica\Model\Contact;
  */
 class FollowConfirm extends BaseModule
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		$uid = local_user();
 		if (!$uid) {
diff --git a/src/Module/FriendSuggest.php b/src/Module/FriendSuggest.php
index 78e75bc314..3256a04c2b 100644
--- a/src/Module/FriendSuggest.php
+++ b/src/Module/FriendSuggest.php
@@ -38,16 +38,16 @@ use Friendica\Worker\Delivery;
  */
 class FriendSuggest extends BaseModule
 {
-	public static function init(array $parameters = [])
+	public static function init()
 	{
 		if (!local_user()) {
 			throw new ForbiddenException(DI::l10n()->t('Permission denied.'));
 		}
 	}
 
-	public static function post(array $parameters = [])
+	public static function post()
 	{
-		$cid = intval($parameters['contact']);
+		$cid = intval(static::$parameters['contact']);
 
 		// We do query the "uid" as well to ensure that it is our contact
 		if (!DI::dba()->exists('contact', ['id' => $cid, 'uid' => local_user()])) {
@@ -83,9 +83,9 @@ class FriendSuggest extends BaseModule
 		info(DI::l10n()->t('Friend suggestion sent.'));
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		$cid = intval($parameters['contact']);
+		$cid = intval(static::$parameters['contact']);
 
 		$contact = DI::dba()->selectFirst('contact', [], ['id' => $cid, 'uid' => local_user()]);
 		if (empty($contact)) {
diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php
index 95a319a41a..082c5c0812 100644
--- a/src/Module/Friendica.php
+++ b/src/Module/Friendica.php
@@ -38,7 +38,7 @@ use Friendica\Protocol\ActivityPub;
  */
 class Friendica extends BaseModule
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		$config = DI::config();
 
@@ -110,7 +110,7 @@ class Friendica extends BaseModule
 		]);
 	}
 
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		if (ActivityPub::isRequest()) {
 			try {
diff --git a/src/Module/Group.php b/src/Module/Group.php
index ee6c7b8c27..69baef9f4d 100644
--- a/src/Module/Group.php
+++ b/src/Module/Group.php
@@ -32,7 +32,7 @@ require_once 'boot.php';
 
 class Group extends BaseModule
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		$a = DI::app();
 
@@ -138,7 +138,7 @@ class Group extends BaseModule
 		}
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		$change = false;
 
diff --git a/src/Module/HCard.php b/src/Module/HCard.php
index 079f240ae4..269deff068 100644
--- a/src/Module/HCard.php
+++ b/src/Module/HCard.php
@@ -34,14 +34,14 @@ use Friendica\Network\HTTPException;
  */
 class HCard extends BaseModule
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		if ((local_user()) && ($parameters['action'] ?? '') === 'view') {
+		if ((local_user()) && (static::$parameters['action'] ?? '') === 'view') {
 			// A logged in user views a profile of a user
 			$nickname = DI::app()->getLoggedInUserNickname();
-		} elseif (empty($parameters['action'])) {
+		} elseif (empty(static::$parameters['action'])) {
 			// Show the profile hCard
-			$nickname = $parameters['profile'];
+			$nickname = static::$parameters['profile'];
 		} else {
 			throw new HTTPException\NotFoundException(DI::l10n()->t('No profile'));
 		}
diff --git a/src/Module/HTTPException/MethodNotAllowed.php b/src/Module/HTTPException/MethodNotAllowed.php
index f100bba492..8745832468 100644
--- a/src/Module/HTTPException/MethodNotAllowed.php
+++ b/src/Module/HTTPException/MethodNotAllowed.php
@@ -27,7 +27,7 @@ use Friendica\Network\HTTPException;
 
 class MethodNotAllowed extends BaseModule
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		throw new HTTPException\MethodNotAllowedException(DI::l10n()->t('Method Not Allowed.'));
 	}
diff --git a/src/Module/HTTPException/PageNotFound.php b/src/Module/HTTPException/PageNotFound.php
index 746773ef12..5ba5466241 100644
--- a/src/Module/HTTPException/PageNotFound.php
+++ b/src/Module/HTTPException/PageNotFound.php
@@ -27,7 +27,7 @@ use Friendica\Network\HTTPException;
 
 class PageNotFound extends BaseModule
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		throw new HTTPException\NotFoundException(DI::l10n()->t('Page not found.'));
 	}
diff --git a/src/Module/Hashtag.php b/src/Module/Hashtag.php
index cdf0de6c16..aebe15dd0d 100644
--- a/src/Module/Hashtag.php
+++ b/src/Module/Hashtag.php
@@ -31,7 +31,7 @@ use Friendica\Util\Strings;
  */
 class Hashtag extends BaseModule
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		$result = [];
 
diff --git a/src/Module/Help.php b/src/Module/Help.php
index 219adc7973..5440fd97d8 100644
--- a/src/Module/Help.php
+++ b/src/Module/Help.php
@@ -32,7 +32,7 @@ use Friendica\Network\HTTPException;
  */
 class Help extends BaseModule
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		Nav::setSelected('help');
 
diff --git a/src/Module/Home.php b/src/Module/Home.php
index 9d16e11aa7..719d874522 100644
--- a/src/Module/Home.php
+++ b/src/Module/Home.php
@@ -32,7 +32,7 @@ use Friendica\Module\Security\Login;
  */
 class Home extends BaseModule
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		$app = DI::app();
 		$config = DI::config();
diff --git a/src/Module/Install.php b/src/Module/Install.php
index 8b6f97f984..72b83ebffd 100644
--- a/src/Module/Install.php
+++ b/src/Module/Install.php
@@ -65,7 +65,7 @@ class Install extends BaseModule
 	 */
 	private static $installer;
 
-	public static function init(array $parameters = [])
+	public static function init()
 	{
 		$a = DI::app();
 
@@ -94,7 +94,7 @@ class Install extends BaseModule
 		self::$currentWizardStep = ($_POST['pass'] ?? '') ?: self::SYSTEM_CHECK;
 	}
 
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		$a           = DI::app();
 		$configCache = $a->getConfigCache();
@@ -177,7 +177,7 @@ class Install extends BaseModule
 		}
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		$a           = DI::app();
 		$configCache = $a->getConfigCache();
diff --git a/src/Module/Invite.php b/src/Module/Invite.php
index 65438c1514..3c82a26c14 100644
--- a/src/Module/Invite.php
+++ b/src/Module/Invite.php
@@ -35,7 +35,7 @@ use Friendica\Util\Strings;
  */
 class Invite extends BaseModule
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		if (!local_user()) {
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
@@ -124,7 +124,7 @@ class Invite extends BaseModule
 		info(DI::l10n()->tt('%d message sent.', '%d messages sent.', $total));
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		if (!local_user()) {
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
diff --git a/src/Module/Item/Activity.php b/src/Module/Item/Activity.php
index 1d44bf9957..6006be9c7d 100644
--- a/src/Module/Item/Activity.php
+++ b/src/Module/Item/Activity.php
@@ -38,18 +38,18 @@ use Friendica\Network\HTTPException;
  */
 class Activity extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		if (!Session::isAuthenticated()) {
 			throw new HTTPException\ForbiddenException();
 		}
 
-		if (empty($parameters['id']) || empty($parameters['verb'])) {
+		if (empty(static::$parameters['id']) || empty(static::$parameters['verb'])) {
 			throw new HTTPException\BadRequestException();
 		}
 
-		$verb = $parameters['verb'];
-		$itemId =  $parameters['id'];
+		$verb = static::$parameters['verb'];
+		$itemId =  static::$parameters['id'];
 
 		if (in_array($verb, ['announce', 'unannounce'])) {
 			$item = Post::selectFirst(['network'], ['id' => $itemId]);
diff --git a/src/Module/Item/Compose.php b/src/Module/Item/Compose.php
index f81b0c8969..c229fb15ae 100644
--- a/src/Module/Item/Compose.php
+++ b/src/Module/Item/Compose.php
@@ -40,7 +40,7 @@ use Friendica\Util\Temporal;
 
 class Compose extends BaseModule
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		if (!empty($_REQUEST['body'])) {
 			$_REQUEST['return'] = 'network';
@@ -51,7 +51,7 @@ class Compose extends BaseModule
 		}
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		if (!local_user()) {
 			return Login::form('compose', false);
@@ -64,7 +64,7 @@ class Compose extends BaseModule
 		}
 
 		/// @TODO Retrieve parameter from router
-		$posttype = $parameters['type'] ?? Item::PT_ARTICLE;
+		$posttype = static::$parameters['type'] ?? Item::PT_ARTICLE;
 		if (!in_array($posttype, [Item::PT_ARTICLE, Item::PT_PERSONAL_NOTE])) {
 			switch ($posttype) {
 				case 'note':
diff --git a/src/Module/Item/Follow.php b/src/Module/Item/Follow.php
index d67af70e45..923048447b 100644
--- a/src/Module/Item/Follow.php
+++ b/src/Module/Item/Follow.php
@@ -34,7 +34,7 @@ use Friendica\Network\HTTPException;
  */
 class Follow extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$l10n = DI::l10n();
 
@@ -42,11 +42,11 @@ class Follow extends BaseModule
 			throw new HttpException\ForbiddenException($l10n->t('Access denied.'));
 		}
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			throw new HTTPException\BadRequestException();
 		}
 
-		$itemId = intval($parameters['id']);
+		$itemId = intval(static::$parameters['id']);
 
 		if (!Item::performActivity($itemId, 'follow', local_user())) {
 			throw new HTTPException\BadRequestException($l10n->t('Unable to follow this item.'));
diff --git a/src/Module/Item/Ignore.php b/src/Module/Item/Ignore.php
index d38c19bb9a..19ac90e47c 100644
--- a/src/Module/Item/Ignore.php
+++ b/src/Module/Item/Ignore.php
@@ -33,7 +33,7 @@ use Friendica\Network\HTTPException;
  */
 class Ignore extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$l10n = DI::l10n();
 
@@ -41,11 +41,11 @@ class Ignore extends BaseModule
 			throw new HttpException\ForbiddenException($l10n->t('Access denied.'));
 		}
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			throw new HTTPException\BadRequestException();
 		}
 
-		$itemId = intval($parameters['id']);
+		$itemId = intval(static::$parameters['id']);
 
 		$dba = DI::dba();
 
diff --git a/src/Module/Item/Pin.php b/src/Module/Item/Pin.php
index b8022cf57c..c451bae480 100644
--- a/src/Module/Item/Pin.php
+++ b/src/Module/Item/Pin.php
@@ -34,7 +34,7 @@ use Friendica\Network\HTTPException;
  */
 class Pin extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$l10n = DI::l10n();
 
@@ -42,11 +42,11 @@ class Pin extends BaseModule
 			throw new HttpException\ForbiddenException($l10n->t('Access denied.'));
 		}
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			throw new HTTPException\BadRequestException();
 		}
 
-		$itemId = intval($parameters['id']);
+		$itemId = intval(static::$parameters['id']);
 
 		$item = Post::selectFirst(['uri-id', 'uid'], ['id' => $itemId]);
 		if (!DBA::isResult($item)) {
diff --git a/src/Module/Item/Star.php b/src/Module/Item/Star.php
index c39b6a11a0..d24fb54ac7 100644
--- a/src/Module/Item/Star.php
+++ b/src/Module/Item/Star.php
@@ -35,7 +35,7 @@ use Friendica\Network\HTTPException;
  */
 class Star extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$l10n = DI::l10n();
 
@@ -43,11 +43,11 @@ class Star extends BaseModule
 			throw new HttpException\ForbiddenException($l10n->t('Access denied.'));
 		}
 
-		if (empty($parameters['id'])) {
+		if (empty(static::$parameters['id'])) {
 			throw new HTTPException\BadRequestException();
 		}
 
-		$itemId = intval($parameters['id']);
+		$itemId = intval(static::$parameters['id']);
 
 
 		$item = Post::selectFirstForUser(local_user(), ['uid', 'uri-id', 'starred'], ['uid' => [0, local_user()], 'id' => $itemId]);
diff --git a/src/Module/Magic.php b/src/Module/Magic.php
index c51c05844c..63f8ee9c1c 100644
--- a/src/Module/Magic.php
+++ b/src/Module/Magic.php
@@ -39,7 +39,7 @@ use Friendica\Util\Strings;
  */
 class Magic extends BaseModule
 {
-	public static function init(array $parameters = [])
+	public static function init()
 	{
 		$a = DI::app();
 		$ret = ['success' => false, 'url' => '', 'message' => ''];
diff --git a/src/Module/Maintenance.php b/src/Module/Maintenance.php
index be70e7a5c7..d13c5fe027 100644
--- a/src/Module/Maintenance.php
+++ b/src/Module/Maintenance.php
@@ -34,7 +34,7 @@ use Friendica\Util\Strings;
  */
 class Maintenance extends BaseModule
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		$reason = DI::config()->get('system', 'maintenance_reason');
 
diff --git a/src/Module/Manifest.php b/src/Module/Manifest.php
index 0f9112d11f..4a226ac63f 100644
--- a/src/Module/Manifest.php
+++ b/src/Module/Manifest.php
@@ -27,7 +27,7 @@ use Friendica\DI;
 
 class Manifest extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$config = DI::config();
 
diff --git a/src/Module/NoScrape.php b/src/Module/NoScrape.php
index 2530038969..96e4d7658d 100644
--- a/src/Module/NoScrape.php
+++ b/src/Module/NoScrape.php
@@ -35,14 +35,14 @@ use Friendica\Model\User;
  */
 class NoScrape extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$a = DI::app();
 
-		if (isset($parameters['nick'])) {
+		if (isset(static::$parameters['nick'])) {
 			// Get infos about a specific nick (public)
-			$which = $parameters['nick'];
-		} elseif (local_user() && isset($parameters['profile']) && DI::args()->get(2) == 'view') {
+			$which = static::$parameters['nick'];
+		} elseif (local_user() && isset(static::$parameters['profile']) && DI::args()->get(2) == 'view') {
 			// view infos about a known profile (needs a login)
 			$which = $a->getLoggedInUserNickname();
 		} else {
diff --git a/src/Module/NodeInfo110.php b/src/Module/NodeInfo110.php
index 5248c662bf..3923b7e21c 100644
--- a/src/Module/NodeInfo110.php
+++ b/src/Module/NodeInfo110.php
@@ -33,7 +33,7 @@ use Friendica\Model\Nodeinfo;
  */
 class NodeInfo110 extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$config = DI::config();
 
diff --git a/src/Module/NodeInfo120.php b/src/Module/NodeInfo120.php
index 0eb6e793f9..471f0f212f 100644
--- a/src/Module/NodeInfo120.php
+++ b/src/Module/NodeInfo120.php
@@ -33,7 +33,7 @@ use Friendica\Model\Nodeinfo;
  */
 class NodeInfo120 extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$config = DI::config();
 
diff --git a/src/Module/NodeInfo210.php b/src/Module/NodeInfo210.php
index 5ea9c0e683..02324a92be 100644
--- a/src/Module/NodeInfo210.php
+++ b/src/Module/NodeInfo210.php
@@ -33,7 +33,7 @@ use Friendica\Model\Nodeinfo;
  */
 class NodeInfo210 extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$config = DI::config();
 
diff --git a/src/Module/Notifications/Introductions.php b/src/Module/Notifications/Introductions.php
index 9bc9f40b0a..234175dd88 100644
--- a/src/Module/Notifications/Introductions.php
+++ b/src/Module/Notifications/Introductions.php
@@ -55,7 +55,7 @@ class Introductions extends BaseNotifications
 		];
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		Nav::setSelected('introductions');
 
diff --git a/src/Module/Notifications/Notification.php b/src/Module/Notifications/Notification.php
index 64ab459f12..5c27abbbba 100644
--- a/src/Module/Notifications/Notification.php
+++ b/src/Module/Notifications/Notification.php
@@ -42,13 +42,13 @@ class Notification extends BaseModule
 	 * @throws \ImagickException
 	 * @throws \Exception
 	 */
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		if (!local_user()) {
 			throw new HTTPException\UnauthorizedException(DI::l10n()->t('Permission denied.'));
 		}
 
-		$request_id = $parameters['id'] ?? false;
+		$request_id = static::$parameters['id'] ?? false;
 
 		if ($request_id) {
 			$intro = DI::intro()->selectOneById($request_id, local_user());
@@ -73,7 +73,7 @@ class Notification extends BaseModule
 	 *
 	 * @throws HTTPException\UnauthorizedException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		if (!local_user()) {
 			throw new HTTPException\UnauthorizedException(DI::l10n()->t('Permission denied.'));
@@ -101,14 +101,14 @@ class Notification extends BaseModule
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws \Exception
 	 */
-	public static function content(array $parameters = []): string
+	public static function content(): string
 	{
 		if (!local_user()) {
 			notice(DI::l10n()->t('You must be logged in to show this page.'));
 			return Login::form();
 		}
 
-		$request_id = $parameters['id'] ?? false;
+		$request_id = static::$parameters['id'] ?? false;
 
 		if ($request_id) {
 			$Notify = DI::notify()->selectOneById($request_id);
diff --git a/src/Module/Notifications/Notifications.php b/src/Module/Notifications/Notifications.php
index a0e40719c0..9b43647e9a 100644
--- a/src/Module/Notifications/Notifications.php
+++ b/src/Module/Notifications/Notifications.php
@@ -82,7 +82,7 @@ class Notifications extends BaseNotifications
 		];
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		Nav::setSelected('notifications');
 
diff --git a/src/Module/OAuth/Acknowledge.php b/src/Module/OAuth/Acknowledge.php
index 6f7ac945b9..ffce1caae3 100644
--- a/src/Module/OAuth/Acknowledge.php
+++ b/src/Module/OAuth/Acknowledge.php
@@ -30,13 +30,13 @@ use Friendica\Module\BaseApi;
  */
 class Acknowledge extends BaseApi
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		DI::session()->set('oauth_acknowledge', true);
 		DI::app()->redirect(DI::session()->get('return_path'));
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		DI::session()->set('return_path', $_REQUEST['return_path'] ?? '');
 
diff --git a/src/Module/OAuth/Authorize.php b/src/Module/OAuth/Authorize.php
index cf5187d947..ede46720a3 100644
--- a/src/Module/OAuth/Authorize.php
+++ b/src/Module/OAuth/Authorize.php
@@ -35,10 +35,9 @@ class Authorize extends BaseApi
 	private static $oauth_code = '';
 
 	/**
-	 * @param array $parameters
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$request = self::getRequest([
 			'force_login'   => '', // Forces the user to re-login, which is necessary for authorizing with multiple accounts from the same instance.
@@ -98,7 +97,7 @@ class Authorize extends BaseApi
 		self::$oauth_code = $token['code'];
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		if (empty(self::$oauth_code)) {
 			return '';
diff --git a/src/Module/OAuth/Revoke.php b/src/Module/OAuth/Revoke.php
index 519e79db01..156ef1c199 100644
--- a/src/Module/OAuth/Revoke.php
+++ b/src/Module/OAuth/Revoke.php
@@ -32,7 +32,7 @@ use Friendica\Module\BaseApi;
  */
 class Revoke extends BaseApi
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		$request = self::getRequest([
 			'client_id'     => '', // Client ID, obtained during app registration
diff --git a/src/Module/OAuth/Token.php b/src/Module/OAuth/Token.php
index f104e96721..2ef26cbf1b 100644
--- a/src/Module/OAuth/Token.php
+++ b/src/Module/OAuth/Token.php
@@ -34,7 +34,7 @@ use Friendica\Security\OAuth;
  */
 class Token extends BaseApi
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		$request = self::getRequest([
 			'client_id'     => '', // Client ID, obtained during app registration
diff --git a/src/Module/Oembed.php b/src/Module/Oembed.php
index 0d6fb8ee52..5564fdacaa 100644
--- a/src/Module/Oembed.php
+++ b/src/Module/Oembed.php
@@ -37,7 +37,7 @@ use Friendica\Util\Strings;
  */
 class Oembed extends BaseModule
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		// Unused form: /oembed/b2h?url=...
 		if (DI::args()->getArgv()[1] == 'b2h') {
diff --git a/src/Module/OpenSearch.php b/src/Module/OpenSearch.php
index df37706874..a6393726d7 100644
--- a/src/Module/OpenSearch.php
+++ b/src/Module/OpenSearch.php
@@ -36,7 +36,7 @@ class OpenSearch extends BaseModule
 	/**
 	 * @throws \Exception
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		header('Content-type: application/opensearchdescription+xml');
 
diff --git a/src/Module/Owa.php b/src/Module/Owa.php
index 5b87e6a4f1..a467349878 100644
--- a/src/Module/Owa.php
+++ b/src/Module/Owa.php
@@ -44,7 +44,7 @@ use Friendica\Util\Strings;
  */
 class Owa extends BaseModule
 {
-	public static function init(array $parameters = [])
+	public static function init()
 	{
 
 		$ret = [ 'success' => false ];
diff --git a/src/Module/ParseUrl.php b/src/Module/ParseUrl.php
index 0b1548ed5e..f8665c5357 100644
--- a/src/Module/ParseUrl.php
+++ b/src/Module/ParseUrl.php
@@ -31,7 +31,7 @@ use Friendica\Util;
 
 class ParseUrl extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		if (!Session::isAuthenticated()) {
 			throw new \Friendica\Network\HTTPException\ForbiddenException();
diff --git a/src/Module/PermissionTooltip.php b/src/Module/PermissionTooltip.php
index 7599c2f060..89ed260f9c 100644
--- a/src/Module/PermissionTooltip.php
+++ b/src/Module/PermissionTooltip.php
@@ -15,10 +15,10 @@ use Friendica\Network\HTTPException;
  */
 class PermissionTooltip extends \Friendica\BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
-		$type = $parameters['type'];
-		$referenceId = $parameters['id'];
+		$type = static::$parameters['type'];
+		$referenceId = static::$parameters['id'];
 
 		$expectedTypes = ['item', 'photo', 'event'];
 		if (!in_array($type, $expectedTypes)) {
diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index 399313e3f5..2a45ef0478 100644
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -51,7 +51,7 @@ class Photo extends BaseModule
 	 * Fetch a photo or an avatar, in optional size, check for permissions and
 	 * return the image
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$totalstamp = microtime(true);
 
@@ -77,14 +77,14 @@ class Photo extends BaseModule
 		$scale = null;
 		$stamp = microtime(true);
 		// User avatar
-		if (!empty($parameters['type'])) {
-			if (!empty($parameters['customsize'])) {
-				$customsize = intval($parameters['customsize']);
-				$square_resize = !in_array($parameters['type'], ['media', 'preview']);
+		if (!empty(static::$parameters['type'])) {
+			if (!empty(static::$parameters['customsize'])) {
+				$customsize = intval(static::$parameters['customsize']);
+				$square_resize = !in_array(static::$parameters['type'], ['media', 'preview']);
 			}
 
-			if (!empty($parameters['guid'])) {
-				$guid = $parameters['guid'];
+			if (!empty(static::$parameters['guid'])) {
+				$guid = static::$parameters['guid'];
 				$account = DBA::selectFirst('account-user-view', ['id'], ['guid' => $guid], ['order' => ['uid' => true]]);
 				if (empty($account)) {
 					throw new HTTPException\NotFoundException();
@@ -94,12 +94,12 @@ class Photo extends BaseModule
 			}
 
 			// Contact Id Fallback, to remove after version 2021.12
-			if (isset($parameters['contact_id'])) {
-				$id = intval($parameters['contact_id']);
+			if (isset(static::$parameters['contact_id'])) {
+				$id = intval(static::$parameters['contact_id']);
 			}
 
-			if (!empty($parameters['nickname_ext'])) {
-				$nickname = pathinfo($parameters['nickname_ext'], PATHINFO_FILENAME);
+			if (!empty(static::$parameters['nickname_ext'])) {
+				$nickname = pathinfo(static::$parameters['nickname_ext'], PATHINFO_FILENAME);
 				$user = User::getByNickname($nickname, ['uid']);
 				if (empty($user)) {
 					throw new HTTPException\NotFoundException();
@@ -109,23 +109,23 @@ class Photo extends BaseModule
 			}
 
 			// User Id Fallback, to remove after version 2021.12
-			if (!empty($parameters['uid_ext'])) {
-				$id = intval(pathinfo($parameters['uid_ext'], PATHINFO_FILENAME));
+			if (!empty(static::$parameters['uid_ext'])) {
+				$id = intval(pathinfo(static::$parameters['uid_ext'], PATHINFO_FILENAME));
 			}
 
 			// Please refactor this for the love of everything that's good
-			if (isset($parameters['id'])) {
-				$id = $parameters['id'];
+			if (isset(static::$parameters['id'])) {
+				$id = static::$parameters['id'];
 			}
 
 			if (empty($id)) {
-				Logger::notice('No picture id was detected', ['parameters' => $parameters, 'query' => DI::args()->getQueryString()]);
+				Logger::notice('No picture id was detected', ['parameters' => static::$parameters, 'query' => DI::args()->getQueryString()]);
 				throw new HTTPException\NotFoundException(DI::l10n()->t('The Photo is not available.'));
 			}
 
-			$photo = self::getPhotoByid($id, $parameters['type'], $customsize ?: Proxy::PIXEL_SMALL);
+			$photo = self::getPhotoByid($id, static::$parameters['type'], $customsize ?: Proxy::PIXEL_SMALL);
 		} else {
-			$photoid = pathinfo($parameters['name'], PATHINFO_FILENAME);
+			$photoid = pathinfo(static::$parameters['name'], PATHINFO_FILENAME);
 			$scale = 0;
 			if (substr($photoid, -2, 1) == "-") {
 				$scale = intval(substr($photoid, -1, 1));
diff --git a/src/Module/Profile/Common.php b/src/Module/Profile/Common.php
index 7138ac73fd..a469739679 100644
--- a/src/Module/Profile/Common.php
+++ b/src/Module/Profile/Common.php
@@ -35,7 +35,7 @@ use Friendica\Network\HTTPException;
 
 class Common extends BaseProfile
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
 			throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
@@ -45,7 +45,7 @@ class Common extends BaseProfile
 
 		Nav::setSelected('home');
 
-		$nickname = $parameters['nickname'];
+		$nickname = static::$parameters['nickname'];
 
 		$profile = Profile::load($a, $nickname);
 		if (empty($profile)) {
diff --git a/src/Module/Profile/Contacts.php b/src/Module/Profile/Contacts.php
index 94f301557b..0f28be641c 100644
--- a/src/Module/Profile/Contacts.php
+++ b/src/Module/Profile/Contacts.php
@@ -34,7 +34,7 @@ use Friendica\Network\HTTPException;
 
 class Contacts extends Module\BaseProfile
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
 			throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
@@ -42,8 +42,8 @@ class Contacts extends Module\BaseProfile
 
 		$a = DI::app();
 
-		$nickname = $parameters['nickname'];
-		$type = $parameters['type'] ?? 'all';
+		$nickname = static::$parameters['nickname'];
+		$type = static::$parameters['type'] ?? 'all';
 
 		$profile = Model\Profile::load($a, $nickname);
 		if (empty($profile)) {
diff --git a/src/Module/Profile/Index.php b/src/Module/Profile/Index.php
index 5334ac932f..4f46efaa33 100644
--- a/src/Module/Profile/Index.php
+++ b/src/Module/Profile/Index.php
@@ -34,13 +34,13 @@ use Friendica\BaseModule;
  */
 class Index extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
-		Profile::rawContent($parameters);
+		Profile::rawContent();
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		return Status::content($parameters);
+		return Status::content();
 	}
 }
diff --git a/src/Module/Profile/Media.php b/src/Module/Profile/Media.php
index e10597199e..f46097814f 100644
--- a/src/Module/Profile/Media.php
+++ b/src/Module/Profile/Media.php
@@ -29,11 +29,11 @@ use Friendica\Network\HTTPException;
 
 class Media extends BaseProfile
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		$a = DI::app();
 
-		$profile = ProfileModel::load($a, $parameters['nickname']);
+		$profile = ProfileModel::load($a, static::$parameters['nickname']);
 		if (empty($profile)) {
 			throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
 		}
diff --git a/src/Module/Profile/Profile.php b/src/Module/Profile/Profile.php
index 25b6eccc9a..c1792ad4e6 100644
--- a/src/Module/Profile/Profile.php
+++ b/src/Module/Profile/Profile.php
@@ -46,10 +46,10 @@ use Friendica\Util\Temporal;
 
 class Profile extends BaseProfile
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		if (ActivityPub::isRequest()) {
-			$user = DBA::selectFirst('user', ['uid'], ['nickname' => $parameters['nickname']]);
+			$user = DBA::selectFirst('user', ['uid'], ['nickname' => static::$parameters['nickname']]);
 			if (DBA::isResult($user)) {
 				try {
 					$data = ActivityPub\Transmitter::getProfile($user['uid']);
@@ -61,9 +61,9 @@ class Profile extends BaseProfile
 				}
 			}
 
-			if (DBA::exists('userd', ['username' => $parameters['nickname']])) {
+			if (DBA::exists('userd', ['username' => static::$parameters['nickname']])) {
 				// Known deleted user
-				$data = ActivityPub\Transmitter::getDeletedUser($parameters['nickname']);
+				$data = ActivityPub\Transmitter::getDeletedUser(static::$parameters['nickname']);
 
 				System::jsonError(410, $data);
 			} else {
@@ -73,11 +73,11 @@ class Profile extends BaseProfile
 		}
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		$a = DI::app();
 
-		$profile = ProfileModel::load($a, $parameters['nickname']);
+		$profile = ProfileModel::load($a, static::$parameters['nickname']);
 		if (!$profile) {
 			throw new HTTPException\NotFoundException(DI::l10n()->t('Profile not found.'));
 		}
@@ -98,7 +98,7 @@ class Profile extends BaseProfile
 			DI::page()['htmlhead'] .= '<meta name="friendica.community" content="true" />' . "\n";
 		}
 
-		DI::page()['htmlhead'] .= self::buildHtmlHead($profile, $parameters['nickname'], $remote_contact_id);
+		DI::page()['htmlhead'] .= self::buildHtmlHead($profile, static::$parameters['nickname'], $remote_contact_id);
 
 		Nav::setSelected('home');
 
@@ -134,7 +134,7 @@ class Profile extends BaseProfile
 				$view_as_contact_alert = DI::l10n()->t(
 					'You\'re currently viewing your profile as <b>%s</b> <a href="%s" class="btn btn-sm pull-right">Cancel</a>',
 					htmlentities($view_as_contacts[$key]['name'], ENT_COMPAT, 'UTF-8'),
-					'profile/' . $parameters['nickname'] . '/profile'
+					'profile/' . static::$parameters['nickname'] . '/profile'
 				);
 			}
 		}
diff --git a/src/Module/Profile/Schedule.php b/src/Module/Profile/Schedule.php
index e72b1c7a65..eaeeb85406 100644
--- a/src/Module/Profile/Schedule.php
+++ b/src/Module/Profile/Schedule.php
@@ -33,7 +33,7 @@ use Friendica\Util\DateTimeFormat;
 
 class Schedule extends BaseProfile
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		if (!local_user()) {
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
@@ -50,7 +50,7 @@ class Schedule extends BaseProfile
 		Post\Delayed::deleteById($_REQUEST['delete']);
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		if (!local_user()) {
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
@@ -80,7 +80,7 @@ class Schedule extends BaseProfile
 			'$form_security_token' => BaseModule::getFormSecurityToken("profile_schedule"),
 			'$baseurl'             => DI::baseUrl()->get(true),
 			'$title'               => DI::l10n()->t('Scheduled Posts'),
-			'$nickname'            => $parameters['nickname'] ?? '',
+			'$nickname'            => static::$parameters['nickname'] ?? '',
 			'$scheduled_at'        => DI::l10n()->t('Scheduled'),
 			'$content'             => DI::l10n()->t('Content'),
 			'$delete'              => DI::l10n()->t('Remove post'),
diff --git a/src/Module/Profile/Status.php b/src/Module/Profile/Status.php
index e93fc5699e..995939ce7c 100644
--- a/src/Module/Profile/Status.php
+++ b/src/Module/Profile/Status.php
@@ -46,13 +46,13 @@ use Friendica\Util\XML;
 
 class Status extends BaseProfile
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		$args = DI::args();
 
 		$a = DI::app();
 
-		$profile = ProfileModel::load($a, $parameters['nickname']);
+		$profile = ProfileModel::load($a, static::$parameters['nickname']);
 
 		if (empty($profile)) {
 			throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
@@ -62,10 +62,10 @@ class Status extends BaseProfile
 			DI::page()['htmlhead'] .= '<meta content="noindex, noarchive" name="robots" />' . "\n";
 		}
 
-		DI::page()['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . DI::baseUrl() . '/dfrn_poll/' . $parameters['nickname'] . '" title="DFRN: ' . DI::l10n()->t('%s\'s timeline', $profile['name']) . '"/>' . "\n";
-		DI::page()['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . DI::baseUrl() . '/feed/' . $parameters['nickname'] . '/" title="' . DI::l10n()->t('%s\'s posts', $profile['name']) . '"/>' . "\n";
-		DI::page()['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . DI::baseUrl() . '/feed/' . $parameters['nickname'] . '/comments" title="' . DI::l10n()->t('%s\'s comments', $profile['name']) . '"/>' . "\n";
-		DI::page()['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . DI::baseUrl() . '/feed/' . $parameters['nickname'] . '/activity" title="' . DI::l10n()->t('%s\'s timeline', $profile['name']) . '"/>' . "\n";
+		DI::page()['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . DI::baseUrl() . '/dfrn_poll/' . static::$parameters['nickname'] . '" title="DFRN: ' . DI::l10n()->t('%s\'s timeline', $profile['name']) . '"/>' . "\n";
+		DI::page()['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . DI::baseUrl() . '/feed/' . static::$parameters['nickname'] . '/" title="' . DI::l10n()->t('%s\'s posts', $profile['name']) . '"/>' . "\n";
+		DI::page()['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . DI::baseUrl() . '/feed/' . static::$parameters['nickname'] . '/comments" title="' . DI::l10n()->t('%s\'s comments', $profile['name']) . '"/>' . "\n";
+		DI::page()['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . DI::baseUrl() . '/feed/' . static::$parameters['nickname'] . '/activity" title="' . DI::l10n()->t('%s\'s timeline', $profile['name']) . '"/>' . "\n";
 
 		$category = $datequery = $datequery2 = '';
 
diff --git a/src/Module/Proxy.php b/src/Module/Proxy.php
index 86b8a95cbb..a9c8c0b9e6 100644
--- a/src/Module/Proxy.php
+++ b/src/Module/Proxy.php
@@ -44,9 +44,9 @@ class Proxy extends BaseModule
 	/**
 	 * Fetch remote image content
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
-		$request = self::getRequestInfo($parameters);
+		$request = self::getRequestInfo();
 
 		if (!DI::config()->get('system', 'proxify_content')) {
 			Logger::notice('Proxy access is forbidden', ['request' => $request, 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '', 'accept' => $_SERVER['HTTP_ACCEPT'] ?? '']);
@@ -119,13 +119,13 @@ class Proxy extends BaseModule
 	 *    ]
 	 * @throws \Exception
 	 */
-	private static function getRequestInfo(array $parameters)
+	private static function getRequestInfo()
 	{
 		$size = ProxyUtils::PIXEL_LARGE;
 		$sizetype = '';
 
-		if (!empty($parameters['url']) && empty($_REQUEST['url'])) {
-			$url = $parameters['url'];
+		if (!empty(static::$parameters['url']) && empty($_REQUEST['url'])) {
+			$url = static::$parameters['url'];
 
 			// thumb, small, medium and large.
 			if (substr($url, -6) == ':micro') {
diff --git a/src/Module/PublicRSAKey.php b/src/Module/PublicRSAKey.php
index a13130d1c9..22269984a8 100644
--- a/src/Module/PublicRSAKey.php
+++ b/src/Module/PublicRSAKey.php
@@ -33,13 +33,13 @@ use Friendica\Util\Strings;
  */
 class PublicRSAKey extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
-		if (empty($parameters['nick'])) {
+		if (empty(static::$parameters['nick'])) {
 			throw new BadRequestException();
 		}
 
-		$nick = $parameters['nick'];
+		$nick = static::$parameters['nick'];
 
 		$user = User::getByNickname($nick, ['spubkey']);
 		if (empty($user) || empty($user['spubkey'])) {
diff --git a/src/Module/RandomProfile.php b/src/Module/RandomProfile.php
index df1a987d2e..b50746701d 100644
--- a/src/Module/RandomProfile.php
+++ b/src/Module/RandomProfile.php
@@ -30,7 +30,7 @@ use Friendica\Model\Contact;
  */
 class RandomProfile extends BaseModule
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		$a = DI::app();
 
diff --git a/src/Module/ReallySimpleDiscovery.php b/src/Module/ReallySimpleDiscovery.php
index 8d6a6ff3c2..50b9660020 100644
--- a/src/Module/ReallySimpleDiscovery.php
+++ b/src/Module/ReallySimpleDiscovery.php
@@ -31,7 +31,7 @@ use Friendica\Util\XML;
  */
 class ReallySimpleDiscovery extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		header('Content-Type: text/xml');
 
diff --git a/src/Module/Register.php b/src/Module/Register.php
index 909e61a998..7c0d3f690d 100644
--- a/src/Module/Register.php
+++ b/src/Module/Register.php
@@ -53,7 +53,7 @@ class Register extends BaseModule
 	 *
 	 * @return string
 	 */
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		// logged in users can register others (people/pages/groups)
 		// even with closed registrations, unless specifically prohibited by site policy.
@@ -129,7 +129,7 @@ class Register extends BaseModule
 
 		$tpl = $arr['template'];
 
-		$tos = new Tos();
+		$tos = new Tos(static::$parameters);
 
 		$o = Renderer::replaceMacros($tpl, [
 			'$invitations'  => DI::config()->get('system', 'invitation_only'),
@@ -182,7 +182,7 @@ class Register extends BaseModule
 	 * Extend this method if the module is supposed to process POST requests.
 	 * Doesn't display any content
 	 */
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		BaseModule::checkFormSecurityTokenRedirectOnError('/register', 'register');
 
diff --git a/src/Module/RemoteFollow.php b/src/Module/RemoteFollow.php
index f1e653f1ce..df67e60c65 100644
--- a/src/Module/RemoteFollow.php
+++ b/src/Module/RemoteFollow.php
@@ -42,9 +42,9 @@ class RemoteFollow extends BaseModule
 {
 	static $owner;
 
-	public static function init(array $parameters = [])
+	public static function init()
 	{
-		self::$owner = User::getOwnerDataByNick($parameters['profile']);
+		self::$owner = User::getOwnerDataByNick(static::$parameters['profile']);
 		if (!self::$owner) {
 			throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
 		}
@@ -52,7 +52,7 @@ class RemoteFollow extends BaseModule
 		DI::page()['aside'] = Widget\VCard::getHTML(self::$owner);
 	}
 
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		if (!empty($_POST['cancel']) || empty($_POST['dfrn_url'])) {
 			DI::baseUrl()->redirect();
@@ -96,7 +96,7 @@ class RemoteFollow extends BaseModule
 		System::externalRedirect($follow_link);
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		if (empty(self::$owner)) {
 			return '';
@@ -115,7 +115,7 @@ class RemoteFollow extends BaseModule
 			'$submit'        => DI::l10n()->t('Submit Request'),
 			'$cancel'        => DI::l10n()->t('Cancel'),
 
-			'$request'       => 'remote_follow/' . $parameters['profile'],
+			'$request'       => 'remote_follow/' . static::$parameters['profile'],
 			'$name'          => self::$owner['name'],
 			'$myaddr'        => Profile::getMyURL(),
 		]);
diff --git a/src/Module/RobotsTxt.php b/src/Module/RobotsTxt.php
index 63abcf36e8..c2b2d624dd 100644
--- a/src/Module/RobotsTxt.php
+++ b/src/Module/RobotsTxt.php
@@ -28,7 +28,7 @@ use Friendica\BaseModule;
  */
 class RobotsTxt extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$allDisalloweds = [
 			'/settings/',
diff --git a/src/Module/Search/Acl.php b/src/Module/Search/Acl.php
index 636e09539f..8ec8dd9bbb 100644
--- a/src/Module/Search/Acl.php
+++ b/src/Module/Search/Acl.php
@@ -48,7 +48,7 @@ class Acl extends BaseModule
 	const TYPE_PRIVATE_MESSAGE       = 'm';
 	const TYPE_ANY_CONTACT           = 'a';
 
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		if (!local_user()) {
 			throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this module.'));
diff --git a/src/Module/Search/Directory.php b/src/Module/Search/Directory.php
index 692122155f..5b5a1ba285 100644
--- a/src/Module/Search/Directory.php
+++ b/src/Module/Search/Directory.php
@@ -31,7 +31,7 @@ use Friendica\Module\Security\Login;
  */
 class Directory extends BaseSearch
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		if (!local_user()) {
 			notice(DI::l10n()->t('Permission denied.'));
diff --git a/src/Module/Search/Filed.php b/src/Module/Search/Filed.php
index 7bfc14f6f5..f3cad86208 100644
--- a/src/Module/Search/Filed.php
+++ b/src/Module/Search/Filed.php
@@ -17,7 +17,7 @@ use Friendica\Module\Security\Login;
 
 class Filed extends BaseSearch
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		if (!local_user()) {
 			return Login::form();
diff --git a/src/Module/Search/Index.php b/src/Module/Search/Index.php
index 769d5f90d2..941b4c5770 100644
--- a/src/Module/Search/Index.php
+++ b/src/Module/Search/Index.php
@@ -41,7 +41,7 @@ use Friendica\Network\HTTPException;
 
 class Index extends BaseSearch
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		$search = (!empty($_GET['q']) ? trim(rawurldecode($_GET['q'])) : '');
 
diff --git a/src/Module/Search/Saved.php b/src/Module/Search/Saved.php
index d5cc15ceea..436e3f9589 100644
--- a/src/Module/Search/Saved.php
+++ b/src/Module/Search/Saved.php
@@ -28,7 +28,7 @@ use Friendica\DI;
 
 class Saved extends BaseModule
 {
-	public static function init(array $parameters = [])
+	public static function init()
 	{
 		$action = DI::args()->get(2, 'none');
 		$search = trim(rawurldecode($_GET['term'] ?? ''));
diff --git a/src/Module/Security/Login.php b/src/Module/Security/Login.php
index 0e49234809..e157ac0898 100644
--- a/src/Module/Security/Login.php
+++ b/src/Module/Security/Login.php
@@ -33,7 +33,7 @@ use Friendica\Module\Register;
  */
 class Login extends BaseModule
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		$return_path = $_REQUEST['return_path'] ?? '' ;
 
@@ -46,7 +46,7 @@ class Login extends BaseModule
 		return self::form(Session::get('return_path'), intval(DI::config()->get('config', 'register_policy')) !== \Friendica\Module\Register::CLOSED);
 	}
 
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		$return_path = Session::get('return_path');
 		Session::clear();
diff --git a/src/Module/Security/Logout.php b/src/Module/Security/Logout.php
index 1724ae297e..35658797ce 100644
--- a/src/Module/Security/Logout.php
+++ b/src/Module/Security/Logout.php
@@ -36,7 +36,7 @@ class Logout extends BaseModule
 	/**
 	 * Process logout requests
 	 */
-	public static function init(array $parameters = [])
+	public static function init()
 	{
 		$visitor_home = null;
 		if (remote_user()) {
diff --git a/src/Module/Security/OpenID.php b/src/Module/Security/OpenID.php
index 8e8613c4e9..4459b2cf8c 100644
--- a/src/Module/Security/OpenID.php
+++ b/src/Module/Security/OpenID.php
@@ -31,7 +31,7 @@ use LightOpenID;
  */
 class OpenID extends BaseModule
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		if (DI::config()->get('system', 'no_openid')) {
 			DI::baseUrl()->redirect();
diff --git a/src/Module/Security/TwoFactor/Recovery.php b/src/Module/Security/TwoFactor/Recovery.php
index d93146cb6c..5bcf6add8e 100644
--- a/src/Module/Security/TwoFactor/Recovery.php
+++ b/src/Module/Security/TwoFactor/Recovery.php
@@ -35,14 +35,14 @@ use Friendica\Security\TwoFactor\Model\RecoveryCode;
  */
 class Recovery extends BaseModule
 {
-	public static function init(array $parameters = [])
+	public static function init()
 	{
 		if (!local_user()) {
 			return;
 		}
 	}
 
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		if (!local_user()) {
 			return;
@@ -67,7 +67,7 @@ class Recovery extends BaseModule
 		}
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		if (!local_user()) {
 			DI::baseUrl()->redirect();
diff --git a/src/Module/Security/TwoFactor/Verify.php b/src/Module/Security/TwoFactor/Verify.php
index 22c757b82d..3209b3f56d 100644
--- a/src/Module/Security/TwoFactor/Verify.php
+++ b/src/Module/Security/TwoFactor/Verify.php
@@ -38,7 +38,7 @@ class Verify extends BaseModule
 {
 	private static $errors = [];
 
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		if (!local_user()) {
 			return;
@@ -78,7 +78,7 @@ class Verify extends BaseModule
 		}
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		if (!local_user()) {
 			DI::baseUrl()->redirect();
diff --git a/src/Module/Settings/Delegation.php b/src/Module/Settings/Delegation.php
index 067304ee8a..f98583a2a2 100644
--- a/src/Module/Settings/Delegation.php
+++ b/src/Module/Settings/Delegation.php
@@ -36,7 +36,7 @@ use Friendica\Util\Strings;
  */
 class Delegation extends BaseSettings
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		if (!DI::app()->isLoggedIn()) {
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
@@ -62,9 +62,9 @@ class Delegation extends BaseSettings
 		DBA::update('user', ['parent-uid' => $parent_uid], ['uid' => local_user()]);
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		parent::content($parameters);
+		parent::content();
 
 		if (!local_user()) {
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
diff --git a/src/Module/Settings/Display.php b/src/Module/Settings/Display.php
index 5429a11e23..42632fe0f8 100644
--- a/src/Module/Settings/Display.php
+++ b/src/Module/Settings/Display.php
@@ -36,7 +36,7 @@ use Friendica\Network\HTTPException;
  */
 class Display extends BaseSettings
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		if (!DI::app()->isLoggedIn()) {
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
@@ -112,9 +112,9 @@ class Display extends BaseSettings
 		DI::baseUrl()->redirect('settings/display');
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
-		parent::content($parameters);
+		parent::content();
 
 		if (!local_user()) {
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
diff --git a/src/Module/Settings/Profile/Index.php b/src/Module/Settings/Profile/Index.php
index 28e8430eaa..8b2510050f 100644
--- a/src/Module/Settings/Profile/Index.php
+++ b/src/Module/Settings/Profile/Index.php
@@ -41,7 +41,7 @@ use Friendica\Util\Temporal;
 
 class Index extends BaseSettings
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		if (!local_user()) {
 			return;
@@ -135,7 +135,7 @@ class Index extends BaseSettings
 		DI::baseUrl()->redirect('settings/profile');
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		if (!local_user()) {
 			notice(DI::l10n()->t('You must be logged in to use this module'));
diff --git a/src/Module/Settings/Profile/Photo/Crop.php b/src/Module/Settings/Profile/Photo/Crop.php
index 104b6f653e..b983674383 100644
--- a/src/Module/Settings/Profile/Photo/Crop.php
+++ b/src/Module/Settings/Profile/Photo/Crop.php
@@ -33,13 +33,13 @@ use Friendica\Network\HTTPException;
 
 class Crop extends BaseSettings
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		if (!Session::isAuthenticated()) {
 			return;
 		}
 
-		$photo_prefix = $parameters['guid'];
+		$photo_prefix = static::$parameters['guid'];
 		$resource_id = $photo_prefix;
 		$scale = 0;
 		if (substr($photo_prefix, -2, 1) == '-') {
@@ -160,7 +160,7 @@ class Crop extends BaseSettings
 		DI::baseUrl()->redirect($path);
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		if (!Session::isAuthenticated()) {
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
@@ -168,7 +168,7 @@ class Crop extends BaseSettings
 
 		parent::content();
 
-		$resource_id = $parameters['guid'];
+		$resource_id = static::$parameters['guid'];
 
 		$photos = Photo::selectToArray([], ['resource-id' => $resource_id, 'uid' => local_user()], ['order' => ['scale' => false]]);
 		if (!DBA::isResult($photos)) {
diff --git a/src/Module/Settings/Profile/Photo/Index.php b/src/Module/Settings/Profile/Photo/Index.php
index cda71a7c69..423d0971e8 100644
--- a/src/Module/Settings/Profile/Photo/Index.php
+++ b/src/Module/Settings/Profile/Photo/Index.php
@@ -34,7 +34,7 @@ use Friendica\Util\Strings;
 
 class Index extends BaseSettings
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		if (!Session::isAuthenticated()) {
 			return;
@@ -106,7 +106,7 @@ class Index extends BaseSettings
 		DI::baseUrl()->redirect('settings/profile/photo/crop/' . $resource_id);
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		if (!Session::isAuthenticated()) {
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
diff --git a/src/Module/Settings/TwoFactor/AppSpecific.php b/src/Module/Settings/TwoFactor/AppSpecific.php
index 29d6b19c56..21304d10e1 100644
--- a/src/Module/Settings/TwoFactor/AppSpecific.php
+++ b/src/Module/Settings/TwoFactor/AppSpecific.php
@@ -36,7 +36,7 @@ class AppSpecific extends BaseSettings
 {
 	private static $appSpecificPassword = null;
 
-	public static function init(array $parameters = [])
+	public static function init()
 	{
 		if (!local_user()) {
 			return;
@@ -54,7 +54,7 @@ class AppSpecific extends BaseSettings
 		}
 	}
 
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		if (!local_user()) {
 			return;
@@ -97,13 +97,13 @@ class AppSpecific extends BaseSettings
 		}
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		if (!local_user()) {
 			return Login::form('settings/2fa/app_specific');
 		}
 
-		parent::content($parameters);
+		parent::content();
 
 		$appSpecificPasswords = AppSpecificPassword::getListForUser(local_user());
 
diff --git a/src/Module/Settings/TwoFactor/Index.php b/src/Module/Settings/TwoFactor/Index.php
index 3bb3a2aa1f..b173a092d4 100644
--- a/src/Module/Settings/TwoFactor/Index.php
+++ b/src/Module/Settings/TwoFactor/Index.php
@@ -33,7 +33,7 @@ use PragmaRX\Google2FA\Google2FA;
 
 class Index extends BaseSettings
 {
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		if (!local_user()) {
 			return;
@@ -94,13 +94,13 @@ class Index extends BaseSettings
 		}
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		if (!local_user()) {
 			return Login::form('settings/2fa');
 		}
 
-		parent::content($parameters);
+		parent::content();
 
 		$has_secret = (bool) DI::pConfig()->get(local_user(), '2fa', 'secret');
 		$verified = DI::pConfig()->get(local_user(), '2fa', 'verified');
diff --git a/src/Module/Settings/TwoFactor/Recovery.php b/src/Module/Settings/TwoFactor/Recovery.php
index eac3da919a..25832d2e6f 100644
--- a/src/Module/Settings/TwoFactor/Recovery.php
+++ b/src/Module/Settings/TwoFactor/Recovery.php
@@ -34,7 +34,7 @@ use Friendica\Module\Security\Login;
  */
 class Recovery extends BaseSettings
 {
-	public static function init(array $parameters = [])
+	public static function init()
 	{
 		if (!local_user()) {
 			return;
@@ -52,7 +52,7 @@ class Recovery extends BaseSettings
 		}
 	}
 
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		if (!local_user()) {
 			return;
@@ -69,13 +69,13 @@ class Recovery extends BaseSettings
 		}
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		if (!local_user()) {
 			return Login::form('settings/2fa/recovery');
 		}
 
-		parent::content($parameters);
+		parent::content();
 
 		if (!RecoveryCode::countValidForUser(local_user())) {
 			RecoveryCode::generateForUser(local_user());
diff --git a/src/Module/Settings/TwoFactor/Trusted.php b/src/Module/Settings/TwoFactor/Trusted.php
index 7532509417..c719dc5815 100644
--- a/src/Module/Settings/TwoFactor/Trusted.php
+++ b/src/Module/Settings/TwoFactor/Trusted.php
@@ -14,7 +14,7 @@ use UAParser\Parser;
  */
 class Trusted extends BaseSettings
 {
-	public static function init(array $parameters = [])
+	public static function init()
 	{
 		if (!local_user()) {
 			return;
@@ -32,7 +32,7 @@ class Trusted extends BaseSettings
 		}
 	}
 
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		if (!local_user()) {
 			return;
@@ -64,9 +64,9 @@ class Trusted extends BaseSettings
 	}
 
 
-	public static function content(array $parameters = []): string
+	public static function content(): string
 	{
-		parent::content($parameters);
+		parent::content();
 
 		$trustedBrowserRepository = new TwoFactor\Repository\TrustedBrowser(DI::dba(), DI::logger());
 		$trustedBrowsers = $trustedBrowserRepository->selectAllByUid(local_user());
diff --git a/src/Module/Settings/TwoFactor/Verify.php b/src/Module/Settings/TwoFactor/Verify.php
index a4106c260c..27c9631d4e 100644
--- a/src/Module/Settings/TwoFactor/Verify.php
+++ b/src/Module/Settings/TwoFactor/Verify.php
@@ -39,7 +39,7 @@ use PragmaRX\Google2FA\Google2FA;
  */
 class Verify extends BaseSettings
 {
-	public static function init(array $parameters = [])
+	public static function init()
 	{
 		if (!local_user()) {
 			return;
@@ -58,7 +58,7 @@ class Verify extends BaseSettings
 		}
 	}
 
-	public static function post(array $parameters = [])
+	public static function post()
 	{
 		if (!local_user()) {
 			return;
@@ -84,13 +84,13 @@ class Verify extends BaseSettings
 		}
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		if (!local_user()) {
 			return Login::form('settings/2fa/verify');
 		}
 
-		parent::content($parameters);
+		parent::content();
 
 		$company = 'Friendica';
 		$holder = Session::get('my_address');
diff --git a/src/Module/Settings/UserExport.php b/src/Module/Settings/UserExport.php
index aad76c4fbc..27e82c4cf8 100644
--- a/src/Module/Settings/UserExport.php
+++ b/src/Module/Settings/UserExport.php
@@ -47,18 +47,17 @@ class UserExport extends BaseSettings
 	 * If there is an action required through the URL / path, react
 	 * accordingly and export the requested data.
 	 *
-	 * @param array $parameters Router-supplied parameters
 	 * @return string
 	 * @throws HTTPException\ForbiddenException
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		if (!local_user()) {
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
 		}
 
-		parent::content($parameters);
+		parent::content();
 
 		/**
 		 * options shown on "Export personal data" page
@@ -84,10 +83,9 @@ class UserExport extends BaseSettings
 	 * to the browser which then offers a save / open dialog
 	 * to the user.
 	 *
-	 * @param array $parameters Router-supplied parameters
 	 * @throws HTTPException\ForbiddenException
 	 */
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		if (!DI::app()->isLoggedIn()) {
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
diff --git a/src/Module/Smilies.php b/src/Module/Smilies.php
index 8ee641b5a6..1ffff65c07 100644
--- a/src/Module/Smilies.php
+++ b/src/Module/Smilies.php
@@ -33,7 +33,7 @@ use Friendica\DI;
  */
 class Smilies extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		if (!empty(DI::args()->getArgv()[1]) && (DI::args()->getArgv()[1] === "json")) {
 			$smilies = Content\Smilies::getList();
@@ -45,7 +45,7 @@ class Smilies extends BaseModule
 		}
 	}
 
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		$smilies = Content\Smilies::getList();
 		$count = count($smilies['texts'] ?? []);
diff --git a/src/Module/Statistics.php b/src/Module/Statistics.php
index e9d9eca020..6b6e431650 100644
--- a/src/Module/Statistics.php
+++ b/src/Module/Statistics.php
@@ -28,14 +28,14 @@ use Friendica\Network\HTTPException\NotFoundException;
 
 class Statistics extends BaseModule
 {
-	public static function init(array $parameters = [])
+	public static function init()
 	{
 		if (!DI::config()->get("system", "nodeinfo")) {
 			throw new NotFoundException();
 		}
 	}
 
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$config = DI::config();
 		$logger = DI::logger();
diff --git a/src/Module/Theme.php b/src/Module/Theme.php
index 1282fc783f..201558ab79 100644
--- a/src/Module/Theme.php
+++ b/src/Module/Theme.php
@@ -30,11 +30,11 @@ use Friendica\Util\Strings;
  */
 class Theme extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		header('Content-Type: text/css');
 
-		$theme = Strings::sanitizeFilePathItem($parameters['theme']);
+		$theme = Strings::sanitizeFilePathItem(static::$parameters['theme']);
 
 		if (file_exists("view/theme/$theme/theme.php")) {
 			require_once "view/theme/$theme/theme.php";
diff --git a/src/Module/ThemeDetails.php b/src/Module/ThemeDetails.php
index 48c4174128..0f45af13c5 100644
--- a/src/Module/ThemeDetails.php
+++ b/src/Module/ThemeDetails.php
@@ -29,7 +29,7 @@ use Friendica\Core\Theme;
  */
 class ThemeDetails extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		if (!empty($_REQUEST['theme'])) {
 			$theme = $_REQUEST['theme'];
diff --git a/src/Module/ToggleMobile.php b/src/Module/ToggleMobile.php
index 11e8259d59..7cf53633a0 100644
--- a/src/Module/ToggleMobile.php
+++ b/src/Module/ToggleMobile.php
@@ -29,7 +29,7 @@ use Friendica\DI;
  */
 class ToggleMobile extends BaseModule
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		$a = DI::app();
 
diff --git a/src/Module/Tos.php b/src/Module/Tos.php
index 34834d41c1..1c91641f53 100644
--- a/src/Module/Tos.php
+++ b/src/Module/Tos.php
@@ -41,8 +41,10 @@ class Tos extends BaseModule
 	 * be properties of the class, however cannot be set directly as the property
 	 * cannot depend on a function result when declaring the variable.
 	 **/
-	public function __construct()
+	public function __construct(array $parameters = [])
 	{
+		parent::__construct($parameters);
+
 		$this->privacy_operate = DI::l10n()->t('At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), an username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but wont be visibly displayed. The listing of an account in the node\'s user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication.');
 		$this->privacy_distribute = DI::l10n()->t('This data is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional private data that may be transmitted to the communication partners accounts.');
 		$this->privacy_delete = DI::l10n()->t('At any point in time a logged in user can export their account data from the <a href="%1$s/settings/userexport">account settings</a>. If the user wants to delete their account they can do so at <a href="%1$s/removeme">%1$s/removeme</a>. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners.', DI::baseUrl());
@@ -58,7 +60,7 @@ class Tos extends BaseModule
 	 * dealings with their own node so a TOS is not necessary.
 	 *
 	 **/
-	public static function init(array $parameters = [])
+	public static function init()
 	{
 		if (strlen(DI::config()->get('system','singleuser'))) {
 			DI::baseUrl()->redirect('profile/' . DI::config()->get('system','singleuser'));
@@ -77,7 +79,7 @@ class Tos extends BaseModule
 	 * @return string
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function content(array $parameters = []) {
+	public static function content() {
 		$tpl = Renderer::getMarkupTemplate('tos.tpl');
 		if (DI::config()->get('system', 'tosdisplay')) {
 			return Renderer::replaceMacros($tpl, [
@@ -90,7 +92,7 @@ class Tos extends BaseModule
 				'$privacy_delete' => DI::l10n()->t('At any point in time a logged in user can export their account data from the <a href="%1$s/settings/userexport">account settings</a>. If the user wants to delete their account they can do so at <a href="%1$s/removeme">%1$s/removeme</a>. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners.', DI::baseUrl())
 			]);
 		} else {
-			return;
+			return '';
 		}
 	}
 }
diff --git a/src/Module/Update/Community.php b/src/Module/Update/Community.php
index 78d6f0bd35..84d2b3a9fc 100644
--- a/src/Module/Update/Community.php
+++ b/src/Module/Update/Community.php
@@ -33,9 +33,9 @@ use Friendica\Module\Conversation\Community as CommunityModule;
  */
 class Community extends CommunityModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
-		self::parseRequest($parameters);
+		self::parseRequest();
 
 		$o = '';
 		if (!empty($_GET['force']) || !DI::pConfig()->get(local_user(), 'system', 'no_auto_update')) {
diff --git a/src/Module/Update/Network.php b/src/Module/Update/Network.php
index df37c82a81..c6e5225d6f 100644
--- a/src/Module/Update/Network.php
+++ b/src/Module/Update/Network.php
@@ -9,13 +9,13 @@ use Friendica\Module\Conversation\Network as NetworkModule;
 
 class Network extends NetworkModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		if (!isset($_GET['p']) || !isset($_GET['item'])) {
 			exit();
 		}
 
-		self::parseRequest($parameters, $_GET);
+		self::parseRequest($_GET);
 
 		$profile_uid = intval($_GET['p']);
 
diff --git a/src/Module/Update/Profile.php b/src/Module/Update/Profile.php
index cc738f501e..2e9f676f83 100644
--- a/src/Module/Update/Profile.php
+++ b/src/Module/Update/Profile.php
@@ -35,7 +35,7 @@ use Friendica\Util\DateTimeFormat;
 
 class Profile extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$a = DI::app();
 
diff --git a/src/Module/Welcome.php b/src/Module/Welcome.php
index 1c8209b59f..c14df0160a 100644
--- a/src/Module/Welcome.php
+++ b/src/Module/Welcome.php
@@ -30,7 +30,7 @@ use Friendica\DI;
  */
 class Welcome extends BaseModule
 {
-	public static function content(array $parameters = [])
+	public static function content()
 	{
 		$config = DI::config();
 
diff --git a/src/Module/WellKnown/HostMeta.php b/src/Module/WellKnown/HostMeta.php
index 219eb3609b..14a3a17fe5 100644
--- a/src/Module/WellKnown/HostMeta.php
+++ b/src/Module/WellKnown/HostMeta.php
@@ -33,7 +33,7 @@ use Friendica\Util\Crypto;
  */
 class HostMeta extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$config = DI::config();
 
diff --git a/src/Module/WellKnown/NodeInfo.php b/src/Module/WellKnown/NodeInfo.php
index a8d0768929..f1d8164cb9 100644
--- a/src/Module/WellKnown/NodeInfo.php
+++ b/src/Module/WellKnown/NodeInfo.php
@@ -30,7 +30,7 @@ use Friendica\DI;
  */
 class NodeInfo extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		self::printWellKnown();
 	}
diff --git a/src/Module/WellKnown/SecurityTxt.php b/src/Module/WellKnown/SecurityTxt.php
index c0cdc4e515..317db50feb 100644
--- a/src/Module/WellKnown/SecurityTxt.php
+++ b/src/Module/WellKnown/SecurityTxt.php
@@ -29,7 +29,7 @@ use Friendica\BaseModule;
  */
 class SecurityTxt extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$name = 'security.txt';
 		$fp = fopen($name, 'rt');
diff --git a/src/Module/WellKnown/XSocialRelay.php b/src/Module/WellKnown/XSocialRelay.php
index 96968680dc..a66feac039 100644
--- a/src/Module/WellKnown/XSocialRelay.php
+++ b/src/Module/WellKnown/XSocialRelay.php
@@ -32,7 +32,7 @@ use Friendica\Protocol\Relay;
  */
 class XSocialRelay extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		$config = DI::config();
 
diff --git a/src/Module/Xrd.php b/src/Module/Xrd.php
index 66404f4567..459059a55f 100644
--- a/src/Module/Xrd.php
+++ b/src/Module/Xrd.php
@@ -36,7 +36,7 @@ use Friendica\Protocol\Salmon;
  */
 class Xrd extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	public static function rawContent()
 	{
 		// @TODO: Replace with parameter from router
 		if (DI::args()->getArgv()[0] == 'xrd') {

From 489cd0884ade34932fee45f136f77949bb3e3f91 Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Sun, 14 Nov 2021 23:13:47 +0100
Subject: [PATCH 03/17] Make BaseModule methods dynamic

---
 mod/display.php                               |  2 +-
 mod/unfollow.php                              |  2 +-
 src/App/Module.php                            | 14 ++++++-------
 src/App/Page.php                              |  8 ++++----
 src/BaseModule.php                            | 18 ++++++++---------
 src/Capabilities/ICanHandleRequests.php       | 20 +++++++++----------
 src/LegacyModule.php                          |  8 ++++----
 .../AccountManagementControlDocument.php      |  2 +-
 src/Module/Acctlink.php                       |  4 +++-
 src/Module/ActivityPub/Followers.php          |  2 +-
 src/Module/ActivityPub/Following.php          |  2 +-
 src/Module/ActivityPub/Inbox.php              |  2 +-
 src/Module/ActivityPub/Objects.php            |  2 +-
 src/Module/ActivityPub/Outbox.php             |  2 +-
 src/Module/Admin/Addons/Details.php           |  4 ++--
 src/Module/Admin/Addons/Index.php             |  2 +-
 src/Module/Admin/Blocklist/Contact.php        |  4 ++--
 src/Module/Admin/Blocklist/Server/Add.php     |  4 ++--
 src/Module/Admin/Blocklist/Server/Index.php   |  4 ++--
 src/Module/Admin/DBSync.php                   |  2 +-
 src/Module/Admin/Features.php                 |  4 ++--
 src/Module/Admin/Federation.php               |  2 +-
 src/Module/Admin/Item/Delete.php              |  4 ++--
 src/Module/Admin/Item/Source.php              |  2 +-
 src/Module/Admin/Logs/Settings.php            |  4 ++--
 src/Module/Admin/Logs/View.php                |  2 +-
 src/Module/Admin/PhpInfo.php                  |  2 +-
 src/Module/Admin/Queue.php                    |  2 +-
 src/Module/Admin/Site.php                     |  4 ++--
 src/Module/Admin/Storage.php                  |  4 ++--
 src/Module/Admin/Summary.php                  |  2 +-
 src/Module/Admin/Themes/Details.php           |  2 +-
 src/Module/Admin/Themes/Embed.php             |  6 +++---
 src/Module/Admin/Themes/Index.php             |  2 +-
 src/Module/Admin/Tos.php                      |  4 ++--
 src/Module/Admin/Users/Active.php             |  4 ++--
 src/Module/Admin/Users/Blocked.php            |  4 ++--
 src/Module/Admin/Users/Create.php             |  4 ++--
 src/Module/Admin/Users/Deleted.php            |  4 ++--
 src/Module/Admin/Users/Index.php              |  4 ++--
 src/Module/Admin/Users/Pending.php            |  4 ++--
 src/Module/Api/Friendica/Activity.php         |  2 +-
 .../Api/Friendica/DirectMessages/Setseen.php  |  2 +-
 src/Module/Api/Friendica/Events/Index.php     |  2 +-
 src/Module/Api/Friendica/Index.php            |  6 +++---
 src/Module/Api/Friendica/Notification.php     |  2 +-
 src/Module/Api/Friendica/Photo/Delete.php     |  2 +-
 .../Api/Friendica/Photoalbum/Delete.php       |  2 +-
 .../Api/Friendica/Photoalbum/Update.php       |  2 +-
 src/Module/Api/Friendica/Profile/Show.php     |  2 +-
 .../Api/GNUSocial/GNUSocial/Version.php       |  2 +-
 src/Module/Api/GNUSocial/Help/Test.php        |  2 +-
 src/Module/Api/Mastodon/Accounts.php          |  2 +-
 src/Module/Api/Mastodon/Accounts/Block.php    |  2 +-
 .../Api/Mastodon/Accounts/FeaturedTags.php    |  2 +-
 src/Module/Api/Mastodon/Accounts/Follow.php   |  2 +-
 .../Api/Mastodon/Accounts/Followers.php       |  2 +-
 .../Api/Mastodon/Accounts/Following.php       |  2 +-
 .../Api/Mastodon/Accounts/IdentityProofs.php  |  2 +-
 src/Module/Api/Mastodon/Accounts/Lists.php    |  2 +-
 src/Module/Api/Mastodon/Accounts/Mute.php     |  2 +-
 src/Module/Api/Mastodon/Accounts/Note.php     |  2 +-
 .../Api/Mastodon/Accounts/Relationships.php   |  2 +-
 src/Module/Api/Mastodon/Accounts/Search.php   |  2 +-
 src/Module/Api/Mastodon/Accounts/Statuses.php |  2 +-
 src/Module/Api/Mastodon/Accounts/Unblock.php  |  2 +-
 src/Module/Api/Mastodon/Accounts/Unfollow.php |  2 +-
 src/Module/Api/Mastodon/Accounts/Unmute.php   |  2 +-
 .../Mastodon/Accounts/UpdateCredentials.php   |  2 +-
 .../Mastodon/Accounts/VerifyCredentials.php   |  2 +-
 src/Module/Api/Mastodon/Announcements.php     |  2 +-
 src/Module/Api/Mastodon/Apps.php              |  2 +-
 .../Api/Mastodon/Apps/VerifyCredentials.php   |  2 +-
 src/Module/Api/Mastodon/Blocks.php            |  2 +-
 src/Module/Api/Mastodon/Bookmarks.php         |  2 +-
 src/Module/Api/Mastodon/Conversations.php     |  4 ++--
 .../Api/Mastodon/Conversations/Read.php       |  2 +-
 src/Module/Api/Mastodon/CustomEmojis.php      |  2 +-
 src/Module/Api/Mastodon/Directory.php         |  2 +-
 src/Module/Api/Mastodon/Endorsements.php      |  2 +-
 src/Module/Api/Mastodon/Favourited.php        |  2 +-
 src/Module/Api/Mastodon/Filters.php           |  4 ++--
 src/Module/Api/Mastodon/FollowRequests.php    |  4 ++--
 src/Module/Api/Mastodon/Instance.php          |  2 +-
 src/Module/Api/Mastodon/Instance/Peers.php    |  2 +-
 src/Module/Api/Mastodon/Instance/Rules.php    |  2 +-
 src/Module/Api/Mastodon/Lists.php             |  8 ++++----
 src/Module/Api/Mastodon/Lists/Accounts.php    |  6 +++---
 src/Module/Api/Mastodon/Markers.php           |  4 ++--
 src/Module/Api/Mastodon/Media.php             |  6 +++---
 src/Module/Api/Mastodon/Mutes.php             |  2 +-
 src/Module/Api/Mastodon/Notifications.php     |  2 +-
 .../Api/Mastodon/Notifications/Clear.php      |  2 +-
 .../Api/Mastodon/Notifications/Dismiss.php    |  2 +-
 src/Module/Api/Mastodon/Preferences.php       |  2 +-
 src/Module/Api/Mastodon/Proofs.php            |  2 +-
 src/Module/Api/Mastodon/PushSubscription.php  |  8 ++++----
 src/Module/Api/Mastodon/ScheduledStatuses.php |  6 +++---
 src/Module/Api/Mastodon/Search.php            |  2 +-
 src/Module/Api/Mastodon/Statuses.php          |  6 +++---
 src/Module/Api/Mastodon/Statuses/Bookmark.php |  2 +-
 src/Module/Api/Mastodon/Statuses/Card.php     |  2 +-
 src/Module/Api/Mastodon/Statuses/Context.php  |  2 +-
 .../Api/Mastodon/Statuses/Favourite.php       |  2 +-
 .../Api/Mastodon/Statuses/FavouritedBy.php    |  2 +-
 src/Module/Api/Mastodon/Statuses/Mute.php     |  2 +-
 src/Module/Api/Mastodon/Statuses/Pin.php      |  2 +-
 src/Module/Api/Mastodon/Statuses/Reblog.php   |  2 +-
 .../Api/Mastodon/Statuses/RebloggedBy.php     |  2 +-
 .../Api/Mastodon/Statuses/Unbookmark.php      |  2 +-
 .../Api/Mastodon/Statuses/Unfavourite.php     |  2 +-
 src/Module/Api/Mastodon/Statuses/Unmute.php   |  2 +-
 src/Module/Api/Mastodon/Statuses/Unpin.php    |  2 +-
 src/Module/Api/Mastodon/Statuses/Unreblog.php |  2 +-
 src/Module/Api/Mastodon/Suggestions.php       |  2 +-
 src/Module/Api/Mastodon/Timelines/Direct.php  |  2 +-
 src/Module/Api/Mastodon/Timelines/Home.php    |  2 +-
 .../Api/Mastodon/Timelines/ListTimeline.php   |  2 +-
 .../Api/Mastodon/Timelines/PublicTimeline.php |  2 +-
 src/Module/Api/Mastodon/Timelines/Tag.php     |  2 +-
 src/Module/Api/Mastodon/Trends.php            |  2 +-
 src/Module/Api/Mastodon/Unimplemented.php     | 10 +++++-----
 .../Api/Twitter/Account/RateLimitStatus.php   |  2 +-
 src/Module/Api/Twitter/ContactEndpoint.php    |  2 +-
 src/Module/Api/Twitter/FollowersIds.php       |  2 +-
 src/Module/Api/Twitter/FollowersList.php      |  2 +-
 src/Module/Api/Twitter/FriendsIds.php         |  2 +-
 src/Module/Api/Twitter/FriendsList.php        |  2 +-
 src/Module/Api/Twitter/SavedSearches.php      |  2 +-
 src/Module/Apps.php                           |  4 ++--
 src/Module/Attach.php                         |  2 +-
 src/Module/BaseAdmin.php                      |  2 +-
 src/Module/BaseApi.php                        |  8 ++++----
 src/Module/BaseNotifications.php              |  4 ++--
 src/Module/BaseSettings.php                   |  4 +++-
 src/Module/Bookmarklet.php                    |  2 +-
 src/Module/Contact.php                        |  4 ++--
 src/Module/Contact/Advanced.php               |  6 +++---
 src/Module/Contact/Contacts.php               |  2 +-
 src/Module/Contact/Hovercard.php              |  2 +-
 src/Module/Contact/Media.php                  |  2 +-
 src/Module/Contact/Poke.php                   |  4 ++--
 src/Module/Contact/Revoke.php                 |  6 +++---
 src/Module/Conversation/Community.php         |  2 +-
 src/Module/Conversation/Network.php           |  2 +-
 src/Module/Credits.php                        |  2 +-
 src/Module/DFRN/Notify.php                    |  2 +-
 src/Module/DFRN/Poll.php                      |  2 +-
 src/Module/Debug/ActivityPubConversion.php    |  2 +-
 src/Module/Debug/Babel.php                    |  2 +-
 src/Module/Debug/Feed.php                     |  4 ++--
 src/Module/Debug/ItemBody.php                 |  2 +-
 src/Module/Debug/Localtime.php                |  4 ++--
 src/Module/Debug/Probe.php                    |  2 +-
 src/Module/Debug/WebFinger.php                |  2 +-
 src/Module/Delegation.php                     |  4 ++--
 src/Module/Diaspora/Fetch.php                 |  2 +-
 src/Module/Diaspora/Receive.php               |  4 ++--
 src/Module/Directory.php                      |  2 +-
 src/Module/Events/Json.php                    |  2 +-
 src/Module/Feed.php                           |  2 +-
 src/Module/Filer/RemoveTag.php                |  6 ++++--
 src/Module/Filer/SaveTag.php                  |  4 ++--
 src/Module/FollowConfirm.php                  |  2 +-
 src/Module/FriendSuggest.php                  |  6 +++---
 src/Module/Friendica.php                      |  4 ++--
 src/Module/Group.php                          |  4 ++--
 src/Module/HCard.php                          |  2 +-
 src/Module/HTTPException/MethodNotAllowed.php |  2 +-
 src/Module/HTTPException/PageNotFound.php     |  2 +-
 src/Module/Hashtag.php                        |  4 +++-
 src/Module/Help.php                           |  2 +-
 src/Module/Home.php                           |  2 +-
 src/Module/Install.php                        |  6 +++---
 src/Module/Invite.php                         |  4 ++--
 src/Module/Item/Activity.php                  |  2 +-
 src/Module/Item/Compose.php                   |  4 ++--
 src/Module/Item/Follow.php                    |  2 +-
 src/Module/Item/Ignore.php                    |  2 +-
 src/Module/Item/Pin.php                       |  2 +-
 src/Module/Item/Star.php                      |  2 +-
 src/Module/Magic.php                          |  2 +-
 src/Module/Maintenance.php                    |  2 +-
 src/Module/Manifest.php                       |  2 +-
 src/Module/NoScrape.php                       |  2 +-
 src/Module/NodeInfo110.php                    |  2 +-
 src/Module/NodeInfo120.php                    |  2 +-
 src/Module/NodeInfo210.php                    |  2 +-
 src/Module/Notifications/Introductions.php    |  2 +-
 src/Module/Notifications/Notification.php     |  6 +++---
 src/Module/Notifications/Notifications.php    |  2 +-
 src/Module/OAuth/Acknowledge.php              |  4 ++--
 src/Module/OAuth/Authorize.php                |  4 ++--
 src/Module/OAuth/Revoke.php                   |  2 +-
 src/Module/OAuth/Token.php                    |  2 +-
 src/Module/Oembed.php                         |  2 +-
 src/Module/OpenSearch.php                     |  2 +-
 src/Module/Owa.php                            |  2 +-
 src/Module/ParseUrl.php                       |  2 +-
 src/Module/PermissionTooltip.php              |  2 +-
 src/Module/Photo.php                          |  2 +-
 src/Module/Profile/Common.php                 |  2 +-
 src/Module/Profile/Contacts.php               |  2 +-
 src/Module/Profile/Index.php                  |  8 ++++----
 src/Module/Profile/Media.php                  |  2 +-
 src/Module/Profile/Profile.php                |  4 ++--
 src/Module/Profile/Schedule.php               |  4 ++--
 src/Module/Profile/Status.php                 |  2 +-
 src/Module/Proxy.php                          |  2 +-
 src/Module/PublicRSAKey.php                   |  2 +-
 src/Module/RandomProfile.php                  |  4 +++-
 src/Module/ReallySimpleDiscovery.php          |  2 +-
 src/Module/Register.php                       |  4 ++--
 src/Module/RemoteFollow.php                   |  6 +++---
 src/Module/RobotsTxt.php                      |  2 +-
 src/Module/Search/Acl.php                     |  2 +-
 src/Module/Search/Directory.php               |  2 +-
 src/Module/Search/Filed.php                   |  2 +-
 src/Module/Search/Index.php                   |  2 +-
 src/Module/Search/Saved.php                   |  2 +-
 src/Module/Security/Login.php                 |  4 ++--
 src/Module/Security/Logout.php                |  2 +-
 src/Module/Security/OpenID.php                |  4 +++-
 src/Module/Security/TwoFactor/Recovery.php    |  6 +++---
 src/Module/Security/TwoFactor/Verify.php      |  4 ++--
 src/Module/Settings/Delegation.php            |  4 ++--
 src/Module/Settings/Display.php               |  4 ++--
 src/Module/Settings/Profile/Index.php         |  4 ++--
 src/Module/Settings/Profile/Photo/Crop.php    |  4 ++--
 src/Module/Settings/Profile/Photo/Index.php   |  4 ++--
 src/Module/Settings/TwoFactor/AppSpecific.php |  6 +++---
 src/Module/Settings/TwoFactor/Index.php       |  4 ++--
 src/Module/Settings/TwoFactor/Recovery.php    |  6 +++---
 src/Module/Settings/TwoFactor/Trusted.php     |  6 +++---
 src/Module/Settings/TwoFactor/Verify.php      |  6 +++---
 src/Module/Settings/UserExport.php            |  4 ++--
 src/Module/Smilies.php                        |  4 ++--
 src/Module/Special/HTTPException.php          |  4 ++--
 src/Module/Statistics.php                     |  4 ++--
 src/Module/Theme.php                          |  2 +-
 src/Module/ThemeDetails.php                   |  2 +-
 src/Module/ToggleMobile.php                   |  4 +++-
 src/Module/Tos.php                            |  4 ++--
 src/Module/Update/Community.php               |  2 +-
 src/Module/Update/Network.php                 |  2 +-
 src/Module/Update/Profile.php                 |  2 +-
 src/Module/Welcome.php                        |  2 +-
 src/Module/WellKnown/HostMeta.php             |  2 +-
 src/Module/WellKnown/NodeInfo.php             |  2 +-
 src/Module/WellKnown/SecurityTxt.php          |  2 +-
 src/Module/WellKnown/XSocialRelay.php         |  2 +-
 src/Module/Xrd.php                            |  2 +-
 tests/src/App/ModuleTest.php                  |  2 +-
 253 files changed, 397 insertions(+), 385 deletions(-)

diff --git a/mod/display.php b/mod/display.php
index b53dd35438..dce2a10ce7 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -40,7 +40,7 @@ use Friendica\Protocol\DFRN;
 function display_init(App $a)
 {
 	if (ActivityPub::isRequest()) {
-		Objects::rawContent(['guid' => DI::args()->getArgv()[1] ?? null]);
+		(new Objects(['guid' => DI::args()->getArgv()[1] ?? null]))->rawContent();
 	}
 
 	if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
diff --git a/mod/unfollow.php b/mod/unfollow.php
index 92bded2faa..6337211648 100644
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -122,7 +122,7 @@ function unfollow_process(string $url)
 
 	$owner = User::getOwnerDataById($uid);
 	if (!$owner) {
-		\Friendica\Module\Security\Logout::init();
+		(new \Friendica\Module\Security\Logout())->init();
 		// NOTREACHED
 	}
 
diff --git a/src/App/Module.php b/src/App/Module.php
index 0f0cfa6562..0ed4b53e57 100644
--- a/src/App/Module.php
+++ b/src/App/Module.php
@@ -297,32 +297,32 @@ class Module
 
 		Core\Hook::callAll($this->module . '_mod_init', $placeholder);
 
-		$this->module_class::init();
+		$this->module_class->init();
 
 		$profiler->set(microtime(true) - $timestamp, 'init');
 
 		if ($server['REQUEST_METHOD'] === Router::DELETE) {
-			$this->module_class::delete();
+			$this->module_class->delete();
 		}
 
 		if ($server['REQUEST_METHOD'] === Router::PATCH) {
-			$this->module_class::patch();
+			$this->module_class->patch();
 		}
 
 		if ($server['REQUEST_METHOD'] === Router::POST) {
 			Core\Hook::callAll($this->module . '_mod_post', $post);
-			$this->module_class::post();
+			$this->module_class->post();
 		}
 
 		if ($server['REQUEST_METHOD'] === Router::PUT) {
-			$this->module_class::put();
+			$this->module_class->put();
 		}
 
 		Core\Hook::callAll($this->module . '_mod_afterpost', $placeholder);
-		$this->module_class::afterpost();
+		$this->module_class->afterpost();
 
 		// "rawContent" is especially meant for technical endpoints.
 		// This endpoint doesn't need any theme initialization or other comparable stuff.
-		$this->module_class::rawContent();
+		$this->module_class->rawContent();
 	}
 }
diff --git a/src/App/Page.php b/src/App/Page.php
index c29517b1c7..d7e04ea7ce 100644
--- a/src/App/Page.php
+++ b/src/App/Page.php
@@ -350,13 +350,13 @@ class Page implements ArrayAccess
 			$moduleClass = $module->getClass();
 
 			$arr = ['content' => $content];
-			Hook::callAll( $moduleClass::getClassName() . '_mod_content', $arr);
+			Hook::callAll( $moduleClass->getClassName() . '_mod_content', $arr);
 			$content = $arr['content'];
-			$arr     = ['content' => $moduleClass::content()];
-			Hook::callAll($moduleClass::getClassName() . '_mod_aftercontent', $arr);
+			$arr     = ['content' => $moduleClass->content()];
+			Hook::callAll($moduleClass->getClassName() . '_mod_aftercontent', $arr);
 			$content .= $arr['content'];
 		} catch (HTTPException $e) {
-			$content = ModuleHTTPException::content($e);
+			$content = (new ModuleHTTPException())->content($e);
 		}
 
 		// initialise content region
diff --git a/src/BaseModule.php b/src/BaseModule.php
index b9db1953e5..76458c6c68 100644
--- a/src/BaseModule.php
+++ b/src/BaseModule.php
@@ -47,14 +47,14 @@ abstract class BaseModule implements ICanHandleRequests
 	/**
 	 * {@inheritDoc}
 	 */
-	public static function init()
+	public function init()
 	{
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		// echo '';
 		// exit;
@@ -63,7 +63,7 @@ abstract class BaseModule implements ICanHandleRequests
 	/**
 	 * {@inheritDoc}
 	 */
-	public static function content()
+	public function content(): string
 	{
 		return '';
 	}
@@ -71,21 +71,21 @@ abstract class BaseModule implements ICanHandleRequests
 	/**
 	 * {@inheritDoc}
 	 */
-	public static function delete()
+	public function delete()
 	{
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public static function patch()
+	public function patch()
 	{
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public static function post()
+	public function post()
 	{
 		// DI::baseurl()->redirect('module');
 	}
@@ -93,19 +93,19 @@ abstract class BaseModule implements ICanHandleRequests
 	/**
 	 * {@inheritDoc}
 	 */
-	public static function afterpost()
+	public function afterpost()
 	{
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public static function put()
+	public function put()
 	{
 	}
 
 	/** Gets the name of the current class */
-	public static function getClassName(): string
+	public function getClassName(): string
 	{
 		return static::class;
 	}
diff --git a/src/Capabilities/ICanHandleRequests.php b/src/Capabilities/ICanHandleRequests.php
index 1d44208775..2773404643 100644
--- a/src/Capabilities/ICanHandleRequests.php
+++ b/src/Capabilities/ICanHandleRequests.php
@@ -13,7 +13,7 @@ interface ICanHandleRequests
 	 * Extend this method if you need to do any shared processing before both
 	 * content() or post()
 	 */
-	public static function init();
+	public function init();
 
 	/**
 	 * Module GET method to display raw content from technical endpoints
@@ -21,7 +21,7 @@ interface ICanHandleRequests
 	 * Extend this method if the module is supposed to return communication data,
 	 * e.g. from protocol implementations.
 	 */
-	public static function rawContent();
+	public function rawContent();
 
 	/**
 	 * Module GET method to display any content
@@ -29,10 +29,8 @@ interface ICanHandleRequests
 	 * Extend this method if the module is supposed to return any display
 	 * through a GET request. It can be an HTML page through templating or a
 	 * XML feed or a JSON output.
-	 *
-	 * @return string
 	 */
-	public static function content();
+	public function content(): string;
 
 	/**
 	 * Module DELETE method to process submitted data
@@ -40,7 +38,7 @@ interface ICanHandleRequests
 	 * Extend this method if the module is supposed to process DELETE requests.
 	 * Doesn't display any content
 	 */
-	public static function delete();
+	public function delete();
 
 	/**
 	 * Module PATCH method to process submitted data
@@ -48,7 +46,7 @@ interface ICanHandleRequests
 	 * Extend this method if the module is supposed to process PATCH requests.
 	 * Doesn't display any content
 	 */
-	public static function patch();
+	public function patch();
 
 	/**
 	 * Module POST method to process submitted data
@@ -56,14 +54,14 @@ interface ICanHandleRequests
 	 * Extend this method if the module is supposed to process POST requests.
 	 * Doesn't display any content
 	 */
-	public static function post();
+	public function post();
 
 	/**
 	 * Called after post()
 	 *
 	 * Unknown purpose
 	 */
-	public static function afterpost();
+	public function afterpost();
 
 	/**
 	 * Module PUT method to process submitted data
@@ -71,7 +69,7 @@ interface ICanHandleRequests
 	 * Extend this method if the module is supposed to process PUT requests.
 	 * Doesn't display any content
 	 */
-	public static function put();
+	public function put();
 
-	public static function getClassName(): string;
+	public function getClassName(): string;
 }
diff --git a/src/LegacyModule.php b/src/LegacyModule.php
index ac4d5cd2c0..e90b004bc4 100644
--- a/src/LegacyModule.php
+++ b/src/LegacyModule.php
@@ -54,22 +54,22 @@ class LegacyModule extends BaseModule
 		require_once $file_path;
 	}
 
-	public static function init()
+	public function init()
 	{
 		self::runModuleFunction('init', static::$parameters);
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		return self::runModuleFunction('content', static::$parameters);
 	}
 
-	public static function post()
+	public function post()
 	{
 		self::runModuleFunction('post', static::$parameters);
 	}
 
-	public static function afterpost()
+	public function afterpost()
 	{
 		self::runModuleFunction('afterpost', static::$parameters);
 	}
diff --git a/src/Module/AccountManagementControlDocument.php b/src/Module/AccountManagementControlDocument.php
index 8c87343d55..8de9e80afb 100644
--- a/src/Module/AccountManagementControlDocument.php
+++ b/src/Module/AccountManagementControlDocument.php
@@ -30,7 +30,7 @@ use Friendica\BaseModule;
  */
 class AccountManagementControlDocument extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		$output = [
 			'version' => 1,
diff --git a/src/Module/Acctlink.php b/src/Module/Acctlink.php
index f8184c82f1..b14bbf8d70 100644
--- a/src/Module/Acctlink.php
+++ b/src/Module/Acctlink.php
@@ -30,7 +30,7 @@ use Friendica\Model\Contact;
  */
 class Acctlink extends BaseModule
 {
-	public static function content()
+	public function content(): string
 	{
 		$addr = trim($_GET['addr'] ?? '');
 
@@ -41,5 +41,7 @@ class Acctlink extends BaseModule
 				exit();
 			}
 		}
+
+		return '';
 	}
 }
diff --git a/src/Module/ActivityPub/Followers.php b/src/Module/ActivityPub/Followers.php
index 8c90b2ac06..e19e7eacfd 100644
--- a/src/Module/ActivityPub/Followers.php
+++ b/src/Module/ActivityPub/Followers.php
@@ -31,7 +31,7 @@ use Friendica\Protocol\ActivityPub;
  */
 class Followers extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		if (empty(static::$parameters['nickname'])) {
 			throw new \Friendica\Network\HTTPException\NotFoundException();
diff --git a/src/Module/ActivityPub/Following.php b/src/Module/ActivityPub/Following.php
index 08574b546f..2fa2d640f7 100644
--- a/src/Module/ActivityPub/Following.php
+++ b/src/Module/ActivityPub/Following.php
@@ -31,7 +31,7 @@ use Friendica\Protocol\ActivityPub;
  */
 class Following extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		if (empty(static::$parameters['nickname'])) {
 			throw new \Friendica\Network\HTTPException\NotFoundException();
diff --git a/src/Module/ActivityPub/Inbox.php b/src/Module/ActivityPub/Inbox.php
index 3e0ca18562..4056a7de3b 100644
--- a/src/Module/ActivityPub/Inbox.php
+++ b/src/Module/ActivityPub/Inbox.php
@@ -35,7 +35,7 @@ use Friendica\Util\Network;
  */
 class Inbox extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		$postdata = Network::postdata();
 
diff --git a/src/Module/ActivityPub/Objects.php b/src/Module/ActivityPub/Objects.php
index 826bfd10cf..eedcb0bd44 100644
--- a/src/Module/ActivityPub/Objects.php
+++ b/src/Module/ActivityPub/Objects.php
@@ -41,7 +41,7 @@ use Friendica\Util\Strings;
  */
 class Objects extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		if (empty(static::$parameters['guid'])) {
 			throw new HTTPException\BadRequestException();
diff --git a/src/Module/ActivityPub/Outbox.php b/src/Module/ActivityPub/Outbox.php
index a2ae10839d..55144ce1b0 100644
--- a/src/Module/ActivityPub/Outbox.php
+++ b/src/Module/ActivityPub/Outbox.php
@@ -31,7 +31,7 @@ use Friendica\Util\HTTPSignature;
  */
 class Outbox extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		if (empty(static::$parameters['nickname'])) {
 			throw new \Friendica\Network\HTTPException\NotFoundException();
diff --git a/src/Module/Admin/Addons/Details.php b/src/Module/Admin/Addons/Details.php
index dbb2a67a07..7748926cc8 100644
--- a/src/Module/Admin/Addons/Details.php
+++ b/src/Module/Admin/Addons/Details.php
@@ -30,7 +30,7 @@ use Friendica\Util\Strings;
 
 class Details extends BaseAdmin
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAdminAccess();
 
@@ -52,7 +52,7 @@ class Details extends BaseAdmin
 		DI::baseUrl()->redirect($redirect);
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		parent::content();
 
diff --git a/src/Module/Admin/Addons/Index.php b/src/Module/Admin/Addons/Index.php
index e018b7c70f..6330ee2cfa 100644
--- a/src/Module/Admin/Addons/Index.php
+++ b/src/Module/Admin/Addons/Index.php
@@ -28,7 +28,7 @@ use Friendica\Module\BaseAdmin;
 
 class Index extends BaseAdmin
 {
-	public static function content()
+	public function content(): string
 	{
 		parent::content();
 
diff --git a/src/Module/Admin/Blocklist/Contact.php b/src/Module/Admin/Blocklist/Contact.php
index 33041ee9bb..a0a5c282f8 100644
--- a/src/Module/Admin/Blocklist/Contact.php
+++ b/src/Module/Admin/Blocklist/Contact.php
@@ -32,7 +32,7 @@ use Friendica\Util\Network;
 
 class Contact extends BaseAdmin
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAdminAccess();
 
@@ -76,7 +76,7 @@ class Contact extends BaseAdmin
 		DI::baseUrl()->redirect('admin/blocklist/contact');
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		parent::content();
 
diff --git a/src/Module/Admin/Blocklist/Server/Add.php b/src/Module/Admin/Blocklist/Server/Add.php
index 56b7400f15..47c9016d90 100644
--- a/src/Module/Admin/Blocklist/Server/Add.php
+++ b/src/Module/Admin/Blocklist/Server/Add.php
@@ -32,7 +32,7 @@ use GuzzleHttp\Psr7\Uri;
 
 class Add extends BaseAdmin
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAdminAccess();
 
@@ -66,7 +66,7 @@ class Add extends BaseAdmin
 		DI::baseUrl()->redirect('admin/blocklist/server');
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		parent::content();
 
diff --git a/src/Module/Admin/Blocklist/Server/Index.php b/src/Module/Admin/Blocklist/Server/Index.php
index e819c9366f..ebd39d36a8 100644
--- a/src/Module/Admin/Blocklist/Server/Index.php
+++ b/src/Module/Admin/Blocklist/Server/Index.php
@@ -27,7 +27,7 @@ use Friendica\Module\BaseAdmin;
 
 class Index extends BaseAdmin
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAdminAccess();
 
@@ -56,7 +56,7 @@ class Index extends BaseAdmin
 		DI::baseUrl()->redirect('admin/blocklist/server');
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		parent::content();
 
diff --git a/src/Module/Admin/DBSync.php b/src/Module/Admin/DBSync.php
index ef9df44911..90588cfa91 100644
--- a/src/Module/Admin/DBSync.php
+++ b/src/Module/Admin/DBSync.php
@@ -30,7 +30,7 @@ use Friendica\Module\BaseAdmin;
 
 class DBSync extends BaseAdmin
 {
-	public static function content()
+	public function content(): string
 	{
 		parent::content();
 
diff --git a/src/Module/Admin/Features.php b/src/Module/Admin/Features.php
index 76bb35f53a..d2c8e2d83a 100644
--- a/src/Module/Admin/Features.php
+++ b/src/Module/Admin/Features.php
@@ -28,7 +28,7 @@ use Friendica\Module\BaseAdmin;
 
 class Features extends BaseAdmin
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAdminAccess();
 
@@ -60,7 +60,7 @@ class Features extends BaseAdmin
 		DI::baseUrl()->redirect('admin/features');
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		parent::content();
 
diff --git a/src/Module/Admin/Federation.php b/src/Module/Admin/Federation.php
index 9d0070e2d7..65d0453d93 100644
--- a/src/Module/Admin/Federation.php
+++ b/src/Module/Admin/Federation.php
@@ -28,7 +28,7 @@ use Friendica\Module\BaseAdmin;
 
 class Federation extends BaseAdmin
 {
-	public static function content()
+	public function content(): string
 	{
 		parent::content();
 
diff --git a/src/Module/Admin/Item/Delete.php b/src/Module/Admin/Item/Delete.php
index 9380b02e0b..91bb71932e 100644
--- a/src/Module/Admin/Item/Delete.php
+++ b/src/Module/Admin/Item/Delete.php
@@ -29,7 +29,7 @@ use Friendica\Util\Strings;
 
 class Delete extends BaseAdmin
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAdminAccess();
 
@@ -55,7 +55,7 @@ class Delete extends BaseAdmin
 		DI::baseUrl()->redirect('admin/item/delete');
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		parent::content();
 
diff --git a/src/Module/Admin/Item/Source.php b/src/Module/Admin/Item/Source.php
index a6dac1a1a1..9b81d9e766 100644
--- a/src/Module/Admin/Item/Source.php
+++ b/src/Module/Admin/Item/Source.php
@@ -29,7 +29,7 @@ use Friendica\Module\BaseAdmin;
 class Source extends BaseAdmin
 
 {
-	public static function content()
+	public function content(): string
 	{
 		parent::content();
 
diff --git a/src/Module/Admin/Logs/Settings.php b/src/Module/Admin/Logs/Settings.php
index faf7426638..aaf603f825 100644
--- a/src/Module/Admin/Logs/Settings.php
+++ b/src/Module/Admin/Logs/Settings.php
@@ -29,7 +29,7 @@ use Psr\Log\LogLevel;
 
 class Settings extends BaseAdmin
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAdminAccess();
 
@@ -56,7 +56,7 @@ class Settings extends BaseAdmin
 		DI::baseUrl()->redirect('admin/logs');
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		parent::content();
 
diff --git a/src/Module/Admin/Logs/View.php b/src/Module/Admin/Logs/View.php
index d1d44c00f5..3e312204b0 100644
--- a/src/Module/Admin/Logs/View.php
+++ b/src/Module/Admin/Logs/View.php
@@ -31,7 +31,7 @@ class View extends BaseAdmin
 {
 	const LIMIT = 500;
 
-	public static function content()
+	public function content(): string
 	{
 		parent::content();
 
diff --git a/src/Module/Admin/PhpInfo.php b/src/Module/Admin/PhpInfo.php
index 8bf15cb0e4..e6cad66c76 100644
--- a/src/Module/Admin/PhpInfo.php
+++ b/src/Module/Admin/PhpInfo.php
@@ -25,7 +25,7 @@ use Friendica\Module\BaseAdmin;
 
 class PhpInfo extends BaseAdmin
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAdminAccess();
 
diff --git a/src/Module/Admin/Queue.php b/src/Module/Admin/Queue.php
index 69c16c39d2..b3460c9aab 100644
--- a/src/Module/Admin/Queue.php
+++ b/src/Module/Admin/Queue.php
@@ -38,7 +38,7 @@ use Friendica\Util\DateTimeFormat;
  */
 class Queue extends BaseAdmin
 {
-	public static function content()
+	public function content(): string
 	{
 		parent::content();
 
diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php
index e8d463f809..27623880ae 100644
--- a/src/Module/Admin/Site.php
+++ b/src/Module/Admin/Site.php
@@ -43,7 +43,7 @@ require_once __DIR__ . '/../../../boot.php';
 
 class Site extends BaseAdmin
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAdminAccess();
 
@@ -384,7 +384,7 @@ class Site extends BaseAdmin
 		DI::baseUrl()->redirect('admin/site' . $active_panel);
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		parent::content();
 
diff --git a/src/Module/Admin/Storage.php b/src/Module/Admin/Storage.php
index 1f598c1a23..d0d9c3aa4e 100644
--- a/src/Module/Admin/Storage.php
+++ b/src/Module/Admin/Storage.php
@@ -31,7 +31,7 @@ use Friendica\Util\Strings;
 
 class Storage extends BaseAdmin
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAdminAccess();
 
@@ -91,7 +91,7 @@ class Storage extends BaseAdmin
 		DI::baseUrl()->redirect('admin/storage');
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		parent::content();
 
diff --git a/src/Module/Admin/Summary.php b/src/Module/Admin/Summary.php
index 1eeba4883d..5b2efca1e0 100644
--- a/src/Module/Admin/Summary.php
+++ b/src/Module/Admin/Summary.php
@@ -37,7 +37,7 @@ use Friendica\Util\DateTimeFormat;
 
 class Summary extends BaseAdmin
 {
-	public static function content()
+	public function content(): string
 	{
 		parent::content();
 
diff --git a/src/Module/Admin/Themes/Details.php b/src/Module/Admin/Themes/Details.php
index bd02572684..b81b76ab32 100644
--- a/src/Module/Admin/Themes/Details.php
+++ b/src/Module/Admin/Themes/Details.php
@@ -30,7 +30,7 @@ use Friendica\Util\Strings;
 
 class Details extends BaseAdmin
 {
-	public static function content()
+	public function content(): string
 	{
 		parent::content();
 
diff --git a/src/Module/Admin/Themes/Embed.php b/src/Module/Admin/Themes/Embed.php
index 59855b13b2..2779338022 100644
--- a/src/Module/Admin/Themes/Embed.php
+++ b/src/Module/Admin/Themes/Embed.php
@@ -28,7 +28,7 @@ use Friendica\Util\Strings;
 
 class Embed extends BaseAdmin
 {
-	public static function init()
+	public function init()
 	{
 		$theme = Strings::sanitizeFilePathItem(static::$parameters['theme']);
 		if (is_file("view/theme/$theme/config.php")) {
@@ -36,7 +36,7 @@ class Embed extends BaseAdmin
 		}
 	}
 
-	public static function post()
+	public function post()
 	{
 		self::checkAdminAccess();
 
@@ -56,7 +56,7 @@ class Embed extends BaseAdmin
 		DI::baseUrl()->redirect('admin/themes/' . $theme . '/embed?mode=minimal');
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		parent::content();
 
diff --git a/src/Module/Admin/Themes/Index.php b/src/Module/Admin/Themes/Index.php
index 7bd09695ec..ad4dfef94e 100644
--- a/src/Module/Admin/Themes/Index.php
+++ b/src/Module/Admin/Themes/Index.php
@@ -29,7 +29,7 @@ use Friendica\Util\Strings;
 
 class Index extends BaseAdmin
 {
-	public static function content()
+	public function content(): string
 	{
 		parent::content();
 
diff --git a/src/Module/Admin/Tos.php b/src/Module/Admin/Tos.php
index a31b403f97..3c0b00debc 100644
--- a/src/Module/Admin/Tos.php
+++ b/src/Module/Admin/Tos.php
@@ -27,7 +27,7 @@ use Friendica\Module\BaseAdmin;
 
 class Tos extends BaseAdmin
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAdminAccess();
 
@@ -48,7 +48,7 @@ class Tos extends BaseAdmin
 		DI::baseUrl()->redirect('admin/tos');
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		parent::content();
 
diff --git a/src/Module/Admin/Users/Active.php b/src/Module/Admin/Users/Active.php
index 4882ac4eb5..613c897649 100644
--- a/src/Module/Admin/Users/Active.php
+++ b/src/Module/Admin/Users/Active.php
@@ -30,7 +30,7 @@ use Friendica\Module\Admin\BaseUsers;
 
 class Active extends BaseUsers
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAdminAccess();
 
@@ -60,7 +60,7 @@ class Active extends BaseUsers
 		DI::baseUrl()->redirect(DI::args()->getQueryString());
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		parent::content();
 
diff --git a/src/Module/Admin/Users/Blocked.php b/src/Module/Admin/Users/Blocked.php
index 6b80081655..9ef6dab87d 100644
--- a/src/Module/Admin/Users/Blocked.php
+++ b/src/Module/Admin/Users/Blocked.php
@@ -31,7 +31,7 @@ use Friendica\Util\Temporal;
 
 class Blocked extends BaseUsers
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAdminAccess();
 
@@ -61,7 +61,7 @@ class Blocked extends BaseUsers
 		DI::baseUrl()->redirect('admin/users/blocked');
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		parent::content();
 
diff --git a/src/Module/Admin/Users/Create.php b/src/Module/Admin/Users/Create.php
index b808666030..71ab5b4cb9 100644
--- a/src/Module/Admin/Users/Create.php
+++ b/src/Module/Admin/Users/Create.php
@@ -28,7 +28,7 @@ use Friendica\Module\Admin\BaseUsers;
 
 class Create extends BaseUsers
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAdminAccess();
 
@@ -51,7 +51,7 @@ class Create extends BaseUsers
 		DI::baseUrl()->redirect('admin/users/create');
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		parent::content();
 
diff --git a/src/Module/Admin/Users/Deleted.php b/src/Module/Admin/Users/Deleted.php
index 8d71b4792a..6357b23963 100644
--- a/src/Module/Admin/Users/Deleted.php
+++ b/src/Module/Admin/Users/Deleted.php
@@ -33,7 +33,7 @@ use Friendica\Util\Temporal;
 
 class Deleted extends BaseUsers
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAdminAccess();
 
@@ -44,7 +44,7 @@ class Deleted extends BaseUsers
 		DI::baseUrl()->redirect('admin/users/deleted');
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		parent::content();
 
diff --git a/src/Module/Admin/Users/Index.php b/src/Module/Admin/Users/Index.php
index 1137b2cf96..dff00083b2 100644
--- a/src/Module/Admin/Users/Index.php
+++ b/src/Module/Admin/Users/Index.php
@@ -30,7 +30,7 @@ use Friendica\Module\Admin\BaseUsers;
 
 class Index extends BaseUsers
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAdminAccess();
 
@@ -67,7 +67,7 @@ class Index extends BaseUsers
 		DI::baseUrl()->redirect(DI::args()->getQueryString());
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		parent::content();
 
diff --git a/src/Module/Admin/Users/Pending.php b/src/Module/Admin/Users/Pending.php
index ef7d7b12ef..eb90db7b93 100644
--- a/src/Module/Admin/Users/Pending.php
+++ b/src/Module/Admin/Users/Pending.php
@@ -33,7 +33,7 @@ use Friendica\Util\Temporal;
 
 class Pending extends BaseUsers
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAdminAccess();
 
@@ -58,7 +58,7 @@ class Pending extends BaseUsers
 		DI::baseUrl()->redirect('admin/users/pending');
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		parent::content();
 
diff --git a/src/Module/Api/Friendica/Activity.php b/src/Module/Api/Friendica/Activity.php
index b80d0585bc..5f28297b42 100644
--- a/src/Module/Api/Friendica/Activity.php
+++ b/src/Module/Api/Friendica/Activity.php
@@ -40,7 +40,7 @@ use Friendica\Module\BaseApi;
  */
 class Activity extends BaseApi
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Friendica/DirectMessages/Setseen.php b/src/Module/Api/Friendica/DirectMessages/Setseen.php
index dfffe3bbf0..944376aad4 100644
--- a/src/Module/Api/Friendica/DirectMessages/Setseen.php
+++ b/src/Module/Api/Friendica/DirectMessages/Setseen.php
@@ -30,7 +30,7 @@ use Friendica\Module\BaseApi;
  */
 class Setseen extends BaseApi
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Friendica/Events/Index.php b/src/Module/Api/Friendica/Events/Index.php
index 8a610c9d18..439e021f36 100644
--- a/src/Module/Api/Friendica/Events/Index.php
+++ b/src/Module/Api/Friendica/Events/Index.php
@@ -33,7 +33,7 @@ use Friendica\Module\BaseApi;
  */
 class Index extends BaseApi
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Friendica/Index.php b/src/Module/Api/Friendica/Index.php
index b028d8bb6f..dbe45f545f 100644
--- a/src/Module/Api/Friendica/Index.php
+++ b/src/Module/Api/Friendica/Index.php
@@ -31,17 +31,17 @@ use Friendica\Module\BaseApi;
  */
 class Index extends BaseApi
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);		
 	}
 
-	public static function delete()
+	public function delete()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 	}
 
-	public static function rawContent()
+	public function rawContent()
 	{
 		echo api_call(DI::app());
 		exit();
diff --git a/src/Module/Api/Friendica/Notification.php b/src/Module/Api/Friendica/Notification.php
index 6dc4f78319..3057c8cb77 100644
--- a/src/Module/Api/Friendica/Notification.php
+++ b/src/Module/Api/Friendica/Notification.php
@@ -31,7 +31,7 @@ use Friendica\Object\Api\Friendica\Notification as ApiNotification;
  */
 class Notification extends BaseApi
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Friendica/Photo/Delete.php b/src/Module/Api/Friendica/Photo/Delete.php
index 4eb8e0dcc5..d982966258 100644
--- a/src/Module/Api/Friendica/Photo/Delete.php
+++ b/src/Module/Api/Friendica/Photo/Delete.php
@@ -33,7 +33,7 @@ use Friendica\Network\HTTPException\InternalServerErrorException;
  */
 class Delete extends BaseApi
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Friendica/Photoalbum/Delete.php b/src/Module/Api/Friendica/Photoalbum/Delete.php
index f6dc85fcea..01d05f44b0 100644
--- a/src/Module/Api/Friendica/Photoalbum/Delete.php
+++ b/src/Module/Api/Friendica/Photoalbum/Delete.php
@@ -34,7 +34,7 @@ use Friendica\Network\HTTPException\InternalServerErrorException;
  */
 class Delete extends BaseApi
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Friendica/Photoalbum/Update.php b/src/Module/Api/Friendica/Photoalbum/Update.php
index 311396db37..b45f6ced41 100644
--- a/src/Module/Api/Friendica/Photoalbum/Update.php
+++ b/src/Module/Api/Friendica/Photoalbum/Update.php
@@ -32,7 +32,7 @@ use Friendica\Network\HTTPException\InternalServerErrorException;
  */
 class Update extends BaseApi
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Friendica/Profile/Show.php b/src/Module/Api/Friendica/Profile/Show.php
index ae14c8d41a..a1280eb7c9 100644
--- a/src/Module/Api/Friendica/Profile/Show.php
+++ b/src/Module/Api/Friendica/Profile/Show.php
@@ -34,7 +34,7 @@ use Friendica\Network\HTTPException;
  */
 class Show extends BaseApi
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/GNUSocial/GNUSocial/Version.php b/src/Module/Api/GNUSocial/GNUSocial/Version.php
index 34fc3c6927..d8ff5c95fa 100644
--- a/src/Module/Api/GNUSocial/GNUSocial/Version.php
+++ b/src/Module/Api/GNUSocial/GNUSocial/Version.php
@@ -29,7 +29,7 @@ use Friendica\DI;
  */
 class Version extends BaseApi
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		DI::apiResponse()->exit('version', ['version' => '0.9.7'], static::$parameters['extension'] ?? null);
 	}
diff --git a/src/Module/Api/GNUSocial/Help/Test.php b/src/Module/Api/GNUSocial/Help/Test.php
index 6eedfc1ca9..d157822862 100644
--- a/src/Module/Api/GNUSocial/Help/Test.php
+++ b/src/Module/Api/GNUSocial/Help/Test.php
@@ -29,7 +29,7 @@ use Friendica\DI;
  */
 class Test extends BaseApi
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		if (!empty(static::$parameters['extension']) && (static::$parameters['extension'] == 'xml')) {
 			$ok = 'true';
diff --git a/src/Module/Api/Mastodon/Accounts.php b/src/Module/Api/Mastodon/Accounts.php
index 360993397a..13981684f0 100644
--- a/src/Module/Api/Mastodon/Accounts.php
+++ b/src/Module/Api/Mastodon/Accounts.php
@@ -35,7 +35,7 @@ class Accounts extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		$uid = self::getCurrentUserID();
 
diff --git a/src/Module/Api/Mastodon/Accounts/Block.php b/src/Module/Api/Mastodon/Accounts/Block.php
index c32862ca48..522eeb11f5 100644
--- a/src/Module/Api/Mastodon/Accounts/Block.php
+++ b/src/Module/Api/Mastodon/Accounts/Block.php
@@ -32,7 +32,7 @@ use Friendica\Module\BaseApi;
  */
 class Block extends BaseApi
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAllowedScope(self::SCOPE_FOLLOW);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Accounts/FeaturedTags.php b/src/Module/Api/Mastodon/Accounts/FeaturedTags.php
index cbb409d1b4..fe92696a08 100644
--- a/src/Module/Api/Mastodon/Accounts/FeaturedTags.php
+++ b/src/Module/Api/Mastodon/Accounts/FeaturedTags.php
@@ -32,7 +32,7 @@ class FeaturedTags extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 
diff --git a/src/Module/Api/Mastodon/Accounts/Follow.php b/src/Module/Api/Mastodon/Accounts/Follow.php
index b02ee18022..3ed7611724 100644
--- a/src/Module/Api/Mastodon/Accounts/Follow.php
+++ b/src/Module/Api/Mastodon/Accounts/Follow.php
@@ -31,7 +31,7 @@ use Friendica\Module\BaseApi;
  */
 class Follow extends BaseApi
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAllowedScope(self::SCOPE_FOLLOW);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Accounts/Followers.php b/src/Module/Api/Mastodon/Accounts/Followers.php
index 3d24da2dfa..3270da828c 100644
--- a/src/Module/Api/Mastodon/Accounts/Followers.php
+++ b/src/Module/Api/Mastodon/Accounts/Followers.php
@@ -34,7 +34,7 @@ class Followers extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Accounts/Following.php b/src/Module/Api/Mastodon/Accounts/Following.php
index d3d8047041..9768d2a039 100644
--- a/src/Module/Api/Mastodon/Accounts/Following.php
+++ b/src/Module/Api/Mastodon/Accounts/Following.php
@@ -34,7 +34,7 @@ class Following extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Accounts/IdentityProofs.php b/src/Module/Api/Mastodon/Accounts/IdentityProofs.php
index f36d656f5a..88379440ab 100644
--- a/src/Module/Api/Mastodon/Accounts/IdentityProofs.php
+++ b/src/Module/Api/Mastodon/Accounts/IdentityProofs.php
@@ -32,7 +32,7 @@ class IdentityProofs extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 
diff --git a/src/Module/Api/Mastodon/Accounts/Lists.php b/src/Module/Api/Mastodon/Accounts/Lists.php
index 3ec24bcc1a..4860c4fe53 100644
--- a/src/Module/Api/Mastodon/Accounts/Lists.php
+++ b/src/Module/Api/Mastodon/Accounts/Lists.php
@@ -35,7 +35,7 @@ class Lists extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Accounts/Mute.php b/src/Module/Api/Mastodon/Accounts/Mute.php
index b0b14a6146..159afdfd93 100644
--- a/src/Module/Api/Mastodon/Accounts/Mute.php
+++ b/src/Module/Api/Mastodon/Accounts/Mute.php
@@ -31,7 +31,7 @@ use Friendica\Module\BaseApi;
  */
 class Mute extends BaseApi
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAllowedScope(self::SCOPE_FOLLOW);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Accounts/Note.php b/src/Module/Api/Mastodon/Accounts/Note.php
index ae6e582e87..d14afbb484 100644
--- a/src/Module/Api/Mastodon/Accounts/Note.php
+++ b/src/Module/Api/Mastodon/Accounts/Note.php
@@ -32,7 +32,7 @@ use Friendica\Module\BaseApi;
  */
 class Note extends BaseApi
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Accounts/Relationships.php b/src/Module/Api/Mastodon/Accounts/Relationships.php
index 28135e5eba..451b7b49ec 100644
--- a/src/Module/Api/Mastodon/Accounts/Relationships.php
+++ b/src/Module/Api/Mastodon/Accounts/Relationships.php
@@ -34,7 +34,7 @@ class Relationships extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Accounts/Search.php b/src/Module/Api/Mastodon/Accounts/Search.php
index 6b9d2d43f9..fb3aafaec2 100644
--- a/src/Module/Api/Mastodon/Accounts/Search.php
+++ b/src/Module/Api/Mastodon/Accounts/Search.php
@@ -37,7 +37,7 @@ class Search extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Accounts/Statuses.php b/src/Module/Api/Mastodon/Accounts/Statuses.php
index c3252d59fe..1c95d74c7b 100644
--- a/src/Module/Api/Mastodon/Accounts/Statuses.php
+++ b/src/Module/Api/Mastodon/Accounts/Statuses.php
@@ -39,7 +39,7 @@ class Statuses extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		$uid = self::getCurrentUserID();
 
diff --git a/src/Module/Api/Mastodon/Accounts/Unblock.php b/src/Module/Api/Mastodon/Accounts/Unblock.php
index 26a1150424..aed46c3325 100644
--- a/src/Module/Api/Mastodon/Accounts/Unblock.php
+++ b/src/Module/Api/Mastodon/Accounts/Unblock.php
@@ -31,7 +31,7 @@ use Friendica\Module\BaseApi;
  */
 class Unblock extends BaseApi
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAllowedScope(self::SCOPE_FOLLOW);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Accounts/Unfollow.php b/src/Module/Api/Mastodon/Accounts/Unfollow.php
index cd7aef7ab1..78b6bad62e 100644
--- a/src/Module/Api/Mastodon/Accounts/Unfollow.php
+++ b/src/Module/Api/Mastodon/Accounts/Unfollow.php
@@ -31,7 +31,7 @@ use Friendica\Module\BaseApi;
  */
 class Unfollow extends BaseApi
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAllowedScope(self::SCOPE_FOLLOW);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Accounts/Unmute.php b/src/Module/Api/Mastodon/Accounts/Unmute.php
index eb1ad8bfa1..3e9146f218 100644
--- a/src/Module/Api/Mastodon/Accounts/Unmute.php
+++ b/src/Module/Api/Mastodon/Accounts/Unmute.php
@@ -31,7 +31,7 @@ use Friendica\Module\BaseApi;
  */
 class Unmute extends BaseApi
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAllowedScope(self::SCOPE_FOLLOW);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php b/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php
index 264a2a4a8b..2c55bff43e 100644
--- a/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php
+++ b/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php
@@ -32,7 +32,7 @@ use Friendica\Util\HTTPInputData;
  */
 class UpdateCredentials extends BaseApi
 {
-	public static function patch()
+	public function patch()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Accounts/VerifyCredentials.php b/src/Module/Api/Mastodon/Accounts/VerifyCredentials.php
index f91545ee10..0cce460375 100644
--- a/src/Module/Api/Mastodon/Accounts/VerifyCredentials.php
+++ b/src/Module/Api/Mastodon/Accounts/VerifyCredentials.php
@@ -35,7 +35,7 @@ class VerifyCredentials extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Announcements.php b/src/Module/Api/Mastodon/Announcements.php
index 23ad0feeb8..b8d231df6a 100644
--- a/src/Module/Api/Mastodon/Announcements.php
+++ b/src/Module/Api/Mastodon/Announcements.php
@@ -32,7 +32,7 @@ class Announcements extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 
diff --git a/src/Module/Api/Mastodon/Apps.php b/src/Module/Api/Mastodon/Apps.php
index adbcd723da..a00bd40857 100644
--- a/src/Module/Api/Mastodon/Apps.php
+++ b/src/Module/Api/Mastodon/Apps.php
@@ -35,7 +35,7 @@ class Apps extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function post()
+	public function post()
 	{
 		$request = self::getRequest([
 			'client_name'   => '',
diff --git a/src/Module/Api/Mastodon/Apps/VerifyCredentials.php b/src/Module/Api/Mastodon/Apps/VerifyCredentials.php
index baa3aa7faa..e9720da0f8 100644
--- a/src/Module/Api/Mastodon/Apps/VerifyCredentials.php
+++ b/src/Module/Api/Mastodon/Apps/VerifyCredentials.php
@@ -30,7 +30,7 @@ use Friendica\Module\BaseApi;
  */
 class VerifyCredentials extends BaseApi
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$application = self::getCurrentApplication();
diff --git a/src/Module/Api/Mastodon/Blocks.php b/src/Module/Api/Mastodon/Blocks.php
index fbcaf2ded3..c141b04823 100644
--- a/src/Module/Api/Mastodon/Blocks.php
+++ b/src/Module/Api/Mastodon/Blocks.php
@@ -34,7 +34,7 @@ class Blocks extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Bookmarks.php b/src/Module/Api/Mastodon/Bookmarks.php
index 6cfa087722..7b51e4316c 100644
--- a/src/Module/Api/Mastodon/Bookmarks.php
+++ b/src/Module/Api/Mastodon/Bookmarks.php
@@ -36,7 +36,7 @@ class Bookmarks extends BaseApi
 	/**
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Conversations.php b/src/Module/Api/Mastodon/Conversations.php
index af2632ae63..fbee5672ef 100644
--- a/src/Module/Api/Mastodon/Conversations.php
+++ b/src/Module/Api/Mastodon/Conversations.php
@@ -31,7 +31,7 @@ use Friendica\Module\BaseApi;
  */
 class Conversations extends BaseApi
 {
-	public static function delete()
+	public function delete()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
@@ -49,7 +49,7 @@ class Conversations extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Conversations/Read.php b/src/Module/Api/Mastodon/Conversations/Read.php
index b23a95b5e1..27f012c01b 100644
--- a/src/Module/Api/Mastodon/Conversations/Read.php
+++ b/src/Module/Api/Mastodon/Conversations/Read.php
@@ -31,7 +31,7 @@ use Friendica\Module\BaseApi;
  */
 class Read extends BaseApi
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/CustomEmojis.php b/src/Module/Api/Mastodon/CustomEmojis.php
index a16eedf2f3..1fedf53482 100644
--- a/src/Module/Api/Mastodon/CustomEmojis.php
+++ b/src/Module/Api/Mastodon/CustomEmojis.php
@@ -37,7 +37,7 @@ class CustomEmojis extends BaseApi
 	 * @throws \ImagickException
 	 * @see https://docs.joinmastodon.org/methods/accounts/follow_requests#pending-follows
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		$emojis = DI::mstdnEmoji()->createCollectionFromSmilies(Smilies::getList());
 
diff --git a/src/Module/Api/Mastodon/Directory.php b/src/Module/Api/Mastodon/Directory.php
index ec579d2da5..e48a709596 100644
--- a/src/Module/Api/Mastodon/Directory.php
+++ b/src/Module/Api/Mastodon/Directory.php
@@ -39,7 +39,7 @@ class Directory extends BaseApi
 	 * @throws \ImagickException
 	 * @see https://docs.joinmastodon.org/methods/instance/directory/
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		$request = self::getRequest([
 			'offset' => 0,        // How many accounts to skip before returning results. Default 0.
diff --git a/src/Module/Api/Mastodon/Endorsements.php b/src/Module/Api/Mastodon/Endorsements.php
index 5b90cc48a9..b9a5bc2cdb 100644
--- a/src/Module/Api/Mastodon/Endorsements.php
+++ b/src/Module/Api/Mastodon/Endorsements.php
@@ -32,7 +32,7 @@ class Endorsements extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		System::jsonExit([]);
 	}
diff --git a/src/Module/Api/Mastodon/Favourited.php b/src/Module/Api/Mastodon/Favourited.php
index f49d35a7bf..48aa452f24 100644
--- a/src/Module/Api/Mastodon/Favourited.php
+++ b/src/Module/Api/Mastodon/Favourited.php
@@ -37,7 +37,7 @@ class Favourited extends BaseApi
 	/**
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Filters.php b/src/Module/Api/Mastodon/Filters.php
index 365ed65f35..5bf50db1ab 100644
--- a/src/Module/Api/Mastodon/Filters.php
+++ b/src/Module/Api/Mastodon/Filters.php
@@ -31,7 +31,7 @@ use Friendica\Module\BaseApi;
  */
 class Filters extends BaseApi
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 
@@ -41,7 +41,7 @@ class Filters extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 
diff --git a/src/Module/Api/Mastodon/FollowRequests.php b/src/Module/Api/Mastodon/FollowRequests.php
index 2fb548b356..a334b897a8 100644
--- a/src/Module/Api/Mastodon/FollowRequests.php
+++ b/src/Module/Api/Mastodon/FollowRequests.php
@@ -42,7 +42,7 @@ class FollowRequests extends BaseApi
 	 * @see https://docs.joinmastodon.org/methods/accounts/follow_requests#accept-follow
 	 * @see https://docs.joinmastodon.org/methods/accounts/follow_requests#reject-follow
 	 */
-	public static function post()
+	public function post()
 	{
 		self::checkAllowedScope(self::SCOPE_FOLLOW);
 		$uid = self::getCurrentUserID();
@@ -82,7 +82,7 @@ class FollowRequests extends BaseApi
 	 * @throws \ImagickException
 	 * @see https://docs.joinmastodon.org/methods/accounts/follow_requests/
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Instance.php b/src/Module/Api/Mastodon/Instance.php
index 5f33458534..b7dc7d700d 100644
--- a/src/Module/Api/Mastodon/Instance.php
+++ b/src/Module/Api/Mastodon/Instance.php
@@ -33,7 +33,7 @@ class Instance extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		System::jsonExit(InstanceEntity::get());
 	}
diff --git a/src/Module/Api/Mastodon/Instance/Peers.php b/src/Module/Api/Mastodon/Instance/Peers.php
index 5d4642e0b4..b1fdd062bd 100644
--- a/src/Module/Api/Mastodon/Instance/Peers.php
+++ b/src/Module/Api/Mastodon/Instance/Peers.php
@@ -36,7 +36,7 @@ class Peers extends BaseApi
 	/**
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		$return = [];
 
diff --git a/src/Module/Api/Mastodon/Instance/Rules.php b/src/Module/Api/Mastodon/Instance/Rules.php
index bb5822702a..3063bf9ead 100644
--- a/src/Module/Api/Mastodon/Instance/Rules.php
+++ b/src/Module/Api/Mastodon/Instance/Rules.php
@@ -36,7 +36,7 @@ class Rules extends BaseApi
 	/**
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		$rules = [];
 		$id    = 0;
diff --git a/src/Module/Api/Mastodon/Lists.php b/src/Module/Api/Mastodon/Lists.php
index f977ce1039..8a3f7a0ad4 100644
--- a/src/Module/Api/Mastodon/Lists.php
+++ b/src/Module/Api/Mastodon/Lists.php
@@ -31,7 +31,7 @@ use Friendica\Model\Group;
  */
 class Lists extends BaseApi
 {
-	public static function delete()
+	public function delete()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
@@ -51,7 +51,7 @@ class Lists extends BaseApi
 		System::jsonExit([]);
 	}
 
-	public static function post()
+	public function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
@@ -74,7 +74,7 @@ class Lists extends BaseApi
 		System::jsonExit(DI::mstdnList()->createFromGroupId($id));
 	}
 
-	public static function put()
+	public function put()
 	{
 		$request = self::getRequest([
 			'title'          => '', // The title of the list to be updated.
@@ -91,7 +91,7 @@ class Lists extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Lists/Accounts.php b/src/Module/Api/Mastodon/Lists/Accounts.php
index 0e008602d4..cdc75b6d49 100644
--- a/src/Module/Api/Mastodon/Lists/Accounts.php
+++ b/src/Module/Api/Mastodon/Lists/Accounts.php
@@ -35,12 +35,12 @@ use Friendica\Module\BaseApi;
  */
 class Accounts extends BaseApi
 {
-	public static function delete()
+	public function delete()
 	{
 		DI::apiResponse()->unsupported(Router::DELETE);
 	}
 
-	public static function post()
+	public function post()
 	{
 		DI::apiResponse()->unsupported(Router::POST);
 	}
@@ -48,7 +48,7 @@ class Accounts extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Markers.php b/src/Module/Api/Mastodon/Markers.php
index 5843585e24..6a01a30cfa 100644
--- a/src/Module/Api/Mastodon/Markers.php
+++ b/src/Module/Api/Mastodon/Markers.php
@@ -31,7 +31,7 @@ use Friendica\Module\BaseApi;
  */
 class Markers extends BaseApi
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 
@@ -41,7 +41,7 @@ class Markers extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 
diff --git a/src/Module/Api/Mastodon/Media.php b/src/Module/Api/Mastodon/Media.php
index 65aa281392..cd858f5eeb 100644
--- a/src/Module/Api/Mastodon/Media.php
+++ b/src/Module/Api/Mastodon/Media.php
@@ -32,7 +32,7 @@ use Friendica\Module\BaseApi;
  */
 class Media extends BaseApi
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
@@ -53,7 +53,7 @@ class Media extends BaseApi
 		System::jsonExit(DI::mstdnAttachment()->createFromPhoto($media['id']));
 	}
 
-	public static function put()
+	public function put()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
@@ -82,7 +82,7 @@ class Media extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Mutes.php b/src/Module/Api/Mastodon/Mutes.php
index da9b75dd99..b5ba3fcfd5 100644
--- a/src/Module/Api/Mastodon/Mutes.php
+++ b/src/Module/Api/Mastodon/Mutes.php
@@ -34,7 +34,7 @@ class Mutes extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Notifications.php b/src/Module/Api/Mastodon/Notifications.php
index 3c2e0d4386..c2ddf2a4df 100644
--- a/src/Module/Api/Mastodon/Notifications.php
+++ b/src/Module/Api/Mastodon/Notifications.php
@@ -40,7 +40,7 @@ class Notifications extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Notifications/Clear.php b/src/Module/Api/Mastodon/Notifications/Clear.php
index 93639d8a63..4249791579 100644
--- a/src/Module/Api/Mastodon/Notifications/Clear.php
+++ b/src/Module/Api/Mastodon/Notifications/Clear.php
@@ -30,7 +30,7 @@ use Friendica\Module\BaseApi;
  */
 class Clear extends BaseApi
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Notifications/Dismiss.php b/src/Module/Api/Mastodon/Notifications/Dismiss.php
index e3fc3290a1..b135b5bbf5 100644
--- a/src/Module/Api/Mastodon/Notifications/Dismiss.php
+++ b/src/Module/Api/Mastodon/Notifications/Dismiss.php
@@ -32,7 +32,7 @@ use Friendica\Network\HTTPException\ForbiddenException;
  */
 class Dismiss extends BaseApi
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Preferences.php b/src/Module/Api/Mastodon/Preferences.php
index 21361e1f37..6d846c35bc 100644
--- a/src/Module/Api/Mastodon/Preferences.php
+++ b/src/Module/Api/Mastodon/Preferences.php
@@ -34,7 +34,7 @@ class Preferences extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Proofs.php b/src/Module/Api/Mastodon/Proofs.php
index 9bdc77f490..c9b92246a8 100644
--- a/src/Module/Api/Mastodon/Proofs.php
+++ b/src/Module/Api/Mastodon/Proofs.php
@@ -32,7 +32,7 @@ class Proofs extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		System::jsonError(404, ['error' => 'Record not found']);
 	}
diff --git a/src/Module/Api/Mastodon/PushSubscription.php b/src/Module/Api/Mastodon/PushSubscription.php
index 7150416439..e45c943f52 100644
--- a/src/Module/Api/Mastodon/PushSubscription.php
+++ b/src/Module/Api/Mastodon/PushSubscription.php
@@ -33,7 +33,7 @@ use Friendica\Object\Api\Mastodon\Notification;
  */
 class PushSubscription extends BaseApi
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAllowedScope(self::SCOPE_PUSH);
 		$uid         = self::getCurrentUserID();
@@ -66,7 +66,7 @@ class PushSubscription extends BaseApi
 		return DI::mstdnSubscription()->createForApplicationIdAndUserId($application['id'], $uid)->toArray();
 	}
 
-	public static function put()
+	public function put()
 	{
 		self::checkAllowedScope(self::SCOPE_PUSH);
 		$uid         = self::getCurrentUserID();
@@ -99,7 +99,7 @@ class PushSubscription extends BaseApi
 		return DI::mstdnSubscription()->createForApplicationIdAndUserId($application['id'], $uid)->toArray();
 	}
 
-	public static function delete()
+	public function delete()
 	{
 		self::checkAllowedScope(self::SCOPE_PUSH);
 		$uid         = self::getCurrentUserID();
@@ -112,7 +112,7 @@ class PushSubscription extends BaseApi
 		System::jsonExit([]);
 	}
 
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_PUSH);
 		$uid         = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/ScheduledStatuses.php b/src/Module/Api/Mastodon/ScheduledStatuses.php
index 6a4971860f..b229293819 100644
--- a/src/Module/Api/Mastodon/ScheduledStatuses.php
+++ b/src/Module/Api/Mastodon/ScheduledStatuses.php
@@ -34,7 +34,7 @@ use Friendica\Module\BaseApi;
  */
 class ScheduledStatuses extends BaseApi
 {
-	public static function put()
+	public function put()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
@@ -42,7 +42,7 @@ class ScheduledStatuses extends BaseApi
 		DI::apiResponse()->unsupported(Router::PUT);
 	}
 
-	public static function delete()
+	public function delete()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
@@ -63,7 +63,7 @@ class ScheduledStatuses extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Search.php b/src/Module/Api/Mastodon/Search.php
index d17db271fd..dc7c856ac6 100644
--- a/src/Module/Api/Mastodon/Search.php
+++ b/src/Module/Api/Mastodon/Search.php
@@ -40,7 +40,7 @@ class Search extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Statuses.php b/src/Module/Api/Mastodon/Statuses.php
index 75e22802e2..8ffeef07a2 100644
--- a/src/Module/Api/Mastodon/Statuses.php
+++ b/src/Module/Api/Mastodon/Statuses.php
@@ -41,7 +41,7 @@ use Friendica\Util\Images;
  */
 class Statuses extends BaseApi
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
@@ -207,7 +207,7 @@ class Statuses extends BaseApi
 		DI::mstdnError()->InternalError();
 	}
 
-	public static function delete()
+	public function delete()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
@@ -231,7 +231,7 @@ class Statuses extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		$uid = self::getCurrentUserID();
 
diff --git a/src/Module/Api/Mastodon/Statuses/Bookmark.php b/src/Module/Api/Mastodon/Statuses/Bookmark.php
index e12c6ecd22..4d2f096cd0 100644
--- a/src/Module/Api/Mastodon/Statuses/Bookmark.php
+++ b/src/Module/Api/Mastodon/Statuses/Bookmark.php
@@ -33,7 +33,7 @@ use Friendica\Module\BaseApi;
  */
 class Bookmark extends BaseApi
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Statuses/Card.php b/src/Module/Api/Mastodon/Statuses/Card.php
index 3c8cf706ed..698dfab8c5 100644
--- a/src/Module/Api/Mastodon/Statuses/Card.php
+++ b/src/Module/Api/Mastodon/Statuses/Card.php
@@ -35,7 +35,7 @@ class Card extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		$uid = self::getCurrentUserID();
 
diff --git a/src/Module/Api/Mastodon/Statuses/Context.php b/src/Module/Api/Mastodon/Statuses/Context.php
index b8a8007212..da59bb1d96 100644
--- a/src/Module/Api/Mastodon/Statuses/Context.php
+++ b/src/Module/Api/Mastodon/Statuses/Context.php
@@ -35,7 +35,7 @@ class Context extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		$uid = self::getCurrentUserID();
 
diff --git a/src/Module/Api/Mastodon/Statuses/Favourite.php b/src/Module/Api/Mastodon/Statuses/Favourite.php
index 00844c544b..3fe55807b6 100644
--- a/src/Module/Api/Mastodon/Statuses/Favourite.php
+++ b/src/Module/Api/Mastodon/Statuses/Favourite.php
@@ -33,7 +33,7 @@ use Friendica\Module\BaseApi;
  */
 class Favourite extends BaseApi
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Statuses/FavouritedBy.php b/src/Module/Api/Mastodon/Statuses/FavouritedBy.php
index 5a1a6116a3..b6726cc54d 100644
--- a/src/Module/Api/Mastodon/Statuses/FavouritedBy.php
+++ b/src/Module/Api/Mastodon/Statuses/FavouritedBy.php
@@ -35,7 +35,7 @@ class FavouritedBy extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		$uid = self::getCurrentUserID();
 
diff --git a/src/Module/Api/Mastodon/Statuses/Mute.php b/src/Module/Api/Mastodon/Statuses/Mute.php
index f9200197f0..739126d581 100644
--- a/src/Module/Api/Mastodon/Statuses/Mute.php
+++ b/src/Module/Api/Mastodon/Statuses/Mute.php
@@ -32,7 +32,7 @@ use Friendica\Module\BaseApi;
  */
 class Mute extends BaseApi
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Statuses/Pin.php b/src/Module/Api/Mastodon/Statuses/Pin.php
index bf6f5bb399..b7573fd9d1 100644
--- a/src/Module/Api/Mastodon/Statuses/Pin.php
+++ b/src/Module/Api/Mastodon/Statuses/Pin.php
@@ -32,7 +32,7 @@ use Friendica\Module\BaseApi;
  */
 class Pin extends BaseApi
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Statuses/Reblog.php b/src/Module/Api/Mastodon/Statuses/Reblog.php
index 0bba905f76..136491bf26 100644
--- a/src/Module/Api/Mastodon/Statuses/Reblog.php
+++ b/src/Module/Api/Mastodon/Statuses/Reblog.php
@@ -35,7 +35,7 @@ use Friendica\Module\BaseApi;
  */
 class Reblog extends BaseApi
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Statuses/RebloggedBy.php b/src/Module/Api/Mastodon/Statuses/RebloggedBy.php
index 06431969ad..de2004b861 100644
--- a/src/Module/Api/Mastodon/Statuses/RebloggedBy.php
+++ b/src/Module/Api/Mastodon/Statuses/RebloggedBy.php
@@ -35,7 +35,7 @@ class RebloggedBy extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		$uid = self::getCurrentUserID();
 
diff --git a/src/Module/Api/Mastodon/Statuses/Unbookmark.php b/src/Module/Api/Mastodon/Statuses/Unbookmark.php
index 0ddc5891d8..d6bd6fcc8c 100644
--- a/src/Module/Api/Mastodon/Statuses/Unbookmark.php
+++ b/src/Module/Api/Mastodon/Statuses/Unbookmark.php
@@ -33,7 +33,7 @@ use Friendica\Module\BaseApi;
  */
 class Unbookmark extends BaseApi
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Statuses/Unfavourite.php b/src/Module/Api/Mastodon/Statuses/Unfavourite.php
index 4d6460d444..244b38cd1d 100644
--- a/src/Module/Api/Mastodon/Statuses/Unfavourite.php
+++ b/src/Module/Api/Mastodon/Statuses/Unfavourite.php
@@ -33,7 +33,7 @@ use Friendica\Module\BaseApi;
  */
 class Unfavourite extends BaseApi
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Statuses/Unmute.php b/src/Module/Api/Mastodon/Statuses/Unmute.php
index 715462880c..a659b5b079 100644
--- a/src/Module/Api/Mastodon/Statuses/Unmute.php
+++ b/src/Module/Api/Mastodon/Statuses/Unmute.php
@@ -32,7 +32,7 @@ use Friendica\Module\BaseApi;
  */
 class Unmute extends BaseApi
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Statuses/Unpin.php b/src/Module/Api/Mastodon/Statuses/Unpin.php
index 80afaf7015..1eaf73409a 100644
--- a/src/Module/Api/Mastodon/Statuses/Unpin.php
+++ b/src/Module/Api/Mastodon/Statuses/Unpin.php
@@ -32,7 +32,7 @@ use Friendica\Module\BaseApi;
  */
 class Unpin extends BaseApi
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Statuses/Unreblog.php b/src/Module/Api/Mastodon/Statuses/Unreblog.php
index f00d762558..234d1058f3 100644
--- a/src/Module/Api/Mastodon/Statuses/Unreblog.php
+++ b/src/Module/Api/Mastodon/Statuses/Unreblog.php
@@ -35,7 +35,7 @@ use Friendica\Module\BaseApi;
  */
 class Unreblog extends BaseApi
 {
-	public static function post()
+	public function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Suggestions.php b/src/Module/Api/Mastodon/Suggestions.php
index e7999040ba..b80c239f63 100644
--- a/src/Module/Api/Mastodon/Suggestions.php
+++ b/src/Module/Api/Mastodon/Suggestions.php
@@ -34,7 +34,7 @@ class Suggestions extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Timelines/Direct.php b/src/Module/Api/Mastodon/Timelines/Direct.php
index 5f8a2e0d74..d50c97f47e 100644
--- a/src/Module/Api/Mastodon/Timelines/Direct.php
+++ b/src/Module/Api/Mastodon/Timelines/Direct.php
@@ -35,7 +35,7 @@ class Direct extends BaseApi
 	/**
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Timelines/Home.php b/src/Module/Api/Mastodon/Timelines/Home.php
index 7b53171e16..de21bb2a12 100644
--- a/src/Module/Api/Mastodon/Timelines/Home.php
+++ b/src/Module/Api/Mastodon/Timelines/Home.php
@@ -36,7 +36,7 @@ class Home extends BaseApi
 	/**
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Timelines/ListTimeline.php b/src/Module/Api/Mastodon/Timelines/ListTimeline.php
index 9e32190388..6d58153119 100644
--- a/src/Module/Api/Mastodon/Timelines/ListTimeline.php
+++ b/src/Module/Api/Mastodon/Timelines/ListTimeline.php
@@ -36,7 +36,7 @@ class ListTimeline extends BaseApi
 	/**
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Timelines/PublicTimeline.php b/src/Module/Api/Mastodon/Timelines/PublicTimeline.php
index aa55310a7f..162236d1ea 100644
--- a/src/Module/Api/Mastodon/Timelines/PublicTimeline.php
+++ b/src/Module/Api/Mastodon/Timelines/PublicTimeline.php
@@ -39,7 +39,7 @@ class PublicTimeline extends BaseApi
 	/**
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		$uid = self::getCurrentUserID();
 
diff --git a/src/Module/Api/Mastodon/Timelines/Tag.php b/src/Module/Api/Mastodon/Timelines/Tag.php
index 3d87e00948..80ccf5a9c2 100644
--- a/src/Module/Api/Mastodon/Timelines/Tag.php
+++ b/src/Module/Api/Mastodon/Timelines/Tag.php
@@ -37,7 +37,7 @@ class Tag extends BaseApi
 	/**
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Api/Mastodon/Trends.php b/src/Module/Api/Mastodon/Trends.php
index c7bfa02891..3536e737cb 100644
--- a/src/Module/Api/Mastodon/Trends.php
+++ b/src/Module/Api/Mastodon/Trends.php
@@ -34,7 +34,7 @@ class Trends extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		$request = self::getRequest([
 			'limit' => 20, // Maximum number of results to return. Defaults to 10.
diff --git a/src/Module/Api/Mastodon/Unimplemented.php b/src/Module/Api/Mastodon/Unimplemented.php
index d346dc7577..f5f76afd57 100644
--- a/src/Module/Api/Mastodon/Unimplemented.php
+++ b/src/Module/Api/Mastodon/Unimplemented.php
@@ -33,7 +33,7 @@ class Unimplemented extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function delete()
+	public function delete()
 	{
 		DI::apiResponse()->unsupported(Router::DELETE);
 	}
@@ -41,7 +41,7 @@ class Unimplemented extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function patch()
+	public function patch()
 	{
 		DI::apiResponse()->unsupported(Router::PATCH);
 	}
@@ -49,7 +49,7 @@ class Unimplemented extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function post()
+	public function post()
 	{
 		DI::apiResponse()->unsupported(Router::POST);
 	}
@@ -57,7 +57,7 @@ class Unimplemented extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function put()
+	public function put()
 	{
 		DI::apiResponse()->unsupported(Router::PUT);
 	}
@@ -65,7 +65,7 @@ class Unimplemented extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		DI::apiResponse()->unsupported(Router::GET);
 	}
diff --git a/src/Module/Api/Twitter/Account/RateLimitStatus.php b/src/Module/Api/Twitter/Account/RateLimitStatus.php
index 8dca51c43e..fa1383b8e0 100644
--- a/src/Module/Api/Twitter/Account/RateLimitStatus.php
+++ b/src/Module/Api/Twitter/Account/RateLimitStatus.php
@@ -30,7 +30,7 @@ use Friendica\Util\DateTimeFormat;
  */
 class RateLimitStatus extends BaseApi
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		if (!empty(static::$parameters['extension']) && (static::$parameters['extension'] == 'xml')) {
 			$hash = [
diff --git a/src/Module/Api/Twitter/ContactEndpoint.php b/src/Module/Api/Twitter/ContactEndpoint.php
index ddbbfc027a..39e6d2d457 100644
--- a/src/Module/Api/Twitter/ContactEndpoint.php
+++ b/src/Module/Api/Twitter/ContactEndpoint.php
@@ -35,7 +35,7 @@ abstract class ContactEndpoint extends BaseApi
 	const DEFAULT_COUNT = 20;
 	const MAX_COUNT = 200;
 
-	public static function init()
+	public function init()
 	{
 		parent::init();
 
diff --git a/src/Module/Api/Twitter/FollowersIds.php b/src/Module/Api/Twitter/FollowersIds.php
index 0318b5a686..f4287dc440 100644
--- a/src/Module/Api/Twitter/FollowersIds.php
+++ b/src/Module/Api/Twitter/FollowersIds.php
@@ -29,7 +29,7 @@ use Friendica\Model\Contact;
  */
 class FollowersIds extends ContactEndpoint
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		// Expected value for user_id parameter: public/user contact id
 		$contact_id    = filter_input(INPUT_GET, 'user_id'      , FILTER_VALIDATE_INT);
diff --git a/src/Module/Api/Twitter/FollowersList.php b/src/Module/Api/Twitter/FollowersList.php
index 53e56e88ee..72d2bbdcb0 100644
--- a/src/Module/Api/Twitter/FollowersList.php
+++ b/src/Module/Api/Twitter/FollowersList.php
@@ -29,7 +29,7 @@ use Friendica\Model\Contact;
  */
 class FollowersList extends ContactEndpoint
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		// Expected value for user_id parameter: public/user contact id
 		$contact_id    = filter_input(INPUT_GET, 'user_id'      , FILTER_VALIDATE_INT);
diff --git a/src/Module/Api/Twitter/FriendsIds.php b/src/Module/Api/Twitter/FriendsIds.php
index 4df2f7068e..e3e9a35a38 100644
--- a/src/Module/Api/Twitter/FriendsIds.php
+++ b/src/Module/Api/Twitter/FriendsIds.php
@@ -29,7 +29,7 @@ use Friendica\Model\Contact;
  */
 class FriendsIds extends ContactEndpoint
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		// Expected value for user_id parameter: public/user contact id
 		$contact_id    = filter_input(INPUT_GET, 'user_id'      , FILTER_VALIDATE_INT);
diff --git a/src/Module/Api/Twitter/FriendsList.php b/src/Module/Api/Twitter/FriendsList.php
index 59ae03601b..764bfd8078 100644
--- a/src/Module/Api/Twitter/FriendsList.php
+++ b/src/Module/Api/Twitter/FriendsList.php
@@ -29,7 +29,7 @@ use Friendica\Model\Contact;
  */
 class FriendsList extends ContactEndpoint
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		// Expected value for user_id parameter: public/user contact id
 		$contact_id    = filter_input(INPUT_GET, 'user_id'      , FILTER_VALIDATE_INT);
diff --git a/src/Module/Api/Twitter/SavedSearches.php b/src/Module/Api/Twitter/SavedSearches.php
index d978af807f..8c513a960c 100644
--- a/src/Module/Api/Twitter/SavedSearches.php
+++ b/src/Module/Api/Twitter/SavedSearches.php
@@ -31,7 +31,7 @@ use Friendica\Module\BaseApi;
  */
 class SavedSearches extends BaseApi
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
diff --git a/src/Module/Apps.php b/src/Module/Apps.php
index dc3d1d10d7..1d6144f16d 100644
--- a/src/Module/Apps.php
+++ b/src/Module/Apps.php
@@ -31,7 +31,7 @@ use Friendica\DI;
  */
 class Apps extends BaseModule
 {
-	public static function init()
+	public function init()
 	{
 		$privateaddons = DI::config()->get('config', 'private_addons');
 		if ($privateaddons === "1" && !local_user()) {
@@ -39,7 +39,7 @@ class Apps extends BaseModule
 		}
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		$apps = Nav::getAppMenu();
 
diff --git a/src/Module/Attach.php b/src/Module/Attach.php
index 4f9da85c92..84961ca276 100644
--- a/src/Module/Attach.php
+++ b/src/Module/Attach.php
@@ -34,7 +34,7 @@ class Attach extends BaseModule
 	/**
 	 * Return to user an attached file given the id
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		$a = DI::app();
 		if (empty(static::$parameters['item'])) {
diff --git a/src/Module/BaseAdmin.php b/src/Module/BaseAdmin.php
index 822b6bdf5c..83e3ca0b17 100644
--- a/src/Module/BaseAdmin.php
+++ b/src/Module/BaseAdmin.php
@@ -68,7 +68,7 @@ abstract class BaseAdmin extends BaseModule
 		}
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		self::checkAdminAccess(true);
 
diff --git a/src/Module/BaseApi.php b/src/Module/BaseApi.php
index b42e9462dc..87a6908142 100644
--- a/src/Module/BaseApi.php
+++ b/src/Module/BaseApi.php
@@ -53,7 +53,7 @@ class BaseApi extends BaseModule
 	 */
 	protected static $request = [];
 
-	public static function delete()
+	public function delete()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 
@@ -62,7 +62,7 @@ class BaseApi extends BaseModule
 		}
 	}
 
-	public static function patch()
+	public function patch()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 
@@ -71,7 +71,7 @@ class BaseApi extends BaseModule
 		}
 	}
 
-	public static function post()
+	public function post()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 
@@ -80,7 +80,7 @@ class BaseApi extends BaseModule
 		}
 	}
 
-	public static function put()
+	public function put()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 
diff --git a/src/Module/BaseNotifications.php b/src/Module/BaseNotifications.php
index 3987c90567..685337699b 100644
--- a/src/Module/BaseNotifications.php
+++ b/src/Module/BaseNotifications.php
@@ -82,7 +82,7 @@ abstract class BaseNotifications extends BaseModule
 	 */
 	abstract public static function getNotifications();
 
-	public static function init()
+	public function init()
 	{
 		if (!local_user()) {
 			throw new ForbiddenException(DI::l10n()->t('Permission denied.'));
@@ -94,7 +94,7 @@ abstract class BaseNotifications extends BaseModule
 		self::$showAll      = ($_REQUEST['show'] ?? '') === 'all';
 	}
 
-	public static function rawContent()
+	public function rawContent()
 	{
 		// If the last argument of the query is NOT json, return
 		if (DI::args()->get(DI::args()->getArgc() - 1) !== 'json') {
diff --git a/src/Module/BaseSettings.php b/src/Module/BaseSettings.php
index 1a20fc3dc9..7afaa35d0a 100644
--- a/src/Module/BaseSettings.php
+++ b/src/Module/BaseSettings.php
@@ -28,7 +28,7 @@ use Friendica\DI;
 
 class BaseSettings extends BaseModule
 {
-	public static function content()
+	public function content(): string
 	{
 		$a = DI::app();
 
@@ -125,5 +125,7 @@ class BaseSettings extends BaseModule
 			'$class' => 'settings-widget',
 			'$items' => $tabs,
 		]);
+
+		return '';
 	}
 }
diff --git a/src/Module/Bookmarklet.php b/src/Module/Bookmarklet.php
index 408fb50b25..5061254aa1 100644
--- a/src/Module/Bookmarklet.php
+++ b/src/Module/Bookmarklet.php
@@ -34,7 +34,7 @@ use Friendica\Util\Strings;
  */
 class Bookmarklet extends BaseModule
 {
-	public static function content()
+	public function content(): string
 	{
 		$_GET['mode'] = 'minimal';
 
diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index d80abe4702..243ec4be3e 100644
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -96,7 +96,7 @@ class Contact extends BaseModule
 		DI::baseUrl()->redirect($redirectUrl);
 	}
 
-	public static function post()
+	public function post()
 	{
 		if (!local_user()) {
 			return;
@@ -226,7 +226,7 @@ class Contact extends BaseModule
 		Model\Contact\User::setIgnored($contact_id, local_user(), $ignored);
 	}
 
-	public static function content($update = 0)
+	public function content($update = 0): string
 	{
 		if (!local_user()) {
 			return Login::form($_SERVER['REQUEST_URI']);
diff --git a/src/Module/Contact/Advanced.php b/src/Module/Contact/Advanced.php
index 521e4f469f..53ab31d1a6 100644
--- a/src/Module/Contact/Advanced.php
+++ b/src/Module/Contact/Advanced.php
@@ -38,14 +38,14 @@ use Friendica\Util\Strings;
  */
 class Advanced extends BaseModule
 {
-	public static function init()
+	public function init()
 	{
 		if (!Session::isAuthenticated()) {
 			throw new ForbiddenException(DI::l10n()->t('Permission denied.'));
 		}
 	}
 
-	public static function post()
+	public function post()
 	{
 		$cid = static::$parameters['id'];
 
@@ -96,7 +96,7 @@ class Advanced extends BaseModule
 		return;
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		$cid = static::$parameters['id'];
 
diff --git a/src/Module/Contact/Contacts.php b/src/Module/Contact/Contacts.php
index 1e3e582c0e..b5b501d6ea 100644
--- a/src/Module/Contact/Contacts.php
+++ b/src/Module/Contact/Contacts.php
@@ -14,7 +14,7 @@ use Friendica\Network\HTTPException;
 
 class Contacts extends BaseModule
 {
-	public static function content()
+	public function content(): string
 	{
 		$app = DI::app();
 
diff --git a/src/Module/Contact/Hovercard.php b/src/Module/Contact/Hovercard.php
index 2de1a0f8ae..34560313d7 100644
--- a/src/Module/Contact/Hovercard.php
+++ b/src/Module/Contact/Hovercard.php
@@ -35,7 +35,7 @@ use Friendica\Util\Strings;
  */
 class Hovercard extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		$contact_url = $_REQUEST['url'] ?? '';
 
diff --git a/src/Module/Contact/Media.php b/src/Module/Contact/Media.php
index d854aa9d63..d9a0399579 100644
--- a/src/Module/Contact/Media.php
+++ b/src/Module/Contact/Media.php
@@ -34,7 +34,7 @@ use Friendica\Network\HTTPException\BadRequestException;
  */
 class Media extends BaseModule
 {
-	public static function content()
+	public function content(): string
 	{
 		$cid = static::$parameters['id'];
 
diff --git a/src/Module/Contact/Poke.php b/src/Module/Contact/Poke.php
index 7f3e596db7..215e322580 100644
--- a/src/Module/Contact/Poke.php
+++ b/src/Module/Contact/Poke.php
@@ -18,7 +18,7 @@ use Friendica\Util\XML;
 
 class Poke extends BaseModule
 {
-	public static function post()
+	public function post()
 	{
 		if (!local_user() || empty(static::$parameters['id'])) {
 			return self::postReturn(false);
@@ -123,7 +123,7 @@ class Poke extends BaseModule
 		return $success;
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		if (!local_user()) {
 			throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this module.'));
diff --git a/src/Module/Contact/Revoke.php b/src/Module/Contact/Revoke.php
index 5730d569a3..1cace6255f 100644
--- a/src/Module/Contact/Revoke.php
+++ b/src/Module/Contact/Revoke.php
@@ -37,7 +37,7 @@ class Revoke extends BaseModule
 	/** @var array */
 	private static $contact;
 
-	public static function init()
+	public function init()
 	{
 		if (!local_user()) {
 			return;
@@ -63,7 +63,7 @@ class Revoke extends BaseModule
 		}
 	}
 
-	public static function post()
+	public function post()
 	{
 		if (!local_user()) {
 			throw new HTTPException\UnauthorizedException();
@@ -83,7 +83,7 @@ class Revoke extends BaseModule
 		DI::baseUrl()->redirect('contact/' . static::$parameters['id']);
 	}
 
-	public static function content(): string
+	public function content(): string
 	{
 		if (!local_user()) {
 			return Login::form($_SERVER['REQUEST_URI']);
diff --git a/src/Module/Conversation/Community.php b/src/Module/Conversation/Community.php
index 9a6e0709f1..58a0c5750b 100644
--- a/src/Module/Conversation/Community.php
+++ b/src/Module/Conversation/Community.php
@@ -49,7 +49,7 @@ class Community extends BaseModule
 	protected static $max_id;
 	protected static $item_id;
 
-	public static function content()
+	public function content(): string
 	{
 		self::parseRequest();
 
diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php
index 87bce10307..06fec9ee7c 100644
--- a/src/Module/Conversation/Network.php
+++ b/src/Module/Conversation/Network.php
@@ -57,7 +57,7 @@ class Network extends BaseModule
 	/** @var string */
 	protected static $order;
 
-	public static function content()
+	public function content(): string
 	{
 		if (!local_user()) {
 			return Login::form();
diff --git a/src/Module/Credits.php b/src/Module/Credits.php
index cf3a4ca342..fdd4f69749 100644
--- a/src/Module/Credits.php
+++ b/src/Module/Credits.php
@@ -32,7 +32,7 @@ use Friendica\DI;
  */
 class Credits extends BaseModule
 {
-	public static function content()
+	public function content(): string
 	{
 		/* fill the page with credits */
 		$credits_string = file_get_contents('CREDITS.txt');
diff --git a/src/Module/DFRN/Notify.php b/src/Module/DFRN/Notify.php
index a02913adad..cbd658fc91 100644
--- a/src/Module/DFRN/Notify.php
+++ b/src/Module/DFRN/Notify.php
@@ -38,7 +38,7 @@ use Friendica\Network\HTTPException;
  */
 class Notify extends BaseModule
 {
-	public static function post()
+	public function post()
 	{
 		$postdata = Network::postdata();
 
diff --git a/src/Module/DFRN/Poll.php b/src/Module/DFRN/Poll.php
index 9a2ab4b69f..3c4becdd6b 100644
--- a/src/Module/DFRN/Poll.php
+++ b/src/Module/DFRN/Poll.php
@@ -29,7 +29,7 @@ use Friendica\Protocol\OStatus;
  */
 class Poll extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		header("Content-type: application/atom+xml");
 		$last_update = $_GET['last_update'] ?? '';
diff --git a/src/Module/Debug/ActivityPubConversion.php b/src/Module/Debug/ActivityPubConversion.php
index 2a06a672c9..7f5fa6274d 100644
--- a/src/Module/Debug/ActivityPubConversion.php
+++ b/src/Module/Debug/ActivityPubConversion.php
@@ -34,7 +34,7 @@ use Friendica\Util\XML;
 
 class ActivityPubConversion extends BaseModule
 {
-	public static function content()
+	public function content(): string
 	{
 		function visible_whitespace($s)
 		{
diff --git a/src/Module/Debug/Babel.php b/src/Module/Debug/Babel.php
index 4901684b6a..c50bd08d74 100644
--- a/src/Module/Debug/Babel.php
+++ b/src/Module/Debug/Babel.php
@@ -35,7 +35,7 @@ use Friendica\Util\XML;
  */
 class Babel extends BaseModule
 {
-	public static function content()
+	public function content(): string
 	{
 		function visible_whitespace($s)
 		{
diff --git a/src/Module/Debug/Feed.php b/src/Module/Debug/Feed.php
index 0c0c0ded4d..2d2a7dc549 100644
--- a/src/Module/Debug/Feed.php
+++ b/src/Module/Debug/Feed.php
@@ -32,7 +32,7 @@ use Friendica\Protocol;
  */
 class Feed extends BaseModule
 {
-	public static function init()
+	public function init()
 	{
 		if (!local_user()) {
 			notice(DI::l10n()->t('You must be logged in to use this module'));
@@ -40,7 +40,7 @@ class Feed extends BaseModule
 		}
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		$result = [];
 		if (!empty($_REQUEST['url'])) {
diff --git a/src/Module/Debug/ItemBody.php b/src/Module/Debug/ItemBody.php
index 7030896468..04dab22c6b 100644
--- a/src/Module/Debug/ItemBody.php
+++ b/src/Module/Debug/ItemBody.php
@@ -31,7 +31,7 @@ use Friendica\Network\HTTPException;
  */
 class ItemBody extends BaseModule
 {
-	public static function content()
+	public function content(): string
 	{
 		if (!local_user()) {
 			throw new HTTPException\UnauthorizedException(DI::l10n()->t('Access denied.'));
diff --git a/src/Module/Debug/Localtime.php b/src/Module/Debug/Localtime.php
index 2d784765dd..6fb91380ae 100644
--- a/src/Module/Debug/Localtime.php
+++ b/src/Module/Debug/Localtime.php
@@ -31,7 +31,7 @@ class Localtime extends BaseModule
 {
 	static $mod_localtime = '';
 
-	public static function post()
+	public function post()
 	{
 		$time = ($_REQUEST['time'] ?? '') ?: 'now';
 
@@ -42,7 +42,7 @@ class Localtime extends BaseModule
 		}
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		$time = ($_REQUEST['time'] ?? '') ?: 'now';
 
diff --git a/src/Module/Debug/Probe.php b/src/Module/Debug/Probe.php
index 24c8d745c5..fcb7dda218 100644
--- a/src/Module/Debug/Probe.php
+++ b/src/Module/Debug/Probe.php
@@ -32,7 +32,7 @@ use Friendica\Network\Probe as NetworkProbe;
  */
 class Probe extends BaseModule
 {
-	public static function content()
+	public function content(): string
 	{
 		if (!local_user()) {
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Only logged in users are permitted to perform a probing.'));
diff --git a/src/Module/Debug/WebFinger.php b/src/Module/Debug/WebFinger.php
index f95d7a2b96..4527d2fb22 100644
--- a/src/Module/Debug/WebFinger.php
+++ b/src/Module/Debug/WebFinger.php
@@ -31,7 +31,7 @@ use Friendica\Network\Probe;
  */
 class WebFinger extends BaseModule
 {
-	public static function content()
+	public function content(): string
 	{
 		if (!local_user()) {
 			throw new \Friendica\Network\HTTPException\ForbiddenException(DI::l10n()->t('Only logged in users are permitted to perform a probing.'));
diff --git a/src/Module/Delegation.php b/src/Module/Delegation.php
index b4845764c3..2b36fc2a30 100644
--- a/src/Module/Delegation.php
+++ b/src/Module/Delegation.php
@@ -37,7 +37,7 @@ use Friendica\Util\Proxy;
  */
 class Delegation extends BaseModule
 {
-	public static function post()
+	public function post()
 	{
 		if (!local_user()) {
 			return;
@@ -112,7 +112,7 @@ class Delegation extends BaseModule
 		// NOTREACHED
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		if (!local_user()) {
 			throw new ForbiddenException(DI::l10n()->t('Permission denied.'));
diff --git a/src/Module/Diaspora/Fetch.php b/src/Module/Diaspora/Fetch.php
index dc3e76b010..aa582558f8 100644
--- a/src/Module/Diaspora/Fetch.php
+++ b/src/Module/Diaspora/Fetch.php
@@ -38,7 +38,7 @@ use Friendica\Util\Strings;
  */
 class Fetch extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		if (empty(static::$parameters['guid'])) {
 			throw new HTTPException\NotFoundException();
diff --git a/src/Module/Diaspora/Receive.php b/src/Module/Diaspora/Receive.php
index 2fde1fe3f2..9ac89cc6e6 100644
--- a/src/Module/Diaspora/Receive.php
+++ b/src/Module/Diaspora/Receive.php
@@ -38,12 +38,12 @@ class Receive extends BaseModule
 	/** @var LoggerInterface */
 	private static $logger;
 
-	public static function init()
+	public function init()
 	{
 		self::$logger = DI::logger();
 	}
 
-	public static function post()
+	public function post()
 	{
 		$enabled = DI::config()->get('system', 'diaspora_enabled', false);
 		if (!$enabled) {
diff --git a/src/Module/Directory.php b/src/Module/Directory.php
index 799b18ea10..a81780a280 100644
--- a/src/Module/Directory.php
+++ b/src/Module/Directory.php
@@ -38,7 +38,7 @@ use Friendica\Network\HTTPException;
  */
 class Directory extends BaseModule
 {
-	public static function content()
+	public function content(): string
 	{
 		$app = DI::app();
 		$config = DI::config();
diff --git a/src/Module/Events/Json.php b/src/Module/Events/Json.php
index befd8d7aae..566cf648a2 100644
--- a/src/Module/Events/Json.php
+++ b/src/Module/Events/Json.php
@@ -13,7 +13,7 @@ use Friendica\Util\Temporal;
 
 class Json extends \Friendica\BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		if (!local_user()) {
 			throw new HTTPException\UnauthorizedException();
diff --git a/src/Module/Feed.php b/src/Module/Feed.php
index 0eca46b1ab..94908abe21 100644
--- a/src/Module/Feed.php
+++ b/src/Module/Feed.php
@@ -41,7 +41,7 @@ use Friendica\Protocol\Feed as ProtocolFeed;
  */
 class Feed extends BaseModule
 {
-	public static function content()
+	public function content(): string
 	{
 		$a = DI::app();
 
diff --git a/src/Module/Filer/RemoveTag.php b/src/Module/Filer/RemoveTag.php
index e52db81c12..43a0ff1fb0 100644
--- a/src/Module/Filer/RemoveTag.php
+++ b/src/Module/Filer/RemoveTag.php
@@ -33,7 +33,7 @@ use Friendica\Util\XML;
  */
 class RemoveTag extends BaseModule
 {
-	public static function content()
+	public function content(): string
 	{
 		if (!local_user()) {
 			throw new HTTPException\ForbiddenException();
@@ -62,7 +62,7 @@ class RemoveTag extends BaseModule
 		if ($item_id && strlen($term)) {
 			$item = Post::selectFirst(['uri-id'], ['id' => $item_id]);
 			if (!DBA::isResult($item)) {
-				return;				
+				return '';
 			}
 			if (!Post\Category::deleteFileByURIId($item['uri-id'], local_user(), $type, $term)) {
 				notice(DI::l10n()->t('Item was not removed'));
@@ -74,5 +74,7 @@ class RemoveTag extends BaseModule
 		if ($type == Post\Category::FILE) {
 			DI::baseUrl()->redirect('filed?file=' . rawurlencode($term));
 		}
+
+		return '';
 	}
 }
diff --git a/src/Module/Filer/SaveTag.php b/src/Module/Filer/SaveTag.php
index 363e51c210..ee620f54c6 100644
--- a/src/Module/Filer/SaveTag.php
+++ b/src/Module/Filer/SaveTag.php
@@ -34,7 +34,7 @@ use Friendica\Util\XML;
  */
 class SaveTag extends BaseModule
 {
-	public static function init()
+	public function init()
 	{
 		if (!local_user()) {
 			notice(DI::l10n()->t('You must be logged in to use this module'));
@@ -42,7 +42,7 @@ class SaveTag extends BaseModule
 		}
 	}
 
-	public static function rawContent()
+	public function rawContent()
 	{
 		$logger = DI::logger();
 
diff --git a/src/Module/FollowConfirm.php b/src/Module/FollowConfirm.php
index 6e6b4da1df..41f811698b 100644
--- a/src/Module/FollowConfirm.php
+++ b/src/Module/FollowConfirm.php
@@ -10,7 +10,7 @@ use Friendica\Model\Contact;
  */
 class FollowConfirm extends BaseModule
 {
-	public static function post()
+	public function post()
 	{
 		$uid = local_user();
 		if (!$uid) {
diff --git a/src/Module/FriendSuggest.php b/src/Module/FriendSuggest.php
index 3256a04c2b..cc4041a6f0 100644
--- a/src/Module/FriendSuggest.php
+++ b/src/Module/FriendSuggest.php
@@ -38,14 +38,14 @@ use Friendica\Worker\Delivery;
  */
 class FriendSuggest extends BaseModule
 {
-	public static function init()
+	public function init()
 	{
 		if (!local_user()) {
 			throw new ForbiddenException(DI::l10n()->t('Permission denied.'));
 		}
 	}
 
-	public static function post()
+	public function post()
 	{
 		$cid = intval(static::$parameters['contact']);
 
@@ -83,7 +83,7 @@ class FriendSuggest extends BaseModule
 		info(DI::l10n()->t('Friend suggestion sent.'));
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		$cid = intval(static::$parameters['contact']);
 
diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php
index 082c5c0812..b4de151e97 100644
--- a/src/Module/Friendica.php
+++ b/src/Module/Friendica.php
@@ -38,7 +38,7 @@ use Friendica\Protocol\ActivityPub;
  */
 class Friendica extends BaseModule
 {
-	public static function content()
+	public function content(): string
 	{
 		$config = DI::config();
 
@@ -110,7 +110,7 @@ class Friendica extends BaseModule
 		]);
 	}
 
-	public static function rawContent()
+	public function rawContent()
 	{
 		if (ActivityPub::isRequest()) {
 			try {
diff --git a/src/Module/Group.php b/src/Module/Group.php
index 69baef9f4d..1750d3e04f 100644
--- a/src/Module/Group.php
+++ b/src/Module/Group.php
@@ -32,7 +32,7 @@ require_once 'boot.php';
 
 class Group extends BaseModule
 {
-	public static function post()
+	public function post()
 	{
 		$a = DI::app();
 
@@ -138,7 +138,7 @@ class Group extends BaseModule
 		}
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		$change = false;
 
diff --git a/src/Module/HCard.php b/src/Module/HCard.php
index 269deff068..7dabf6c692 100644
--- a/src/Module/HCard.php
+++ b/src/Module/HCard.php
@@ -34,7 +34,7 @@ use Friendica\Network\HTTPException;
  */
 class HCard extends BaseModule
 {
-	public static function content()
+	public function content(): string
 	{
 		if ((local_user()) && (static::$parameters['action'] ?? '') === 'view') {
 			// A logged in user views a profile of a user
diff --git a/src/Module/HTTPException/MethodNotAllowed.php b/src/Module/HTTPException/MethodNotAllowed.php
index 8745832468..07aab537a8 100644
--- a/src/Module/HTTPException/MethodNotAllowed.php
+++ b/src/Module/HTTPException/MethodNotAllowed.php
@@ -27,7 +27,7 @@ use Friendica\Network\HTTPException;
 
 class MethodNotAllowed extends BaseModule
 {
-	public static function content()
+	public function content(): string
 	{
 		throw new HTTPException\MethodNotAllowedException(DI::l10n()->t('Method Not Allowed.'));
 	}
diff --git a/src/Module/HTTPException/PageNotFound.php b/src/Module/HTTPException/PageNotFound.php
index 5ba5466241..6af5e91ae6 100644
--- a/src/Module/HTTPException/PageNotFound.php
+++ b/src/Module/HTTPException/PageNotFound.php
@@ -27,7 +27,7 @@ use Friendica\Network\HTTPException;
 
 class PageNotFound extends BaseModule
 {
-	public static function content()
+	public function content(): string
 	{
 		throw new HTTPException\NotFoundException(DI::l10n()->t('Page not found.'));
 	}
diff --git a/src/Module/Hashtag.php b/src/Module/Hashtag.php
index aebe15dd0d..8910d9cce4 100644
--- a/src/Module/Hashtag.php
+++ b/src/Module/Hashtag.php
@@ -31,7 +31,7 @@ use Friendica\Util\Strings;
  */
 class Hashtag extends BaseModule
 {
-	public static function content()
+	public function content(): string
 	{
 		$result = [];
 
@@ -47,5 +47,7 @@ class Hashtag extends BaseModule
 		DBA::close($taglist);
 
 		System::jsonExit($result);
+
+		return '';
 	}
 }
diff --git a/src/Module/Help.php b/src/Module/Help.php
index 5440fd97d8..64ba68f5cc 100644
--- a/src/Module/Help.php
+++ b/src/Module/Help.php
@@ -32,7 +32,7 @@ use Friendica\Network\HTTPException;
  */
 class Help extends BaseModule
 {
-	public static function content()
+	public function content(): string
 	{
 		Nav::setSelected('help');
 
diff --git a/src/Module/Home.php b/src/Module/Home.php
index 719d874522..f4e6b97339 100644
--- a/src/Module/Home.php
+++ b/src/Module/Home.php
@@ -32,7 +32,7 @@ use Friendica\Module\Security\Login;
  */
 class Home extends BaseModule
 {
-	public static function content()
+	public function content(): string
 	{
 		$app = DI::app();
 		$config = DI::config();
diff --git a/src/Module/Install.php b/src/Module/Install.php
index 72b83ebffd..8f872c683e 100644
--- a/src/Module/Install.php
+++ b/src/Module/Install.php
@@ -65,7 +65,7 @@ class Install extends BaseModule
 	 */
 	private static $installer;
 
-	public static function init()
+	public function init()
 	{
 		$a = DI::app();
 
@@ -94,7 +94,7 @@ class Install extends BaseModule
 		self::$currentWizardStep = ($_POST['pass'] ?? '') ?: self::SYSTEM_CHECK;
 	}
 
-	public static function post()
+	public function post()
 	{
 		$a           = DI::app();
 		$configCache = $a->getConfigCache();
@@ -177,7 +177,7 @@ class Install extends BaseModule
 		}
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		$a           = DI::app();
 		$configCache = $a->getConfigCache();
diff --git a/src/Module/Invite.php b/src/Module/Invite.php
index 3c82a26c14..10346a5162 100644
--- a/src/Module/Invite.php
+++ b/src/Module/Invite.php
@@ -35,7 +35,7 @@ use Friendica\Util\Strings;
  */
 class Invite extends BaseModule
 {
-	public static function post()
+	public function post()
 	{
 		if (!local_user()) {
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
@@ -124,7 +124,7 @@ class Invite extends BaseModule
 		info(DI::l10n()->tt('%d message sent.', '%d messages sent.', $total));
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		if (!local_user()) {
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
diff --git a/src/Module/Item/Activity.php b/src/Module/Item/Activity.php
index 6006be9c7d..b92b0acf68 100644
--- a/src/Module/Item/Activity.php
+++ b/src/Module/Item/Activity.php
@@ -38,7 +38,7 @@ use Friendica\Network\HTTPException;
  */
 class Activity extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		if (!Session::isAuthenticated()) {
 			throw new HTTPException\ForbiddenException();
diff --git a/src/Module/Item/Compose.php b/src/Module/Item/Compose.php
index c229fb15ae..7867b98586 100644
--- a/src/Module/Item/Compose.php
+++ b/src/Module/Item/Compose.php
@@ -40,7 +40,7 @@ use Friendica\Util\Temporal;
 
 class Compose extends BaseModule
 {
-	public static function post()
+	public function post()
 	{
 		if (!empty($_REQUEST['body'])) {
 			$_REQUEST['return'] = 'network';
@@ -51,7 +51,7 @@ class Compose extends BaseModule
 		}
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		if (!local_user()) {
 			return Login::form('compose', false);
diff --git a/src/Module/Item/Follow.php b/src/Module/Item/Follow.php
index 923048447b..baa99c21e0 100644
--- a/src/Module/Item/Follow.php
+++ b/src/Module/Item/Follow.php
@@ -34,7 +34,7 @@ use Friendica\Network\HTTPException;
  */
 class Follow extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		$l10n = DI::l10n();
 
diff --git a/src/Module/Item/Ignore.php b/src/Module/Item/Ignore.php
index 19ac90e47c..e38dd46bc7 100644
--- a/src/Module/Item/Ignore.php
+++ b/src/Module/Item/Ignore.php
@@ -33,7 +33,7 @@ use Friendica\Network\HTTPException;
  */
 class Ignore extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		$l10n = DI::l10n();
 
diff --git a/src/Module/Item/Pin.php b/src/Module/Item/Pin.php
index c451bae480..185b418bb6 100644
--- a/src/Module/Item/Pin.php
+++ b/src/Module/Item/Pin.php
@@ -34,7 +34,7 @@ use Friendica\Network\HTTPException;
  */
 class Pin extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		$l10n = DI::l10n();
 
diff --git a/src/Module/Item/Star.php b/src/Module/Item/Star.php
index d24fb54ac7..336207718e 100644
--- a/src/Module/Item/Star.php
+++ b/src/Module/Item/Star.php
@@ -35,7 +35,7 @@ use Friendica\Network\HTTPException;
  */
 class Star extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		$l10n = DI::l10n();
 
diff --git a/src/Module/Magic.php b/src/Module/Magic.php
index 63f8ee9c1c..af9e5084a1 100644
--- a/src/Module/Magic.php
+++ b/src/Module/Magic.php
@@ -39,7 +39,7 @@ use Friendica\Util\Strings;
  */
 class Magic extends BaseModule
 {
-	public static function init()
+	public function init()
 	{
 		$a = DI::app();
 		$ret = ['success' => false, 'url' => '', 'message' => ''];
diff --git a/src/Module/Maintenance.php b/src/Module/Maintenance.php
index d13c5fe027..2025a5fa4d 100644
--- a/src/Module/Maintenance.php
+++ b/src/Module/Maintenance.php
@@ -34,7 +34,7 @@ use Friendica\Util\Strings;
  */
 class Maintenance extends BaseModule
 {
-	public static function content()
+	public function content(): string
 	{
 		$reason = DI::config()->get('system', 'maintenance_reason');
 
diff --git a/src/Module/Manifest.php b/src/Module/Manifest.php
index 4a226ac63f..ff462fd3e2 100644
--- a/src/Module/Manifest.php
+++ b/src/Module/Manifest.php
@@ -27,7 +27,7 @@ use Friendica\DI;
 
 class Manifest extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		$config = DI::config();
 
diff --git a/src/Module/NoScrape.php b/src/Module/NoScrape.php
index 96e4d7658d..c5a66c9bb6 100644
--- a/src/Module/NoScrape.php
+++ b/src/Module/NoScrape.php
@@ -35,7 +35,7 @@ use Friendica\Model\User;
  */
 class NoScrape extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		$a = DI::app();
 
diff --git a/src/Module/NodeInfo110.php b/src/Module/NodeInfo110.php
index 3923b7e21c..d8f8a5049a 100644
--- a/src/Module/NodeInfo110.php
+++ b/src/Module/NodeInfo110.php
@@ -33,7 +33,7 @@ use Friendica\Model\Nodeinfo;
  */
 class NodeInfo110 extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		$config = DI::config();
 
diff --git a/src/Module/NodeInfo120.php b/src/Module/NodeInfo120.php
index 471f0f212f..aac8c6d4fc 100644
--- a/src/Module/NodeInfo120.php
+++ b/src/Module/NodeInfo120.php
@@ -33,7 +33,7 @@ use Friendica\Model\Nodeinfo;
  */
 class NodeInfo120 extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		$config = DI::config();
 
diff --git a/src/Module/NodeInfo210.php b/src/Module/NodeInfo210.php
index 02324a92be..cb55411f23 100644
--- a/src/Module/NodeInfo210.php
+++ b/src/Module/NodeInfo210.php
@@ -33,7 +33,7 @@ use Friendica\Model\Nodeinfo;
  */
 class NodeInfo210 extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		$config = DI::config();
 
diff --git a/src/Module/Notifications/Introductions.php b/src/Module/Notifications/Introductions.php
index 234175dd88..7379510d81 100644
--- a/src/Module/Notifications/Introductions.php
+++ b/src/Module/Notifications/Introductions.php
@@ -55,7 +55,7 @@ class Introductions extends BaseNotifications
 		];
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		Nav::setSelected('introductions');
 
diff --git a/src/Module/Notifications/Notification.php b/src/Module/Notifications/Notification.php
index 5c27abbbba..1ceafc105b 100644
--- a/src/Module/Notifications/Notification.php
+++ b/src/Module/Notifications/Notification.php
@@ -42,7 +42,7 @@ class Notification extends BaseModule
 	 * @throws \ImagickException
 	 * @throws \Exception
 	 */
-	public static function post()
+	public function post()
 	{
 		if (!local_user()) {
 			throw new HTTPException\UnauthorizedException(DI::l10n()->t('Permission denied.'));
@@ -73,7 +73,7 @@ class Notification extends BaseModule
 	 *
 	 * @throws HTTPException\UnauthorizedException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		if (!local_user()) {
 			throw new HTTPException\UnauthorizedException(DI::l10n()->t('Permission denied.'));
@@ -101,7 +101,7 @@ class Notification extends BaseModule
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws \Exception
 	 */
-	public static function content(): string
+	public function content(): string
 	{
 		if (!local_user()) {
 			notice(DI::l10n()->t('You must be logged in to show this page.'));
diff --git a/src/Module/Notifications/Notifications.php b/src/Module/Notifications/Notifications.php
index 9b43647e9a..eef4af9bc4 100644
--- a/src/Module/Notifications/Notifications.php
+++ b/src/Module/Notifications/Notifications.php
@@ -82,7 +82,7 @@ class Notifications extends BaseNotifications
 		];
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		Nav::setSelected('notifications');
 
diff --git a/src/Module/OAuth/Acknowledge.php b/src/Module/OAuth/Acknowledge.php
index ffce1caae3..f0915df41a 100644
--- a/src/Module/OAuth/Acknowledge.php
+++ b/src/Module/OAuth/Acknowledge.php
@@ -30,13 +30,13 @@ use Friendica\Module\BaseApi;
  */
 class Acknowledge extends BaseApi
 {
-	public static function post()
+	public function post()
 	{
 		DI::session()->set('oauth_acknowledge', true);
 		DI::app()->redirect(DI::session()->get('return_path'));
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		DI::session()->set('return_path', $_REQUEST['return_path'] ?? '');
 
diff --git a/src/Module/OAuth/Authorize.php b/src/Module/OAuth/Authorize.php
index ede46720a3..d39cbe353d 100644
--- a/src/Module/OAuth/Authorize.php
+++ b/src/Module/OAuth/Authorize.php
@@ -37,7 +37,7 @@ class Authorize extends BaseApi
 	/**
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		$request = self::getRequest([
 			'force_login'   => '', // Forces the user to re-login, which is necessary for authorizing with multiple accounts from the same instance.
@@ -97,7 +97,7 @@ class Authorize extends BaseApi
 		self::$oauth_code = $token['code'];
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		if (empty(self::$oauth_code)) {
 			return '';
diff --git a/src/Module/OAuth/Revoke.php b/src/Module/OAuth/Revoke.php
index 156ef1c199..bf906ab454 100644
--- a/src/Module/OAuth/Revoke.php
+++ b/src/Module/OAuth/Revoke.php
@@ -32,7 +32,7 @@ use Friendica\Module\BaseApi;
  */
 class Revoke extends BaseApi
 {
-	public static function post()
+	public function post()
 	{
 		$request = self::getRequest([
 			'client_id'     => '', // Client ID, obtained during app registration
diff --git a/src/Module/OAuth/Token.php b/src/Module/OAuth/Token.php
index 2ef26cbf1b..6aef63f302 100644
--- a/src/Module/OAuth/Token.php
+++ b/src/Module/OAuth/Token.php
@@ -34,7 +34,7 @@ use Friendica\Security\OAuth;
  */
 class Token extends BaseApi
 {
-	public static function post()
+	public function post()
 	{
 		$request = self::getRequest([
 			'client_id'     => '', // Client ID, obtained during app registration
diff --git a/src/Module/Oembed.php b/src/Module/Oembed.php
index 5564fdacaa..1b38c0e973 100644
--- a/src/Module/Oembed.php
+++ b/src/Module/Oembed.php
@@ -37,7 +37,7 @@ use Friendica\Util\Strings;
  */
 class Oembed extends BaseModule
 {
-	public static function content()
+	public function content(): string
 	{
 		// Unused form: /oembed/b2h?url=...
 		if (DI::args()->getArgv()[1] == 'b2h') {
diff --git a/src/Module/OpenSearch.php b/src/Module/OpenSearch.php
index a6393726d7..e5212c2519 100644
--- a/src/Module/OpenSearch.php
+++ b/src/Module/OpenSearch.php
@@ -36,7 +36,7 @@ class OpenSearch extends BaseModule
 	/**
 	 * @throws \Exception
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		header('Content-type: application/opensearchdescription+xml');
 
diff --git a/src/Module/Owa.php b/src/Module/Owa.php
index a467349878..85530df6f9 100644
--- a/src/Module/Owa.php
+++ b/src/Module/Owa.php
@@ -44,7 +44,7 @@ use Friendica\Util\Strings;
  */
 class Owa extends BaseModule
 {
-	public static function init()
+	public function init()
 	{
 
 		$ret = [ 'success' => false ];
diff --git a/src/Module/ParseUrl.php b/src/Module/ParseUrl.php
index f8665c5357..092d6ec747 100644
--- a/src/Module/ParseUrl.php
+++ b/src/Module/ParseUrl.php
@@ -31,7 +31,7 @@ use Friendica\Util;
 
 class ParseUrl extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		if (!Session::isAuthenticated()) {
 			throw new \Friendica\Network\HTTPException\ForbiddenException();
diff --git a/src/Module/PermissionTooltip.php b/src/Module/PermissionTooltip.php
index 89ed260f9c..bf0cc0d63e 100644
--- a/src/Module/PermissionTooltip.php
+++ b/src/Module/PermissionTooltip.php
@@ -15,7 +15,7 @@ use Friendica\Network\HTTPException;
  */
 class PermissionTooltip extends \Friendica\BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		$type = static::$parameters['type'];
 		$referenceId = static::$parameters['id'];
diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index 2a45ef0478..4ea3617acf 100644
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -51,7 +51,7 @@ class Photo extends BaseModule
 	 * Fetch a photo or an avatar, in optional size, check for permissions and
 	 * return the image
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		$totalstamp = microtime(true);
 
diff --git a/src/Module/Profile/Common.php b/src/Module/Profile/Common.php
index a469739679..d95f2b01ef 100644
--- a/src/Module/Profile/Common.php
+++ b/src/Module/Profile/Common.php
@@ -35,7 +35,7 @@ use Friendica\Network\HTTPException;
 
 class Common extends BaseProfile
 {
-	public static function content()
+	public function content(): string
 	{
 		if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
 			throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
diff --git a/src/Module/Profile/Contacts.php b/src/Module/Profile/Contacts.php
index 0f28be641c..d849d57783 100644
--- a/src/Module/Profile/Contacts.php
+++ b/src/Module/Profile/Contacts.php
@@ -34,7 +34,7 @@ use Friendica\Network\HTTPException;
 
 class Contacts extends Module\BaseProfile
 {
-	public static function content()
+	public function content(): string
 	{
 		if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
 			throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
diff --git a/src/Module/Profile/Index.php b/src/Module/Profile/Index.php
index 4f46efaa33..e6249f90e5 100644
--- a/src/Module/Profile/Index.php
+++ b/src/Module/Profile/Index.php
@@ -34,13 +34,13 @@ use Friendica\BaseModule;
  */
 class Index extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
-		Profile::rawContent();
+		(new Profile(static::$parameters))->rawContent();
 	}
 
-	public static function content()
+	public function content(): string
 	{
-		return Status::content();
+		return (new Status(static::$parameters))->content();
 	}
 }
diff --git a/src/Module/Profile/Media.php b/src/Module/Profile/Media.php
index f46097814f..0f34b267de 100644
--- a/src/Module/Profile/Media.php
+++ b/src/Module/Profile/Media.php
@@ -29,7 +29,7 @@ use Friendica\Network\HTTPException;
 
 class Media extends BaseProfile
 {
-	public static function content()
+	public function content(): string
 	{
 		$a = DI::app();
 
diff --git a/src/Module/Profile/Profile.php b/src/Module/Profile/Profile.php
index c1792ad4e6..32d3aae700 100644
--- a/src/Module/Profile/Profile.php
+++ b/src/Module/Profile/Profile.php
@@ -46,7 +46,7 @@ use Friendica\Util\Temporal;
 
 class Profile extends BaseProfile
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		if (ActivityPub::isRequest()) {
 			$user = DBA::selectFirst('user', ['uid'], ['nickname' => static::$parameters['nickname']]);
@@ -73,7 +73,7 @@ class Profile extends BaseProfile
 		}
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		$a = DI::app();
 
diff --git a/src/Module/Profile/Schedule.php b/src/Module/Profile/Schedule.php
index eaeeb85406..72208fe798 100644
--- a/src/Module/Profile/Schedule.php
+++ b/src/Module/Profile/Schedule.php
@@ -33,7 +33,7 @@ use Friendica\Util\DateTimeFormat;
 
 class Schedule extends BaseProfile
 {
-	public static function post()
+	public function post()
 	{
 		if (!local_user()) {
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
@@ -50,7 +50,7 @@ class Schedule extends BaseProfile
 		Post\Delayed::deleteById($_REQUEST['delete']);
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		if (!local_user()) {
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
diff --git a/src/Module/Profile/Status.php b/src/Module/Profile/Status.php
index 995939ce7c..db5400bff1 100644
--- a/src/Module/Profile/Status.php
+++ b/src/Module/Profile/Status.php
@@ -46,7 +46,7 @@ use Friendica\Util\XML;
 
 class Status extends BaseProfile
 {
-	public static function content()
+	public function content(): string
 	{
 		$args = DI::args();
 
diff --git a/src/Module/Proxy.php b/src/Module/Proxy.php
index a9c8c0b9e6..7a7c7b082b 100644
--- a/src/Module/Proxy.php
+++ b/src/Module/Proxy.php
@@ -44,7 +44,7 @@ class Proxy extends BaseModule
 	/**
 	 * Fetch remote image content
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		$request = self::getRequestInfo();
 
diff --git a/src/Module/PublicRSAKey.php b/src/Module/PublicRSAKey.php
index 22269984a8..9df9f5857b 100644
--- a/src/Module/PublicRSAKey.php
+++ b/src/Module/PublicRSAKey.php
@@ -33,7 +33,7 @@ use Friendica\Util\Strings;
  */
 class PublicRSAKey extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		if (empty(static::$parameters['nick'])) {
 			throw new BadRequestException();
diff --git a/src/Module/RandomProfile.php b/src/Module/RandomProfile.php
index b50746701d..38cd684294 100644
--- a/src/Module/RandomProfile.php
+++ b/src/Module/RandomProfile.php
@@ -30,7 +30,7 @@ use Friendica\Model\Contact;
  */
 class RandomProfile extends BaseModule
 {
-	public static function content()
+	public function content(): string
 	{
 		$a = DI::app();
 
@@ -42,5 +42,7 @@ class RandomProfile extends BaseModule
 		}
 
 		DI::baseUrl()->redirect('profile');
+
+		return '';
 	}
 }
diff --git a/src/Module/ReallySimpleDiscovery.php b/src/Module/ReallySimpleDiscovery.php
index 50b9660020..fe071fc550 100644
--- a/src/Module/ReallySimpleDiscovery.php
+++ b/src/Module/ReallySimpleDiscovery.php
@@ -31,7 +31,7 @@ use Friendica\Util\XML;
  */
 class ReallySimpleDiscovery extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		header('Content-Type: text/xml');
 
diff --git a/src/Module/Register.php b/src/Module/Register.php
index 7c0d3f690d..42b95e78e9 100644
--- a/src/Module/Register.php
+++ b/src/Module/Register.php
@@ -53,7 +53,7 @@ class Register extends BaseModule
 	 *
 	 * @return string
 	 */
-	public static function content()
+	public function content(): string
 	{
 		// logged in users can register others (people/pages/groups)
 		// even with closed registrations, unless specifically prohibited by site policy.
@@ -182,7 +182,7 @@ class Register extends BaseModule
 	 * Extend this method if the module is supposed to process POST requests.
 	 * Doesn't display any content
 	 */
-	public static function post()
+	public function post()
 	{
 		BaseModule::checkFormSecurityTokenRedirectOnError('/register', 'register');
 
diff --git a/src/Module/RemoteFollow.php b/src/Module/RemoteFollow.php
index df67e60c65..b6b0255fcb 100644
--- a/src/Module/RemoteFollow.php
+++ b/src/Module/RemoteFollow.php
@@ -42,7 +42,7 @@ class RemoteFollow extends BaseModule
 {
 	static $owner;
 
-	public static function init()
+	public function init()
 	{
 		self::$owner = User::getOwnerDataByNick(static::$parameters['profile']);
 		if (!self::$owner) {
@@ -52,7 +52,7 @@ class RemoteFollow extends BaseModule
 		DI::page()['aside'] = Widget\VCard::getHTML(self::$owner);
 	}
 
-	public static function post()
+	public function post()
 	{
 		if (!empty($_POST['cancel']) || empty($_POST['dfrn_url'])) {
 			DI::baseUrl()->redirect();
@@ -96,7 +96,7 @@ class RemoteFollow extends BaseModule
 		System::externalRedirect($follow_link);
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		if (empty(self::$owner)) {
 			return '';
diff --git a/src/Module/RobotsTxt.php b/src/Module/RobotsTxt.php
index c2b2d624dd..ec7ee086ec 100644
--- a/src/Module/RobotsTxt.php
+++ b/src/Module/RobotsTxt.php
@@ -28,7 +28,7 @@ use Friendica\BaseModule;
  */
 class RobotsTxt extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		$allDisalloweds = [
 			'/settings/',
diff --git a/src/Module/Search/Acl.php b/src/Module/Search/Acl.php
index 8ec8dd9bbb..0866b5f9ae 100644
--- a/src/Module/Search/Acl.php
+++ b/src/Module/Search/Acl.php
@@ -48,7 +48,7 @@ class Acl extends BaseModule
 	const TYPE_PRIVATE_MESSAGE       = 'm';
 	const TYPE_ANY_CONTACT           = 'a';
 
-	public static function rawContent()
+	public function rawContent()
 	{
 		if (!local_user()) {
 			throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this module.'));
diff --git a/src/Module/Search/Directory.php b/src/Module/Search/Directory.php
index 5b5a1ba285..bbd90f137d 100644
--- a/src/Module/Search/Directory.php
+++ b/src/Module/Search/Directory.php
@@ -31,7 +31,7 @@ use Friendica\Module\Security\Login;
  */
 class Directory extends BaseSearch
 {
-	public static function content()
+	public function content(): string
 	{
 		if (!local_user()) {
 			notice(DI::l10n()->t('Permission denied.'));
diff --git a/src/Module/Search/Filed.php b/src/Module/Search/Filed.php
index f3cad86208..519b0ece02 100644
--- a/src/Module/Search/Filed.php
+++ b/src/Module/Search/Filed.php
@@ -17,7 +17,7 @@ use Friendica\Module\Security\Login;
 
 class Filed extends BaseSearch
 {
-	public static function content()
+	public function content(): string
 	{
 		if (!local_user()) {
 			return Login::form();
diff --git a/src/Module/Search/Index.php b/src/Module/Search/Index.php
index 941b4c5770..2118aeaaee 100644
--- a/src/Module/Search/Index.php
+++ b/src/Module/Search/Index.php
@@ -41,7 +41,7 @@ use Friendica\Network\HTTPException;
 
 class Index extends BaseSearch
 {
-	public static function content()
+	public function content(): string
 	{
 		$search = (!empty($_GET['q']) ? trim(rawurldecode($_GET['q'])) : '');
 
diff --git a/src/Module/Search/Saved.php b/src/Module/Search/Saved.php
index 436e3f9589..43c33d5446 100644
--- a/src/Module/Search/Saved.php
+++ b/src/Module/Search/Saved.php
@@ -28,7 +28,7 @@ use Friendica\DI;
 
 class Saved extends BaseModule
 {
-	public static function init()
+	public function init()
 	{
 		$action = DI::args()->get(2, 'none');
 		$search = trim(rawurldecode($_GET['term'] ?? ''));
diff --git a/src/Module/Security/Login.php b/src/Module/Security/Login.php
index e157ac0898..5c47e97496 100644
--- a/src/Module/Security/Login.php
+++ b/src/Module/Security/Login.php
@@ -33,7 +33,7 @@ use Friendica\Module\Register;
  */
 class Login extends BaseModule
 {
-	public static function content()
+	public function content(): string
 	{
 		$return_path = $_REQUEST['return_path'] ?? '' ;
 
@@ -46,7 +46,7 @@ class Login extends BaseModule
 		return self::form(Session::get('return_path'), intval(DI::config()->get('config', 'register_policy')) !== \Friendica\Module\Register::CLOSED);
 	}
 
-	public static function post()
+	public function post()
 	{
 		$return_path = Session::get('return_path');
 		Session::clear();
diff --git a/src/Module/Security/Logout.php b/src/Module/Security/Logout.php
index 35658797ce..604c9fc175 100644
--- a/src/Module/Security/Logout.php
+++ b/src/Module/Security/Logout.php
@@ -36,7 +36,7 @@ class Logout extends BaseModule
 	/**
 	 * Process logout requests
 	 */
-	public static function init()
+	public function init()
 	{
 		$visitor_home = null;
 		if (remote_user()) {
diff --git a/src/Module/Security/OpenID.php b/src/Module/Security/OpenID.php
index 4459b2cf8c..360c9c672f 100644
--- a/src/Module/Security/OpenID.php
+++ b/src/Module/Security/OpenID.php
@@ -31,7 +31,7 @@ use LightOpenID;
  */
 class OpenID extends BaseModule
 {
-	public static function content()
+	public function content(): string
 	{
 		if (DI::config()->get('system', 'no_openid')) {
 			DI::baseUrl()->redirect();
@@ -97,5 +97,7 @@ class OpenID extends BaseModule
 				DI::baseUrl()->redirect('login');
 			}
 		}
+
+		return '';
 	}
 }
diff --git a/src/Module/Security/TwoFactor/Recovery.php b/src/Module/Security/TwoFactor/Recovery.php
index 5bcf6add8e..193fcb8447 100644
--- a/src/Module/Security/TwoFactor/Recovery.php
+++ b/src/Module/Security/TwoFactor/Recovery.php
@@ -35,14 +35,14 @@ use Friendica\Security\TwoFactor\Model\RecoveryCode;
  */
 class Recovery extends BaseModule
 {
-	public static function init()
+	public function init()
 	{
 		if (!local_user()) {
 			return;
 		}
 	}
 
-	public static function post()
+	public function post()
 	{
 		if (!local_user()) {
 			return;
@@ -67,7 +67,7 @@ class Recovery extends BaseModule
 		}
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		if (!local_user()) {
 			DI::baseUrl()->redirect();
diff --git a/src/Module/Security/TwoFactor/Verify.php b/src/Module/Security/TwoFactor/Verify.php
index 3209b3f56d..3669943ba4 100644
--- a/src/Module/Security/TwoFactor/Verify.php
+++ b/src/Module/Security/TwoFactor/Verify.php
@@ -38,7 +38,7 @@ class Verify extends BaseModule
 {
 	private static $errors = [];
 
-	public static function post()
+	public function post()
 	{
 		if (!local_user()) {
 			return;
@@ -78,7 +78,7 @@ class Verify extends BaseModule
 		}
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		if (!local_user()) {
 			DI::baseUrl()->redirect();
diff --git a/src/Module/Settings/Delegation.php b/src/Module/Settings/Delegation.php
index f98583a2a2..a2e4588396 100644
--- a/src/Module/Settings/Delegation.php
+++ b/src/Module/Settings/Delegation.php
@@ -36,7 +36,7 @@ use Friendica\Util\Strings;
  */
 class Delegation extends BaseSettings
 {
-	public static function post()
+	public function post()
 	{
 		if (!DI::app()->isLoggedIn()) {
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
@@ -62,7 +62,7 @@ class Delegation extends BaseSettings
 		DBA::update('user', ['parent-uid' => $parent_uid], ['uid' => local_user()]);
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		parent::content();
 
diff --git a/src/Module/Settings/Display.php b/src/Module/Settings/Display.php
index 42632fe0f8..aab8f864b1 100644
--- a/src/Module/Settings/Display.php
+++ b/src/Module/Settings/Display.php
@@ -36,7 +36,7 @@ use Friendica\Network\HTTPException;
  */
 class Display extends BaseSettings
 {
-	public static function post()
+	public function post()
 	{
 		if (!DI::app()->isLoggedIn()) {
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
@@ -112,7 +112,7 @@ class Display extends BaseSettings
 		DI::baseUrl()->redirect('settings/display');
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		parent::content();
 
diff --git a/src/Module/Settings/Profile/Index.php b/src/Module/Settings/Profile/Index.php
index 8b2510050f..161c440b60 100644
--- a/src/Module/Settings/Profile/Index.php
+++ b/src/Module/Settings/Profile/Index.php
@@ -41,7 +41,7 @@ use Friendica\Util\Temporal;
 
 class Index extends BaseSettings
 {
-	public static function post()
+	public function post()
 	{
 		if (!local_user()) {
 			return;
@@ -135,7 +135,7 @@ class Index extends BaseSettings
 		DI::baseUrl()->redirect('settings/profile');
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		if (!local_user()) {
 			notice(DI::l10n()->t('You must be logged in to use this module'));
diff --git a/src/Module/Settings/Profile/Photo/Crop.php b/src/Module/Settings/Profile/Photo/Crop.php
index b983674383..c23361cf81 100644
--- a/src/Module/Settings/Profile/Photo/Crop.php
+++ b/src/Module/Settings/Profile/Photo/Crop.php
@@ -33,7 +33,7 @@ use Friendica\Network\HTTPException;
 
 class Crop extends BaseSettings
 {
-	public static function post()
+	public function post()
 	{
 		if (!Session::isAuthenticated()) {
 			return;
@@ -160,7 +160,7 @@ class Crop extends BaseSettings
 		DI::baseUrl()->redirect($path);
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		if (!Session::isAuthenticated()) {
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
diff --git a/src/Module/Settings/Profile/Photo/Index.php b/src/Module/Settings/Profile/Photo/Index.php
index 423d0971e8..2e65a01c61 100644
--- a/src/Module/Settings/Profile/Photo/Index.php
+++ b/src/Module/Settings/Profile/Photo/Index.php
@@ -34,7 +34,7 @@ use Friendica\Util\Strings;
 
 class Index extends BaseSettings
 {
-	public static function post()
+	public function post()
 	{
 		if (!Session::isAuthenticated()) {
 			return;
@@ -106,7 +106,7 @@ class Index extends BaseSettings
 		DI::baseUrl()->redirect('settings/profile/photo/crop/' . $resource_id);
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		if (!Session::isAuthenticated()) {
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
diff --git a/src/Module/Settings/TwoFactor/AppSpecific.php b/src/Module/Settings/TwoFactor/AppSpecific.php
index 21304d10e1..74a9ba6578 100644
--- a/src/Module/Settings/TwoFactor/AppSpecific.php
+++ b/src/Module/Settings/TwoFactor/AppSpecific.php
@@ -36,7 +36,7 @@ class AppSpecific extends BaseSettings
 {
 	private static $appSpecificPassword = null;
 
-	public static function init()
+	public function init()
 	{
 		if (!local_user()) {
 			return;
@@ -54,7 +54,7 @@ class AppSpecific extends BaseSettings
 		}
 	}
 
-	public static function post()
+	public function post()
 	{
 		if (!local_user()) {
 			return;
@@ -97,7 +97,7 @@ class AppSpecific extends BaseSettings
 		}
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		if (!local_user()) {
 			return Login::form('settings/2fa/app_specific');
diff --git a/src/Module/Settings/TwoFactor/Index.php b/src/Module/Settings/TwoFactor/Index.php
index b173a092d4..0dcef14ad9 100644
--- a/src/Module/Settings/TwoFactor/Index.php
+++ b/src/Module/Settings/TwoFactor/Index.php
@@ -33,7 +33,7 @@ use PragmaRX\Google2FA\Google2FA;
 
 class Index extends BaseSettings
 {
-	public static function post()
+	public function post()
 	{
 		if (!local_user()) {
 			return;
@@ -94,7 +94,7 @@ class Index extends BaseSettings
 		}
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		if (!local_user()) {
 			return Login::form('settings/2fa');
diff --git a/src/Module/Settings/TwoFactor/Recovery.php b/src/Module/Settings/TwoFactor/Recovery.php
index 25832d2e6f..d46f6a8f52 100644
--- a/src/Module/Settings/TwoFactor/Recovery.php
+++ b/src/Module/Settings/TwoFactor/Recovery.php
@@ -34,7 +34,7 @@ use Friendica\Module\Security\Login;
  */
 class Recovery extends BaseSettings
 {
-	public static function init()
+	public function init()
 	{
 		if (!local_user()) {
 			return;
@@ -52,7 +52,7 @@ class Recovery extends BaseSettings
 		}
 	}
 
-	public static function post()
+	public function post()
 	{
 		if (!local_user()) {
 			return;
@@ -69,7 +69,7 @@ class Recovery extends BaseSettings
 		}
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		if (!local_user()) {
 			return Login::form('settings/2fa/recovery');
diff --git a/src/Module/Settings/TwoFactor/Trusted.php b/src/Module/Settings/TwoFactor/Trusted.php
index c719dc5815..d1e0c177a9 100644
--- a/src/Module/Settings/TwoFactor/Trusted.php
+++ b/src/Module/Settings/TwoFactor/Trusted.php
@@ -14,7 +14,7 @@ use UAParser\Parser;
  */
 class Trusted extends BaseSettings
 {
-	public static function init()
+	public function init()
 	{
 		if (!local_user()) {
 			return;
@@ -32,7 +32,7 @@ class Trusted extends BaseSettings
 		}
 	}
 
-	public static function post()
+	public function post()
 	{
 		if (!local_user()) {
 			return;
@@ -64,7 +64,7 @@ class Trusted extends BaseSettings
 	}
 
 
-	public static function content(): string
+	public function content(): string
 	{
 		parent::content();
 
diff --git a/src/Module/Settings/TwoFactor/Verify.php b/src/Module/Settings/TwoFactor/Verify.php
index 27c9631d4e..18aa6ca9f0 100644
--- a/src/Module/Settings/TwoFactor/Verify.php
+++ b/src/Module/Settings/TwoFactor/Verify.php
@@ -39,7 +39,7 @@ use PragmaRX\Google2FA\Google2FA;
  */
 class Verify extends BaseSettings
 {
-	public static function init()
+	public function init()
 	{
 		if (!local_user()) {
 			return;
@@ -58,7 +58,7 @@ class Verify extends BaseSettings
 		}
 	}
 
-	public static function post()
+	public function post()
 	{
 		if (!local_user()) {
 			return;
@@ -84,7 +84,7 @@ class Verify extends BaseSettings
 		}
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		if (!local_user()) {
 			return Login::form('settings/2fa/verify');
diff --git a/src/Module/Settings/UserExport.php b/src/Module/Settings/UserExport.php
index 27e82c4cf8..b5d79c4af5 100644
--- a/src/Module/Settings/UserExport.php
+++ b/src/Module/Settings/UserExport.php
@@ -51,7 +51,7 @@ class UserExport extends BaseSettings
 	 * @throws HTTPException\ForbiddenException
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	public static function content()
+	public function content(): string
 	{
 		if (!local_user()) {
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
@@ -85,7 +85,7 @@ class UserExport extends BaseSettings
 	 *
 	 * @throws HTTPException\ForbiddenException
 	 */
-	public static function rawContent()
+	public function rawContent()
 	{
 		if (!DI::app()->isLoggedIn()) {
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
diff --git a/src/Module/Smilies.php b/src/Module/Smilies.php
index 1ffff65c07..ded7980050 100644
--- a/src/Module/Smilies.php
+++ b/src/Module/Smilies.php
@@ -33,7 +33,7 @@ use Friendica\DI;
  */
 class Smilies extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		if (!empty(DI::args()->getArgv()[1]) && (DI::args()->getArgv()[1] === "json")) {
 			$smilies = Content\Smilies::getList();
@@ -45,7 +45,7 @@ class Smilies extends BaseModule
 		}
 	}
 
-	public static function content()
+	public function content(): string
 	{
 		$smilies = Content\Smilies::getList();
 		$count = count($smilies['texts'] ?? []);
diff --git a/src/Module/Special/HTTPException.php b/src/Module/Special/HTTPException.php
index 3b771c3ac7..44f48ff2eb 100644
--- a/src/Module/Special/HTTPException.php
+++ b/src/Module/Special/HTTPException.php
@@ -65,7 +65,7 @@ class HTTPException
 	 * @param \Friendica\Network\HTTPException $e
 	 * @throws \Exception
 	 */
-	public static function rawContent(\Friendica\Network\HTTPException $e)
+	public function rawContent(\Friendica\Network\HTTPException $e)
 	{
 		$content = '';
 
@@ -84,7 +84,7 @@ class HTTPException
 	 * @return string
 	 * @throws \Exception
 	 */
-	public static function content(\Friendica\Network\HTTPException $e)
+	public function content(\Friendica\Network\HTTPException $e): string
 	{
 		header($_SERVER["SERVER_PROTOCOL"] . ' ' . $e->getCode() . ' ' . $e->getDescription());
 
diff --git a/src/Module/Statistics.php b/src/Module/Statistics.php
index 6b6e431650..a78031c369 100644
--- a/src/Module/Statistics.php
+++ b/src/Module/Statistics.php
@@ -28,14 +28,14 @@ use Friendica\Network\HTTPException\NotFoundException;
 
 class Statistics extends BaseModule
 {
-	public static function init()
+	public function init()
 	{
 		if (!DI::config()->get("system", "nodeinfo")) {
 			throw new NotFoundException();
 		}
 	}
 
-	public static function rawContent()
+	public function rawContent()
 	{
 		$config = DI::config();
 		$logger = DI::logger();
diff --git a/src/Module/Theme.php b/src/Module/Theme.php
index 201558ab79..cd393d641d 100644
--- a/src/Module/Theme.php
+++ b/src/Module/Theme.php
@@ -30,7 +30,7 @@ use Friendica\Util\Strings;
  */
 class Theme extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		header('Content-Type: text/css');
 
diff --git a/src/Module/ThemeDetails.php b/src/Module/ThemeDetails.php
index 0f45af13c5..5b931e1172 100644
--- a/src/Module/ThemeDetails.php
+++ b/src/Module/ThemeDetails.php
@@ -29,7 +29,7 @@ use Friendica\Core\Theme;
  */
 class ThemeDetails extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		if (!empty($_REQUEST['theme'])) {
 			$theme = $_REQUEST['theme'];
diff --git a/src/Module/ToggleMobile.php b/src/Module/ToggleMobile.php
index 7cf53633a0..a0fb2f88f6 100644
--- a/src/Module/ToggleMobile.php
+++ b/src/Module/ToggleMobile.php
@@ -29,7 +29,7 @@ use Friendica\DI;
  */
 class ToggleMobile extends BaseModule
 {
-	public static function content()
+	public function content(): string
 	{
 		$a = DI::app();
 
@@ -46,5 +46,7 @@ class ToggleMobile extends BaseModule
 		}
 
 		$a->redirect($address);
+
+		return '';
 	}
 }
diff --git a/src/Module/Tos.php b/src/Module/Tos.php
index 1c91641f53..8357ead18a 100644
--- a/src/Module/Tos.php
+++ b/src/Module/Tos.php
@@ -60,7 +60,7 @@ class Tos extends BaseModule
 	 * dealings with their own node so a TOS is not necessary.
 	 *
 	 **/
-	public static function init()
+	public function init()
 	{
 		if (strlen(DI::config()->get('system','singleuser'))) {
 			DI::baseUrl()->redirect('profile/' . DI::config()->get('system','singleuser'));
@@ -79,7 +79,7 @@ class Tos extends BaseModule
 	 * @return string
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function content() {
+	public function content(): string {
 		$tpl = Renderer::getMarkupTemplate('tos.tpl');
 		if (DI::config()->get('system', 'tosdisplay')) {
 			return Renderer::replaceMacros($tpl, [
diff --git a/src/Module/Update/Community.php b/src/Module/Update/Community.php
index 84d2b3a9fc..f42274953d 100644
--- a/src/Module/Update/Community.php
+++ b/src/Module/Update/Community.php
@@ -33,7 +33,7 @@ use Friendica\Module\Conversation\Community as CommunityModule;
  */
 class Community extends CommunityModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::parseRequest();
 
diff --git a/src/Module/Update/Network.php b/src/Module/Update/Network.php
index c6e5225d6f..a1a120ea27 100644
--- a/src/Module/Update/Network.php
+++ b/src/Module/Update/Network.php
@@ -9,7 +9,7 @@ use Friendica\Module\Conversation\Network as NetworkModule;
 
 class Network extends NetworkModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		if (!isset($_GET['p']) || !isset($_GET['item'])) {
 			exit();
diff --git a/src/Module/Update/Profile.php b/src/Module/Update/Profile.php
index 2e9f676f83..b06aea8044 100644
--- a/src/Module/Update/Profile.php
+++ b/src/Module/Update/Profile.php
@@ -35,7 +35,7 @@ use Friendica\Util\DateTimeFormat;
 
 class Profile extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		$a = DI::app();
 
diff --git a/src/Module/Welcome.php b/src/Module/Welcome.php
index c14df0160a..92845cdaff 100644
--- a/src/Module/Welcome.php
+++ b/src/Module/Welcome.php
@@ -30,7 +30,7 @@ use Friendica\DI;
  */
 class Welcome extends BaseModule
 {
-	public static function content()
+	public function content(): string
 	{
 		$config = DI::config();
 
diff --git a/src/Module/WellKnown/HostMeta.php b/src/Module/WellKnown/HostMeta.php
index 14a3a17fe5..a65b4db1a1 100644
--- a/src/Module/WellKnown/HostMeta.php
+++ b/src/Module/WellKnown/HostMeta.php
@@ -33,7 +33,7 @@ use Friendica\Util\Crypto;
  */
 class HostMeta extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		$config = DI::config();
 
diff --git a/src/Module/WellKnown/NodeInfo.php b/src/Module/WellKnown/NodeInfo.php
index f1d8164cb9..a419792806 100644
--- a/src/Module/WellKnown/NodeInfo.php
+++ b/src/Module/WellKnown/NodeInfo.php
@@ -30,7 +30,7 @@ use Friendica\DI;
  */
 class NodeInfo extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		self::printWellKnown();
 	}
diff --git a/src/Module/WellKnown/SecurityTxt.php b/src/Module/WellKnown/SecurityTxt.php
index 317db50feb..73a627c2e7 100644
--- a/src/Module/WellKnown/SecurityTxt.php
+++ b/src/Module/WellKnown/SecurityTxt.php
@@ -29,7 +29,7 @@ use Friendica\BaseModule;
  */
 class SecurityTxt extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		$name = 'security.txt';
 		$fp = fopen($name, 'rt');
diff --git a/src/Module/WellKnown/XSocialRelay.php b/src/Module/WellKnown/XSocialRelay.php
index a66feac039..c401825236 100644
--- a/src/Module/WellKnown/XSocialRelay.php
+++ b/src/Module/WellKnown/XSocialRelay.php
@@ -32,7 +32,7 @@ use Friendica\Protocol\Relay;
  */
 class XSocialRelay extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		$config = DI::config();
 
diff --git a/src/Module/Xrd.php b/src/Module/Xrd.php
index 459059a55f..4a8e32e8ea 100644
--- a/src/Module/Xrd.php
+++ b/src/Module/Xrd.php
@@ -36,7 +36,7 @@ use Friendica\Protocol\Salmon;
  */
 class Xrd extends BaseModule
 {
-	public static function rawContent()
+	public function rawContent()
 	{
 		// @TODO: Replace with parameter from router
 		if (DI::args()->getArgv()[0] == 'xrd') {
diff --git a/tests/src/App/ModuleTest.php b/tests/src/App/ModuleTest.php
index 7f5d65fcf1..65e0873c10 100644
--- a/tests/src/App/ModuleTest.php
+++ b/tests/src/App/ModuleTest.php
@@ -197,7 +197,7 @@ class ModuleTest extends DatabaseTest
 
 		$module = (new App\Module($name))->determineClass(new App\Arguments('', $command), $router, $config, $dice);
 
-		self::assertEquals($assert, $module->getClass()::getClassName());
+		self::assertEquals($assert, $module->getClass()->getClassName());
 	}
 
 	/**

From 587953582273326dfa1ff744827897e1bf1208c9 Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Sun, 14 Nov 2021 23:19:25 +0100
Subject: [PATCH 04/17] Switch `static::$parameters` to `$this->parameters`

---
 src/App/Module.php                            | 12 +++----
 src/BaseModule.php                            |  4 +--
 src/LegacyModule.php                          | 27 +++++++++------
 src/Module/ActivityPub/Followers.php          |  4 +--
 src/Module/ActivityPub/Following.php          |  4 +--
 src/Module/ActivityPub/Inbox.php              |  6 ++--
 src/Module/ActivityPub/Objects.php            | 18 +++++-----
 src/Module/ActivityPub/Outbox.php             |  4 +--
 src/Module/Admin/Addons/Details.php           |  4 +--
 src/Module/Admin/DBSync.php                   |  4 +--
 src/Module/Admin/Item/Source.php              |  2 +-
 src/Module/Admin/Queue.php                    |  2 +-
 src/Module/Admin/Storage.php                  |  2 +-
 src/Module/Admin/Themes/Details.php           |  2 +-
 src/Module/Admin/Themes/Embed.php             |  6 ++--
 src/Module/Admin/Tos.php                      |  2 +-
 src/Module/Admin/Users/Active.php             |  4 +--
 src/Module/Admin/Users/Blocked.php            |  4 +--
 src/Module/Admin/Users/Index.php              |  4 +--
 src/Module/Admin/Users/Pending.php            |  4 +--
 src/Module/Api/Friendica/Activity.php         |  8 ++---
 .../Api/Friendica/DirectMessages/Setseen.php  |  6 ++--
 src/Module/Api/Friendica/Events/Index.php     |  2 +-
 src/Module/Api/Friendica/Notification.php     |  4 +--
 src/Module/Api/Friendica/Photo/Delete.php     |  2 +-
 .../Api/Friendica/Photoalbum/Delete.php       |  2 +-
 .../Api/Friendica/Photoalbum/Update.php       |  2 +-
 src/Module/Api/Friendica/Profile/Show.php     |  4 +--
 .../Api/GNUSocial/GNUSocial/Version.php       |  2 +-
 src/Module/Api/GNUSocial/Help/Test.php        |  4 +--
 src/Module/Api/Mastodon/Accounts.php          | 10 +++---
 src/Module/Api/Mastodon/Accounts/Block.php    |  6 ++--
 src/Module/Api/Mastodon/Accounts/Follow.php   |  4 +--
 .../Api/Mastodon/Accounts/Followers.php       |  6 ++--
 .../Api/Mastodon/Accounts/Following.php       |  6 ++--
 src/Module/Api/Mastodon/Accounts/Lists.php    |  4 +--
 src/Module/Api/Mastodon/Accounts/Mute.php     |  6 ++--
 src/Module/Api/Mastodon/Accounts/Note.php     |  6 ++--
 src/Module/Api/Mastodon/Accounts/Statuses.php |  4 +--
 src/Module/Api/Mastodon/Accounts/Unblock.php  |  6 ++--
 src/Module/Api/Mastodon/Accounts/Unfollow.php |  6 ++--
 src/Module/Api/Mastodon/Accounts/Unmute.php   |  6 ++--
 src/Module/Api/Mastodon/Blocks.php            |  6 ++--
 src/Module/Api/Mastodon/Conversations.php     |  6 ++--
 .../Api/Mastodon/Conversations/Read.php       |  6 ++--
 src/Module/Api/Mastodon/FollowRequests.php    |  4 +--
 src/Module/Api/Mastodon/Lists.php             | 14 ++++----
 src/Module/Api/Mastodon/Lists/Accounts.php    |  4 +--
 src/Module/Api/Mastodon/Media.php             | 10 +++---
 src/Module/Api/Mastodon/Mutes.php             |  6 ++--
 src/Module/Api/Mastodon/Notifications.php     |  4 +--
 .../Api/Mastodon/Notifications/Dismiss.php    |  4 +--
 src/Module/Api/Mastodon/ScheduledStatuses.php | 10 +++---
 src/Module/Api/Mastodon/Search.php            |  2 +-
 src/Module/Api/Mastodon/Statuses.php          |  8 ++---
 src/Module/Api/Mastodon/Statuses/Bookmark.php |  6 ++--
 src/Module/Api/Mastodon/Statuses/Card.php     |  4 +--
 src/Module/Api/Mastodon/Statuses/Context.php  |  4 +--
 .../Api/Mastodon/Statuses/Favourite.php       |  6 ++--
 .../Api/Mastodon/Statuses/FavouritedBy.php    |  4 +--
 src/Module/Api/Mastodon/Statuses/Mute.php     |  8 ++---
 src/Module/Api/Mastodon/Statuses/Pin.php      |  8 ++---
 src/Module/Api/Mastodon/Statuses/Reblog.php   |  6 ++--
 .../Api/Mastodon/Statuses/RebloggedBy.php     |  4 +--
 .../Api/Mastodon/Statuses/Unbookmark.php      |  6 ++--
 .../Api/Mastodon/Statuses/Unfavourite.php     |  6 ++--
 src/Module/Api/Mastodon/Statuses/Unmute.php   |  8 ++---
 src/Module/Api/Mastodon/Statuses/Unpin.php    |  8 ++---
 src/Module/Api/Mastodon/Statuses/Unreblog.php |  6 ++--
 .../Api/Mastodon/Timelines/ListTimeline.php   |  4 +--
 src/Module/Api/Mastodon/Timelines/Tag.php     |  4 +--
 .../Api/Twitter/Account/RateLimitStatus.php   |  4 +--
 src/Module/Api/Twitter/SavedSearches.php      |  2 +-
 src/Module/Attach.php                         |  4 +--
 src/Module/Contact/Advanced.php               |  4 +--
 src/Module/Contact/Contacts.php               |  4 +--
 src/Module/Contact/Media.php                  |  2 +-
 src/Module/Contact/Poke.php                   | 10 +++---
 src/Module/Contact/Revoke.php                 |  6 ++--
 src/Module/Conversation/Community.php         | 12 +++----
 src/Module/Conversation/Network.php           | 14 ++++----
 src/Module/DFRN/Notify.php                    |  4 +--
 src/Module/DFRN/Poll.php                      |  2 +-
 src/Module/Debug/ItemBody.php                 |  4 +--
 src/Module/Diaspora/Fetch.php                 |  4 +--
 src/Module/Diaspora/Receive.php               |  6 ++--
 src/Module/Feed.php                           |  2 +-
 src/Module/Filer/RemoveTag.php                |  2 +-
 src/Module/Filer/SaveTag.php                  |  2 +-
 src/Module/FriendSuggest.php                  |  4 +--
 src/Module/HCard.php                          |  6 ++--
 src/Module/Item/Activity.php                  |  6 ++--
 src/Module/Item/Compose.php                   |  2 +-
 src/Module/Item/Follow.php                    |  4 +--
 src/Module/Item/Ignore.php                    |  4 +--
 src/Module/Item/Pin.php                       |  4 +--
 src/Module/Item/Star.php                      |  4 +--
 src/Module/NoScrape.php                       |  6 ++--
 src/Module/Notifications/Notification.php     |  4 +--
 src/Module/PermissionTooltip.php              |  4 +--
 src/Module/Photo.php                          | 34 +++++++++----------
 src/Module/Profile/Common.php                 |  2 +-
 src/Module/Profile/Contacts.php               |  4 +--
 src/Module/Profile/Index.php                  |  4 +--
 src/Module/Profile/Media.php                  |  2 +-
 src/Module/Profile/Profile.php                | 12 +++----
 src/Module/Profile/Schedule.php               |  2 +-
 src/Module/Profile/Status.php                 | 10 +++---
 src/Module/Proxy.php                          |  8 ++---
 src/Module/PublicRSAKey.php                   |  4 +--
 src/Module/Register.php                       |  2 +-
 src/Module/RemoteFollow.php                   |  4 +--
 src/Module/Settings/Profile/Photo/Crop.php    |  4 +--
 src/Module/Theme.php                          |  2 +-
 src/Module/Update/Community.php               |  2 +-
 src/Module/Update/Network.php                 |  2 +-
 116 files changed, 321 insertions(+), 314 deletions(-)

diff --git a/src/App/Module.php b/src/App/Module.php
index 0ed4b53e57..eb1621b8b3 100644
--- a/src/App/Module.php
+++ b/src/App/Module.php
@@ -182,7 +182,7 @@ class Module
 		 **/
 		try {
 			$module_class = $router->getModuleClass($args->getCommand());
-			$module_parameters = $router->getModuleParameters();
+			$module_parameters[] = $router->getModuleParameters();
 		} catch (MethodNotAllowedException $e) {
 			$module_class = MethodNotAllowed::class;
 		} catch (NotFoundException $e) {
@@ -195,8 +195,8 @@ class Module
 				} else {
 					include_once "addon/{$this->module}/{$this->module}.php";
 					if (function_exists($this->module . '_module')) {
-						LegacyModule::setModuleFile("addon/{$this->module}/{$this->module}.php");
-						$module_class = LegacyModule::class;
+						$module_parameters[] = "addon/{$this->module}/{$this->module}.php";
+						$module_class        = LegacyModule::class;
 					}
 				}
 			}
@@ -205,15 +205,15 @@ class Module
 			 * We emulate a Module class through the LegacyModule class
 			 */
 			if (!$module_class && file_exists("mod/{$this->module}.php")) {
-				LegacyModule::setModuleFile("mod/{$this->module}.php");
-				$module_class = LegacyModule::class;
+				$module_parameters[] = "mod/{$this->module}.php";
+				$module_class        = LegacyModule::class;
 			}
 
 			$module_class = $module_class ?: PageNotFound::class;
 		}
 
 		/** @var ICanHandleRequests $module */
-		$module = $dice->create($module_class, [$module_parameters]);
+		$module = $dice->create($module_class, $module_parameters);
 
 		return new Module($this->module, $module, $this->isBackend, $printNotAllowedAddon);
 	}
diff --git a/src/BaseModule.php b/src/BaseModule.php
index 76458c6c68..2873357fd8 100644
--- a/src/BaseModule.php
+++ b/src/BaseModule.php
@@ -37,11 +37,11 @@ use Friendica\Model\User;
 abstract class BaseModule implements ICanHandleRequests
 {
 	/** @var array */
-	protected static $parameters = [];
+	protected $parameters = [];
 
 	public function __construct(array $parameters = [])
 	{
-		static::$parameters = $parameters;
+		$this->parameters = $parameters;
 	}
 
 	/**
diff --git a/src/LegacyModule.php b/src/LegacyModule.php
index e90b004bc4..5f0cc3103c 100644
--- a/src/LegacyModule.php
+++ b/src/LegacyModule.php
@@ -35,7 +35,14 @@ class LegacyModule extends BaseModule
 	 *
 	 * @var string
 	 */
-	private static $moduleName = '';
+	private $moduleName = '';
+
+	public function __construct(string $file_path = '', array $parameters = [])
+	{
+		parent::__construct($parameters);
+
+		$this->setModuleFile($file_path);
+	}
 
 	/**
 	 * The only method that needs to be called, with the module/addon file name.
@@ -43,35 +50,35 @@ class LegacyModule extends BaseModule
 	 * @param string $file_path
 	 * @throws \Exception
 	 */
-	public static function setModuleFile($file_path)
+	private function setModuleFile($file_path)
 	{
 		if (!is_readable($file_path)) {
 			throw new \Exception(DI::l10n()->t('Legacy module file not found: %s', $file_path));
 		}
 
-		self::$moduleName = basename($file_path, '.php');
+		$this->moduleName = basename($file_path, '.php');
 
 		require_once $file_path;
 	}
 
 	public function init()
 	{
-		self::runModuleFunction('init', static::$parameters);
+		$this->runModuleFunction('init');
 	}
 
 	public function content(): string
 	{
-		return self::runModuleFunction('content', static::$parameters);
+		return $this->runModuleFunction('content');
 	}
 
 	public function post()
 	{
-		self::runModuleFunction('post', static::$parameters);
+		$this->runModuleFunction('post');
 	}
 
 	public function afterpost()
 	{
-		self::runModuleFunction('afterpost', static::$parameters);
+		$this->runModuleFunction('afterpost');
 	}
 
 	/**
@@ -81,15 +88,15 @@ class LegacyModule extends BaseModule
 	 * @return string
 	 * @throws \Exception
 	 */
-	private static function runModuleFunction($function_suffix, array $parameters = [])
+	private function runModuleFunction(string $function_suffix)
 	{
-		$function_name = static::$moduleName . '_' . $function_suffix;
+		$function_name = $this->moduleName . '_' . $function_suffix;
 
 		if (\function_exists($function_name)) {
 			$a = DI::app();
 			return $function_name($a);
 		} else {
-			return parent::{$function_suffix}($parameters);
+			return parent::{$function_suffix}($this->parameters);
 		}
 	}
 }
diff --git a/src/Module/ActivityPub/Followers.php b/src/Module/ActivityPub/Followers.php
index e19e7eacfd..d25e4693c9 100644
--- a/src/Module/ActivityPub/Followers.php
+++ b/src/Module/ActivityPub/Followers.php
@@ -33,12 +33,12 @@ class Followers extends BaseModule
 {
 	public function rawContent()
 	{
-		if (empty(static::$parameters['nickname'])) {
+		if (empty($this->parameters['nickname'])) {
 			throw new \Friendica\Network\HTTPException\NotFoundException();
 		}
 
 		// @TODO: Replace with parameter from router
-		$owner = User::getOwnerDataByNick(static::$parameters['nickname']);
+		$owner = User::getOwnerDataByNick($this->parameters['nickname']);
 		if (empty($owner)) {
 			throw new \Friendica\Network\HTTPException\NotFoundException();
 		}
diff --git a/src/Module/ActivityPub/Following.php b/src/Module/ActivityPub/Following.php
index 2fa2d640f7..3b45cf09a6 100644
--- a/src/Module/ActivityPub/Following.php
+++ b/src/Module/ActivityPub/Following.php
@@ -33,11 +33,11 @@ class Following extends BaseModule
 {
 	public function rawContent()
 	{
-		if (empty(static::$parameters['nickname'])) {
+		if (empty($this->parameters['nickname'])) {
 			throw new \Friendica\Network\HTTPException\NotFoundException();
 		}
 
-		$owner = User::getOwnerDataByNick(static::$parameters['nickname']);
+		$owner = User::getOwnerDataByNick($this->parameters['nickname']);
 		if (empty($owner)) {
 			throw new \Friendica\Network\HTTPException\NotFoundException();
 		}
diff --git a/src/Module/ActivityPub/Inbox.php b/src/Module/ActivityPub/Inbox.php
index 4056a7de3b..149e511069 100644
--- a/src/Module/ActivityPub/Inbox.php
+++ b/src/Module/ActivityPub/Inbox.php
@@ -50,12 +50,12 @@ class Inbox extends BaseModule
 				$filename = 'failed-activitypub';
 			}
 			$tempfile = tempnam(System::getTempPath(), $filename);
-			file_put_contents($tempfile, json_encode(['parameters' => static::$parameters, 'header' => $_SERVER, 'body' => $postdata], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
+			file_put_contents($tempfile, json_encode(['parameters' => $this->parameters, 'header' => $_SERVER, 'body' => $postdata], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
 			Logger::notice('Incoming message stored', ['file' => $tempfile]);
 		}
 
-		if (!empty(static::$parameters['nickname'])) {
-			$user = DBA::selectFirst('user', ['uid'], ['nickname' => static::$parameters['nickname']]);
+		if (!empty($this->parameters['nickname'])) {
+			$user = DBA::selectFirst('user', ['uid'], ['nickname' => $this->parameters['nickname']]);
 			if (!DBA::isResult($user)) {
 				throw new \Friendica\Network\HTTPException\NotFoundException();
 			}
diff --git a/src/Module/ActivityPub/Objects.php b/src/Module/ActivityPub/Objects.php
index eedcb0bd44..5798c5685d 100644
--- a/src/Module/ActivityPub/Objects.php
+++ b/src/Module/ActivityPub/Objects.php
@@ -43,7 +43,7 @@ class Objects extends BaseModule
 {
 	public function rawContent()
 	{
-		if (empty(static::$parameters['guid'])) {
+		if (empty($this->parameters['guid'])) {
 			throw new HTTPException\BadRequestException();
 		}
 
@@ -51,10 +51,10 @@ class Objects extends BaseModule
 			DI::baseUrl()->redirect(str_replace('objects/', 'display/', DI::args()->getQueryString()));
 		}
 
-		$itemuri = DBA::selectFirst('item-uri', ['id'], ['guid' => static::$parameters['guid']]);
+		$itemuri = DBA::selectFirst('item-uri', ['id'], ['guid' => $this->parameters['guid']]);
 
 		if (DBA::isResult($itemuri)) {
-			Logger::info('Provided GUID found.', ['guid' => static::$parameters['guid'], 'uri-id' => $itemuri['id']]);
+			Logger::info('Provided GUID found.', ['guid' => $this->parameters['guid'], 'uri-id' => $itemuri['id']]);
 		} else {
 			// The item URI does not always contain the GUID. This means that we have to search the URL instead
 			$url = DI::baseUrl()->get() . '/' . DI::args()->getQueryString();
@@ -104,11 +104,11 @@ class Objects extends BaseModule
 			throw new HTTPException\NotFoundException();
 		}
 
-		$etag          = md5(static::$parameters['guid'] . '-' . $item['changed']);
+		$etag          = md5($this->parameters['guid'] . '-' . $item['changed']);
 		$last_modified = $item['changed'];
 		Network::checkEtagModified($etag, $last_modified);
 
-		if (empty(static::$parameters['activity']) && ($item['gravity'] != GRAVITY_ACTIVITY)) {
+		if (empty($this->parameters['activity']) && ($item['gravity'] != GRAVITY_ACTIVITY)) {
 			$activity = ActivityPub\Transmitter::createActivityFromItem($item['id'], true);
 			if (empty($activity['type'])) {
 				throw new HTTPException\NotFoundException();
@@ -123,16 +123,16 @@ class Objects extends BaseModule
 
 			$data = ['@context' => ActivityPub::CONTEXT];
 			$data = array_merge($data, $activity['object']);
-		} elseif (empty(static::$parameters['activity']) || in_array(static::$parameters['activity'],
+		} elseif (empty($this->parameters['activity']) || in_array($this->parameters['activity'],
 			['Create', 'Announce', 'Update', 'Like', 'Dislike', 'Accept', 'Reject',
 			'TentativeAccept', 'Follow', 'Add'])) {
 			$data = ActivityPub\Transmitter::createActivityFromItem($item['id']);
 			if (empty($data)) {
 				throw new HTTPException\NotFoundException();
 			}
-			if (!empty(static::$parameters['activity']) && (static::$parameters['activity'] != 'Create')) {
-				$data['type'] = static::$parameters['activity'];
-				$data['id'] = str_replace('/Create', '/' . static::$parameters['activity'], $data['id']);
+			if (!empty($this->parameters['activity']) && ($this->parameters['activity'] != 'Create')) {
+				$data['type'] = $this->parameters['activity'];
+				$data['id'] = str_replace('/Create', '/' . $this->parameters['activity'], $data['id']);
 			}
 		} else {
 			throw new HTTPException\NotFoundException();
diff --git a/src/Module/ActivityPub/Outbox.php b/src/Module/ActivityPub/Outbox.php
index 55144ce1b0..c459a55e30 100644
--- a/src/Module/ActivityPub/Outbox.php
+++ b/src/Module/ActivityPub/Outbox.php
@@ -33,11 +33,11 @@ class Outbox extends BaseModule
 {
 	public function rawContent()
 	{
-		if (empty(static::$parameters['nickname'])) {
+		if (empty($this->parameters['nickname'])) {
 			throw new \Friendica\Network\HTTPException\NotFoundException();
 		}
 
-		$owner = User::getOwnerDataByNick(static::$parameters['nickname']);
+		$owner = User::getOwnerDataByNick($this->parameters['nickname']);
 		if (empty($owner)) {
 			throw new \Friendica\Network\HTTPException\NotFoundException();
 		}
diff --git a/src/Module/Admin/Addons/Details.php b/src/Module/Admin/Addons/Details.php
index 7748926cc8..bab52fb0de 100644
--- a/src/Module/Admin/Addons/Details.php
+++ b/src/Module/Admin/Addons/Details.php
@@ -34,7 +34,7 @@ class Details extends BaseAdmin
 	{
 		self::checkAdminAccess();
 
-		$addon = Strings::sanitizeFilePathItem(static::$parameters['addon']);
+		$addon = Strings::sanitizeFilePathItem($this->parameters['addon']);
 
 		$redirect = 'admin/addons/' . $addon;
 
@@ -60,7 +60,7 @@ class Details extends BaseAdmin
 
 		$addons_admin = Addon::getAdminList();
 
-		$addon = Strings::sanitizeFilePathItem(static::$parameters['addon']);
+		$addon = Strings::sanitizeFilePathItem($this->parameters['addon']);
 		if (!is_file("addon/$addon/$addon.php")) {
 			notice(DI::l10n()->t('Addon not found.'));
 			Addon::uninstall($addon);
diff --git a/src/Module/Admin/DBSync.php b/src/Module/Admin/DBSync.php
index 90588cfa91..6ef8d804ae 100644
--- a/src/Module/Admin/DBSync.php
+++ b/src/Module/Admin/DBSync.php
@@ -36,8 +36,8 @@ class DBSync extends BaseAdmin
 
 		$a = DI::app();
 
-		$action = static::$parameters['action'] ?? '';
-		$update = static::$parameters['update'] ?? 0;
+		$action = $this->parameters['action'] ?? '';
+		$update = $this->parameters['update'] ?? 0;
 
 		switch ($action) {
 			case 'mark':
diff --git a/src/Module/Admin/Item/Source.php b/src/Module/Admin/Item/Source.php
index 9b81d9e766..c1edabf608 100644
--- a/src/Module/Admin/Item/Source.php
+++ b/src/Module/Admin/Item/Source.php
@@ -33,7 +33,7 @@ class Source extends BaseAdmin
 	{
 		parent::content();
 
-		$guid = basename($_REQUEST['guid'] ?? static::$parameters['guid'] ?? '');
+		$guid = basename($_REQUEST['guid'] ?? $this->parameters['guid'] ?? '');
 
 		$source = '';
 		$item_uri = '';
diff --git a/src/Module/Admin/Queue.php b/src/Module/Admin/Queue.php
index b3460c9aab..f43dfdc095 100644
--- a/src/Module/Admin/Queue.php
+++ b/src/Module/Admin/Queue.php
@@ -42,7 +42,7 @@ class Queue extends BaseAdmin
 	{
 		parent::content();
 
-		$status = static::$parameters['status'] ?? '';
+		$status = $this->parameters['status'] ?? '';
 
 		// get jobs from the workerqueue table
 		if ($status == 'deferred') {
diff --git a/src/Module/Admin/Storage.php b/src/Module/Admin/Storage.php
index d0d9c3aa4e..68d7d065d0 100644
--- a/src/Module/Admin/Storage.php
+++ b/src/Module/Admin/Storage.php
@@ -37,7 +37,7 @@ class Storage extends BaseAdmin
 
 		self::checkFormSecurityTokenRedirectOnError('/admin/storage', 'admin_storage');
 
-		$storagebackend = trim(static::$parameters['name'] ?? '');
+		$storagebackend = trim($this->parameters['name'] ?? '');
 
 		try {
 			/** @var ICanConfigureStorage|false $newStorageConfig */
diff --git a/src/Module/Admin/Themes/Details.php b/src/Module/Admin/Themes/Details.php
index b81b76ab32..b7161d1b96 100644
--- a/src/Module/Admin/Themes/Details.php
+++ b/src/Module/Admin/Themes/Details.php
@@ -34,7 +34,7 @@ class Details extends BaseAdmin
 	{
 		parent::content();
 
-		$theme = Strings::sanitizeFilePathItem(static::$parameters['theme']);
+		$theme = Strings::sanitizeFilePathItem($this->parameters['theme']);
 		if (!is_dir("view/theme/$theme")) {
 			notice(DI::l10n()->t("Item not found."));
 			return '';
diff --git a/src/Module/Admin/Themes/Embed.php b/src/Module/Admin/Themes/Embed.php
index 2779338022..bf4e5b5560 100644
--- a/src/Module/Admin/Themes/Embed.php
+++ b/src/Module/Admin/Themes/Embed.php
@@ -30,7 +30,7 @@ class Embed extends BaseAdmin
 {
 	public function init()
 	{
-		$theme = Strings::sanitizeFilePathItem(static::$parameters['theme']);
+		$theme = Strings::sanitizeFilePathItem($this->parameters['theme']);
 		if (is_file("view/theme/$theme/config.php")) {
 			DI::app()->setCurrentTheme($theme);
 		}
@@ -40,7 +40,7 @@ class Embed extends BaseAdmin
 	{
 		self::checkAdminAccess();
 
-		$theme = Strings::sanitizeFilePathItem(static::$parameters['theme']);
+		$theme = Strings::sanitizeFilePathItem($this->parameters['theme']);
 		if (is_file("view/theme/$theme/config.php")) {
 			require_once "view/theme/$theme/config.php";
 			if (function_exists('theme_admin_post')) {
@@ -60,7 +60,7 @@ class Embed extends BaseAdmin
 	{
 		parent::content();
 
-		$theme = Strings::sanitizeFilePathItem(static::$parameters['theme']);
+		$theme = Strings::sanitizeFilePathItem($this->parameters['theme']);
 		if (!is_dir("view/theme/$theme")) {
 			notice(DI::l10n()->t('Unknown theme.'));
 			return '';
diff --git a/src/Module/Admin/Tos.php b/src/Module/Admin/Tos.php
index 3c0b00debc..17c8372b00 100644
--- a/src/Module/Admin/Tos.php
+++ b/src/Module/Admin/Tos.php
@@ -52,7 +52,7 @@ class Tos extends BaseAdmin
 	{
 		parent::content();
 
-		$tos = new \Friendica\Module\Tos(static::$parameters);
+		$tos = new \Friendica\Module\Tos($this->parameters);
 		$t = Renderer::getMarkupTemplate('admin/tos.tpl');
 		return Renderer::replaceMacros($t, [
 			'$title' => DI::l10n()->t('Administration'),
diff --git a/src/Module/Admin/Users/Active.php b/src/Module/Admin/Users/Active.php
index 613c897649..6bcd22be4e 100644
--- a/src/Module/Admin/Users/Active.php
+++ b/src/Module/Admin/Users/Active.php
@@ -64,8 +64,8 @@ class Active extends BaseUsers
 	{
 		parent::content();
 
-		$action = static::$parameters['action'] ?? '';
-		$uid = static::$parameters['uid'] ?? 0;
+		$action = $this->parameters['action'] ?? '';
+		$uid = $this->parameters['uid'] ?? 0;
 
 		if ($uid) {
 			$user = User::getById($uid, ['username', 'blocked']);
diff --git a/src/Module/Admin/Users/Blocked.php b/src/Module/Admin/Users/Blocked.php
index 9ef6dab87d..a24c95df0b 100644
--- a/src/Module/Admin/Users/Blocked.php
+++ b/src/Module/Admin/Users/Blocked.php
@@ -65,8 +65,8 @@ class Blocked extends BaseUsers
 	{
 		parent::content();
 
-		$action = static::$parameters['action'] ?? '';
-		$uid = static::$parameters['uid'] ?? 0;
+		$action = $this->parameters['action'] ?? '';
+		$uid = $this->parameters['uid'] ?? 0;
 
 		if ($uid) {
 			$user = User::getById($uid, ['username', 'blocked']);
diff --git a/src/Module/Admin/Users/Index.php b/src/Module/Admin/Users/Index.php
index dff00083b2..eb7b57c25c 100644
--- a/src/Module/Admin/Users/Index.php
+++ b/src/Module/Admin/Users/Index.php
@@ -71,8 +71,8 @@ class Index extends BaseUsers
 	{
 		parent::content();
 
-		$action = static::$parameters['action'] ?? '';
-		$uid = static::$parameters['uid'] ?? 0;
+		$action = $this->parameters['action'] ?? '';
+		$uid = $this->parameters['uid'] ?? 0;
 
 		if ($uid) {
 			$user = User::getById($uid, ['username', 'blocked']);
diff --git a/src/Module/Admin/Users/Pending.php b/src/Module/Admin/Users/Pending.php
index eb90db7b93..801c159742 100644
--- a/src/Module/Admin/Users/Pending.php
+++ b/src/Module/Admin/Users/Pending.php
@@ -62,8 +62,8 @@ class Pending extends BaseUsers
 	{
 		parent::content();
 
-		$action = static::$parameters['action'] ?? '';
-		$uid = static::$parameters['uid'] ?? 0;
+		$action = $this->parameters['action'] ?? '';
+		$uid = $this->parameters['uid'] ?? 0;
 
 		if ($uid) {
 			$user = User::getById($uid, ['username', 'blocked']);
diff --git a/src/Module/Api/Friendica/Activity.php b/src/Module/Api/Friendica/Activity.php
index 5f28297b42..1b2b95d06a 100644
--- a/src/Module/Api/Friendica/Activity.php
+++ b/src/Module/Api/Friendica/Activity.php
@@ -49,17 +49,17 @@ class Activity extends BaseApi
 			'id' => 0, // Id of the post
 		]);
 
-		$res = Item::performActivity($request['id'], static::$parameters['verb'], $uid);
+		$res = Item::performActivity($request['id'], $this->parameters['verb'], $uid);
 
 		if ($res) {
-			if (!empty(static::$parameters['extension']) && (static::$parameters['extension'] == 'xml')) {
+			if (!empty($this->parameters['extension']) && ($this->parameters['extension'] == 'xml')) {
 				$ok = 'true';
 			} else {
 				$ok = 'ok';
 			}
-			DI::apiResponse()->exit('ok', ['ok' => $ok], static::$parameters['extension'] ?? null);
+			DI::apiResponse()->exit('ok', ['ok' => $ok], $this->parameters['extension'] ?? null);
 		} else {
-			DI::apiResponse()->error(500, 'Error adding activity', '', static::$parameters['extension'] ?? null);
+			DI::apiResponse()->error(500, 'Error adding activity', '', $this->parameters['extension'] ?? null);
 		}
 	}
 }
diff --git a/src/Module/Api/Friendica/DirectMessages/Setseen.php b/src/Module/Api/Friendica/DirectMessages/Setseen.php
index 944376aad4..600d5fe171 100644
--- a/src/Module/Api/Friendica/DirectMessages/Setseen.php
+++ b/src/Module/Api/Friendica/DirectMessages/Setseen.php
@@ -42,13 +42,13 @@ class Setseen extends BaseApi
 		// return error if id is zero
 		if (empty($request['id'])) {
 			$answer = ['result' => 'error', 'message' => 'message id not specified'];
-			DI::apiResponse()->exit('direct_messages_setseen', ['$result' => $answer], static::$parameters['extension'] ?? null);
+			DI::apiResponse()->exit('direct_messages_setseen', ['$result' => $answer], $this->parameters['extension'] ?? null);
 		}
 
 		// error message if specified id is not in database
 		if (!DBA::exists('mail', ['id' => $request['id'], 'uid' => $uid])) {
 			$answer = ['result' => 'error', 'message' => 'message id not in database'];
-			DI::apiResponse()->exit('direct_messages_setseen', ['$result' => $answer], static::$parameters['extension'] ?? null);
+			DI::apiResponse()->exit('direct_messages_setseen', ['$result' => $answer], $this->parameters['extension'] ?? null);
 		}
 
 		// update seen indicator
@@ -58,6 +58,6 @@ class Setseen extends BaseApi
 			$answer = ['result' => 'error', 'message' => 'unknown error'];
 		}
 
-		DI::apiResponse()->exit('direct_messages_setseen', ['$result' => $answer], static::$parameters['extension'] ?? null);
+		DI::apiResponse()->exit('direct_messages_setseen', ['$result' => $answer], $this->parameters['extension'] ?? null);
 	}
 }
diff --git a/src/Module/Api/Friendica/Events/Index.php b/src/Module/Api/Friendica/Events/Index.php
index 439e021f36..b6cfdd0982 100644
--- a/src/Module/Api/Friendica/Events/Index.php
+++ b/src/Module/Api/Friendica/Events/Index.php
@@ -70,6 +70,6 @@ class Index extends BaseApi
 			];
 		}
 
-		DI::apiResponse()->exit('events', ['events' => $items], static::$parameters['extension'] ?? null);
+		DI::apiResponse()->exit('events', ['events' => $items], $this->parameters['extension'] ?? null);
 	}
 }
diff --git a/src/Module/Api/Friendica/Notification.php b/src/Module/Api/Friendica/Notification.php
index 3057c8cb77..9d316d94da 100644
--- a/src/Module/Api/Friendica/Notification.php
+++ b/src/Module/Api/Friendica/Notification.php
@@ -43,7 +43,7 @@ class Notification extends BaseApi
 			$notifications[] = new ApiNotification($Notify);
 		}
 
-		if (!empty(static::$parameters['extension']) && (static::$parameters['extension'] == 'xml')) {
+		if (!empty($this->parameters['extension']) && ($this->parameters['extension'] == 'xml')) {
 			$xmlnotes = [];
 			foreach ($notifications as $notification) {
 				$xmlnotes[] = ['@attributes' => $notification->toArray()];
@@ -56,6 +56,6 @@ class Notification extends BaseApi
 			$result = false;
 		}
 
-		DI::apiResponse()->exit('notes', ['note' => $result], static::$parameters['extension'] ?? null);
+		DI::apiResponse()->exit('notes', ['note' => $result], $this->parameters['extension'] ?? null);
 	}
 }
diff --git a/src/Module/Api/Friendica/Photo/Delete.php b/src/Module/Api/Friendica/Photo/Delete.php
index d982966258..ab749b4e87 100644
--- a/src/Module/Api/Friendica/Photo/Delete.php
+++ b/src/Module/Api/Friendica/Photo/Delete.php
@@ -64,7 +64,7 @@ class Delete extends BaseApi
 			Item::deleteForUser($condition, $uid);
 
 			$result = ['result' => 'deleted', 'message' => 'photo with id `' . $request['photo_id'] . '` has been deleted from server.'];
-			DI::apiResponse()->exit('photo_delete', ['$result' => $result], static::$parameters['extension'] ?? null);
+			DI::apiResponse()->exit('photo_delete', ['$result' => $result], $this->parameters['extension'] ?? null);
 		} else {
 			throw new InternalServerErrorException("unknown error on deleting photo from database table");
 		}
diff --git a/src/Module/Api/Friendica/Photoalbum/Delete.php b/src/Module/Api/Friendica/Photoalbum/Delete.php
index 01d05f44b0..0a403270d1 100644
--- a/src/Module/Api/Friendica/Photoalbum/Delete.php
+++ b/src/Module/Api/Friendica/Photoalbum/Delete.php
@@ -67,7 +67,7 @@ class Delete extends BaseApi
 		// return success of deletion or error message
 		if ($result) {
 			$answer = ['result' => 'deleted', 'message' => 'album `' . $request['album'] . '` with all containing photos has been deleted.'];
-			DI::apiResponse()->exit('photoalbum_delete', ['$result' => $answer], static::$parameters['extension'] ?? null);
+			DI::apiResponse()->exit('photoalbum_delete', ['$result' => $answer], $this->parameters['extension'] ?? null);
 		} else {
 			throw new InternalServerErrorException("unknown error - deleting from database failed");
 		}
diff --git a/src/Module/Api/Friendica/Photoalbum/Update.php b/src/Module/Api/Friendica/Photoalbum/Update.php
index b45f6ced41..9fc89dbf6d 100644
--- a/src/Module/Api/Friendica/Photoalbum/Update.php
+++ b/src/Module/Api/Friendica/Photoalbum/Update.php
@@ -59,7 +59,7 @@ class Update extends BaseApi
 		// return success of updating or error message
 		if ($result) {
 			$answer = ['result' => 'updated', 'message' => 'album `' . $request['album'] . '` with all containing photos has been renamed to `' . $request['album_new'] . '`.'];
-			DI::apiResponse()->exit('photoalbum_update', ['$result' => $answer], static::$parameters['extension'] ?? null);
+			DI::apiResponse()->exit('photoalbum_update', ['$result' => $answer], $this->parameters['extension'] ?? null);
 		} else {
 			throw new InternalServerErrorException("unknown error - updating in database failed");
 		}
diff --git a/src/Module/Api/Friendica/Profile/Show.php b/src/Module/Api/Friendica/Profile/Show.php
index a1280eb7c9..fe0315a84d 100644
--- a/src/Module/Api/Friendica/Profile/Show.php
+++ b/src/Module/Api/Friendica/Profile/Show.php
@@ -49,7 +49,7 @@ class Show extends BaseApi
 		$profile = self::formatProfile($profile, $profileFields);
 
 		$profiles = [];
-		if (!empty(static::$parameters['extension']) && (static::$parameters['extension'] == 'xml')) {
+		if (!empty($this->parameters['extension']) && ($this->parameters['extension'] == 'xml')) {
 			$profiles['0:profile'] = $profile;
 		} else {
 			$profiles[] = $profile;
@@ -65,7 +65,7 @@ class Show extends BaseApi
 			'profiles' => $profiles
 		];
 
-		DI::apiResponse()->exit('friendica_profiles', ['$result' => $result], static::$parameters['extension'] ?? null);
+		DI::apiResponse()->exit('friendica_profiles', ['$result' => $result], $this->parameters['extension'] ?? null);
 	}
 
 	/**
diff --git a/src/Module/Api/GNUSocial/GNUSocial/Version.php b/src/Module/Api/GNUSocial/GNUSocial/Version.php
index d8ff5c95fa..c9c7b98fd1 100644
--- a/src/Module/Api/GNUSocial/GNUSocial/Version.php
+++ b/src/Module/Api/GNUSocial/GNUSocial/Version.php
@@ -31,6 +31,6 @@ class Version extends BaseApi
 {
 	public function rawContent()
 	{
-		DI::apiResponse()->exit('version', ['version' => '0.9.7'], static::$parameters['extension'] ?? null);
+		DI::apiResponse()->exit('version', ['version' => '0.9.7'], $this->parameters['extension'] ?? null);
 	}
 }
diff --git a/src/Module/Api/GNUSocial/Help/Test.php b/src/Module/Api/GNUSocial/Help/Test.php
index d157822862..78f18c3e60 100644
--- a/src/Module/Api/GNUSocial/Help/Test.php
+++ b/src/Module/Api/GNUSocial/Help/Test.php
@@ -31,12 +31,12 @@ class Test extends BaseApi
 {
 	public function rawContent()
 	{
-		if (!empty(static::$parameters['extension']) && (static::$parameters['extension'] == 'xml')) {
+		if (!empty($this->parameters['extension']) && ($this->parameters['extension'] == 'xml')) {
 			$ok = 'true';
 		} else {
 			$ok = 'ok';
 		}
 
-		DI::apiResponse()->exit('ok', ['ok' => $ok], static::$parameters['extension'] ?? null);
+		DI::apiResponse()->exit('ok', ['ok' => $ok], $this->parameters['extension'] ?? null);
 	}
 }
diff --git a/src/Module/Api/Mastodon/Accounts.php b/src/Module/Api/Mastodon/Accounts.php
index 13981684f0..552889661b 100644
--- a/src/Module/Api/Mastodon/Accounts.php
+++ b/src/Module/Api/Mastodon/Accounts.php
@@ -39,20 +39,20 @@ class Accounts extends BaseApi
 	{
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id']) && empty(static::$parameters['name'])) {
+		if (empty($this->parameters['id']) && empty($this->parameters['name'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		if (!empty(static::$parameters['id'])) {
-			$id = static::$parameters['id'];
+		if (!empty($this->parameters['id'])) {
+			$id = $this->parameters['id'];
 			if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) {
 				DI::mstdnError()->RecordNotFound();
 			}
 		} else {
-			$contact = Contact::selectFirst(['id'], ['nick' => static::$parameters['name'], 'uid' => 0]);
+			$contact = Contact::selectFirst(['id'], ['nick' => $this->parameters['name'], 'uid' => 0]);
 			if (!empty($contact['id'])) {
 				$id = $contact['id'];
-			} elseif (!($id = Contact::getIdForURL(static::$parameters['name'], 0, false))) {
+			} elseif (!($id = Contact::getIdForURL($this->parameters['name'], 0, false))) {
 				DI::mstdnError()->RecordNotFound();
 			}
 		}
diff --git a/src/Module/Api/Mastodon/Accounts/Block.php b/src/Module/Api/Mastodon/Accounts/Block.php
index 522eeb11f5..b2ae98bd56 100644
--- a/src/Module/Api/Mastodon/Accounts/Block.php
+++ b/src/Module/Api/Mastodon/Accounts/Block.php
@@ -37,7 +37,7 @@ class Block extends BaseApi
 		self::checkAllowedScope(self::SCOPE_FOLLOW);
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
@@ -46,7 +46,7 @@ class Block extends BaseApi
 			DI::mstdnError()->Forbidden();
 		}
 
-		$cdata = Contact::getPublicAndUserContactID(static::$parameters['id'], $uid);
+		$cdata = Contact::getPublicAndUserContactID($this->parameters['id'], $uid);
 		if (empty($cdata['user'])) {
 			DI::mstdnError()->RecordNotFound();
 		}
@@ -62,6 +62,6 @@ class Block extends BaseApi
 		Contact::terminateFriendship($owner, $contact);
 		Contact::revokeFollow($contact);
 
-		System::jsonExit(DI::mstdnRelationship()->createFromContactId(static::$parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnRelationship()->createFromContactId($this->parameters['id'], $uid)->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/Accounts/Follow.php b/src/Module/Api/Mastodon/Accounts/Follow.php
index 3ed7611724..86b932421d 100644
--- a/src/Module/Api/Mastodon/Accounts/Follow.php
+++ b/src/Module/Api/Mastodon/Accounts/Follow.php
@@ -36,11 +36,11 @@ class Follow extends BaseApi
 		self::checkAllowedScope(self::SCOPE_FOLLOW);
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$cid = Contact::follow(static::$parameters['id'], $uid);
+		$cid = Contact::follow($this->parameters['id'], $uid);
 
 		System::jsonExit(DI::mstdnRelationship()->createFromContactId($cid, $uid)->toArray());
 	}
diff --git a/src/Module/Api/Mastodon/Accounts/Followers.php b/src/Module/Api/Mastodon/Accounts/Followers.php
index 3270da828c..981d2c715d 100644
--- a/src/Module/Api/Mastodon/Accounts/Followers.php
+++ b/src/Module/Api/Mastodon/Accounts/Followers.php
@@ -39,11 +39,11 @@ class Followers extends BaseApi
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$id = static::$parameters['id'];
+		$id = $this->parameters['id'];
 		if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) {
 			DI::mstdnError()->RecordNotFound();
 		}
@@ -72,7 +72,7 @@ class Followers extends BaseApi
 			$params['order'] = ['cid'];
 		}
 
-		$followers = DBA::select('contact-relation', ['relation-cid'], $condition, static::$parameters);
+		$followers = DBA::select('contact-relation', ['relation-cid'], $condition, $this->parameters);
 		while ($follower = DBA::fetch($followers)) {
 			self::setBoundaries($follower['relation-cid']);
 			$accounts[] = DI::mstdnAccount()->createFromContactId($follower['relation-cid'], $uid);
diff --git a/src/Module/Api/Mastodon/Accounts/Following.php b/src/Module/Api/Mastodon/Accounts/Following.php
index 9768d2a039..41352ddaf5 100644
--- a/src/Module/Api/Mastodon/Accounts/Following.php
+++ b/src/Module/Api/Mastodon/Accounts/Following.php
@@ -39,11 +39,11 @@ class Following extends BaseApi
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$id = static::$parameters['id'];
+		$id = $this->parameters['id'];
 		if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) {
 			DI::mstdnError()->RecordNotFound();
 		}
@@ -72,7 +72,7 @@ class Following extends BaseApi
 			$params['order'] = ['cid'];
 		}
 
-		$followers = DBA::select('contact-relation', ['cid'], $condition, static::$parameters);
+		$followers = DBA::select('contact-relation', ['cid'], $condition, $this->parameters);
 		while ($follower = DBA::fetch($followers)) {
 			self::setBoundaries($follower['cid']);
 			$accounts[] = DI::mstdnAccount()->createFromContactId($follower['cid'], $uid);
diff --git a/src/Module/Api/Mastodon/Accounts/Lists.php b/src/Module/Api/Mastodon/Accounts/Lists.php
index 4860c4fe53..f34b961b63 100644
--- a/src/Module/Api/Mastodon/Accounts/Lists.php
+++ b/src/Module/Api/Mastodon/Accounts/Lists.php
@@ -40,11 +40,11 @@ class Lists extends BaseApi
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$id = static::$parameters['id'];
+		$id = $this->parameters['id'];
 		if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) {
 			DI::mstdnError()->RecordNotFound();
 		}
diff --git a/src/Module/Api/Mastodon/Accounts/Mute.php b/src/Module/Api/Mastodon/Accounts/Mute.php
index 159afdfd93..1c711db750 100644
--- a/src/Module/Api/Mastodon/Accounts/Mute.php
+++ b/src/Module/Api/Mastodon/Accounts/Mute.php
@@ -36,12 +36,12 @@ class Mute extends BaseApi
 		self::checkAllowedScope(self::SCOPE_FOLLOW);
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		Contact\User::setIgnored(static::$parameters['id'], $uid, true);
+		Contact\User::setIgnored($this->parameters['id'], $uid, true);
 
-		System::jsonExit(DI::mstdnRelationship()->createFromContactId(static::$parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnRelationship()->createFromContactId($this->parameters['id'], $uid)->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/Accounts/Note.php b/src/Module/Api/Mastodon/Accounts/Note.php
index d14afbb484..fe4611754d 100644
--- a/src/Module/Api/Mastodon/Accounts/Note.php
+++ b/src/Module/Api/Mastodon/Accounts/Note.php
@@ -37,7 +37,7 @@ class Note extends BaseApi
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
@@ -45,13 +45,13 @@ class Note extends BaseApi
 			'comment' => '',
 		]);
 
-		$cdata = Contact::getPublicAndUserContactID(static::$parameters['id'], $uid);
+		$cdata = Contact::getPublicAndUserContactID($this->parameters['id'], $uid);
 		if (empty($cdata['user'])) {
 			DI::mstdnError()->RecordNotFound();
 		}
 
 		Contact::update(['info' => $request['comment']], ['id' => $cdata['user']]);
 
-		System::jsonExit(DI::mstdnRelationship()->createFromContactId(static::$parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnRelationship()->createFromContactId($this->parameters['id'], $uid)->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/Accounts/Statuses.php b/src/Module/Api/Mastodon/Accounts/Statuses.php
index 1c95d74c7b..5bf7b49346 100644
--- a/src/Module/Api/Mastodon/Accounts/Statuses.php
+++ b/src/Module/Api/Mastodon/Accounts/Statuses.php
@@ -43,11 +43,11 @@ class Statuses extends BaseApi
 	{
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$id = static::$parameters['id'];
+		$id = $this->parameters['id'];
 		if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) {
 			DI::mstdnError()->RecordNotFound();
 		}
diff --git a/src/Module/Api/Mastodon/Accounts/Unblock.php b/src/Module/Api/Mastodon/Accounts/Unblock.php
index aed46c3325..ae2414b8ac 100644
--- a/src/Module/Api/Mastodon/Accounts/Unblock.php
+++ b/src/Module/Api/Mastodon/Accounts/Unblock.php
@@ -36,12 +36,12 @@ class Unblock extends BaseApi
 		self::checkAllowedScope(self::SCOPE_FOLLOW);
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		Contact\User::setBlocked(static::$parameters['id'], $uid, false);
+		Contact\User::setBlocked($this->parameters['id'], $uid, false);
 
-		System::jsonExit(DI::mstdnRelationship()->createFromContactId(static::$parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnRelationship()->createFromContactId($this->parameters['id'], $uid)->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/Accounts/Unfollow.php b/src/Module/Api/Mastodon/Accounts/Unfollow.php
index 78b6bad62e..a15c946bb6 100644
--- a/src/Module/Api/Mastodon/Accounts/Unfollow.php
+++ b/src/Module/Api/Mastodon/Accounts/Unfollow.php
@@ -36,12 +36,12 @@ class Unfollow extends BaseApi
 		self::checkAllowedScope(self::SCOPE_FOLLOW);
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		Contact::unfollow(static::$parameters['id'], $uid);
+		Contact::unfollow($this->parameters['id'], $uid);
 
-		System::jsonExit(DI::mstdnRelationship()->createFromContactId(static::$parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnRelationship()->createFromContactId($this->parameters['id'], $uid)->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/Accounts/Unmute.php b/src/Module/Api/Mastodon/Accounts/Unmute.php
index 3e9146f218..d1410f7824 100644
--- a/src/Module/Api/Mastodon/Accounts/Unmute.php
+++ b/src/Module/Api/Mastodon/Accounts/Unmute.php
@@ -36,12 +36,12 @@ class Unmute extends BaseApi
 		self::checkAllowedScope(self::SCOPE_FOLLOW);
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		Contact\User::setIgnored(static::$parameters['id'], $uid, false);
+		Contact\User::setIgnored($this->parameters['id'], $uid, false);
 
-		System::jsonExit(DI::mstdnRelationship()->createFromContactId(static::$parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnRelationship()->createFromContactId($this->parameters['id'], $uid)->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/Blocks.php b/src/Module/Api/Mastodon/Blocks.php
index c141b04823..b6a26d9733 100644
--- a/src/Module/Api/Mastodon/Blocks.php
+++ b/src/Module/Api/Mastodon/Blocks.php
@@ -39,11 +39,11 @@ class Blocks extends BaseApi
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$id = static::$parameters['id'];
+		$id = $this->parameters['id'];
 		if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) {
 			DI::mstdnError()->RecordNotFound();
 		}
@@ -72,7 +72,7 @@ class Blocks extends BaseApi
 			$params['order'] = ['cid'];
 		}
 
-		$followers = DBA::select('user-contact', ['cid'], $condition, static::$parameters);
+		$followers = DBA::select('user-contact', ['cid'], $condition, $this->parameters);
 		while ($follower = DBA::fetch($followers)) {
 			self::setBoundaries($follower['cid']);
 			$accounts[] = DI::mstdnAccount()->createFromContactId($follower['cid'], $uid);
diff --git a/src/Module/Api/Mastodon/Conversations.php b/src/Module/Api/Mastodon/Conversations.php
index fbee5672ef..a3f6a26a28 100644
--- a/src/Module/Api/Mastodon/Conversations.php
+++ b/src/Module/Api/Mastodon/Conversations.php
@@ -36,12 +36,12 @@ class Conversations extends BaseApi
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		if (!empty(static::$parameters['id'])) {
+		if (!empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		DBA::delete('conv', ['id' => static::$parameters['id'], 'uid' => $uid]);
-		DBA::delete('mail', ['convid' => static::$parameters['id'], 'uid' => $uid]);
+		DBA::delete('conv', ['id' => $this->parameters['id'], 'uid' => $uid]);
+		DBA::delete('mail', ['convid' => $this->parameters['id'], 'uid' => $uid]);
 
 		System::jsonExit([]);
 	}
diff --git a/src/Module/Api/Mastodon/Conversations/Read.php b/src/Module/Api/Mastodon/Conversations/Read.php
index 27f012c01b..1eadc671c1 100644
--- a/src/Module/Api/Mastodon/Conversations/Read.php
+++ b/src/Module/Api/Mastodon/Conversations/Read.php
@@ -36,12 +36,12 @@ class Read extends BaseApi
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		if (!empty(static::$parameters['id'])) {
+		if (!empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		DBA::update('mail', ['seen' => true], ['convid' => static::$parameters['id'], 'uid' => $uid]);
+		DBA::update('mail', ['seen' => true], ['convid' => $this->parameters['id'], 'uid' => $uid]);
 
-		System::jsonExit(DI::mstdnConversation()->CreateFromConvId(static::$parameters['id'])->toArray());
+		System::jsonExit(DI::mstdnConversation()->CreateFromConvId($this->parameters['id'])->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/FollowRequests.php b/src/Module/Api/Mastodon/FollowRequests.php
index a334b897a8..af4ac5771f 100644
--- a/src/Module/Api/Mastodon/FollowRequests.php
+++ b/src/Module/Api/Mastodon/FollowRequests.php
@@ -47,11 +47,11 @@ class FollowRequests extends BaseApi
 		self::checkAllowedScope(self::SCOPE_FOLLOW);
 		$uid = self::getCurrentUserID();
 
-		$introduction = DI::intro()->selectOneById(static::$parameters['id'], $uid);
+		$introduction = DI::intro()->selectOneById($this->parameters['id'], $uid);
 
 		$contactId = $introduction->cid;
 
-		switch (static::$parameters['action']) {
+		switch ($this->parameters['action']) {
 			case 'authorize':
 				Contact\Introduction::confirm($introduction);
 				$relationship = DI::mstdnRelationship()->createFromContactId($contactId, $uid);
diff --git a/src/Module/Api/Mastodon/Lists.php b/src/Module/Api/Mastodon/Lists.php
index 8a3f7a0ad4..e7a66f04db 100644
--- a/src/Module/Api/Mastodon/Lists.php
+++ b/src/Module/Api/Mastodon/Lists.php
@@ -36,15 +36,15 @@ class Lists extends BaseApi
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		if (!Group::exists(static::$parameters['id'], $uid)) {
+		if (!Group::exists($this->parameters['id'], $uid)) {
 			DI::mstdnError()->RecordNotFound();
 		}
 
-		if (!Group::remove(static::$parameters['id'])) {
+		if (!Group::remove($this->parameters['id'])) {
 			DI::mstdnError()->InternalError();
 		}
 
@@ -81,11 +81,11 @@ class Lists extends BaseApi
 			'replies_policy' => '', // One of: "followed", "list", or "none".
 		]);
 
-		if (empty($request['title']) || empty(static::$parameters['id'])) {
+		if (empty($request['title']) || empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		Group::update(static::$parameters['id'], $request['title']);
+		Group::update($this->parameters['id'], $request['title']);
 	}
 
 	/**
@@ -96,7 +96,7 @@ class Lists extends BaseApi
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			$lists = [];
 
 			$groups = Group::getByUserId($uid);
@@ -105,7 +105,7 @@ class Lists extends BaseApi
 				$lists[] = DI::mstdnList()->createFromGroupId($group['id']);
 			}
 		} else {
-			$id = static::$parameters['id'];
+			$id = $this->parameters['id'];
 
 			if (!Group::exists($id, $uid)) {
 				DI::mstdnError()->RecordNotFound();
diff --git a/src/Module/Api/Mastodon/Lists/Accounts.php b/src/Module/Api/Mastodon/Lists/Accounts.php
index cdc75b6d49..c70e20349b 100644
--- a/src/Module/Api/Mastodon/Lists/Accounts.php
+++ b/src/Module/Api/Mastodon/Lists/Accounts.php
@@ -53,11 +53,11 @@ class Accounts extends BaseApi
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$id = static::$parameters['id'];
+		$id = $this->parameters['id'];
 		if (!DBA::exists('group', ['id' => $id, 'uid' => $uid])) {
 			DI::mstdnError()->RecordNotFound();
 		}
diff --git a/src/Module/Api/Mastodon/Media.php b/src/Module/Api/Mastodon/Media.php
index cd858f5eeb..dc31bdec68 100644
--- a/src/Module/Api/Mastodon/Media.php
+++ b/src/Module/Api/Mastodon/Media.php
@@ -65,18 +65,18 @@ class Media extends BaseApi
 			'focus'       => '', // Two floating points (x,y), comma-delimited ranging from -1.0 to 1.0
 		]);
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$photo = Photo::selectFirst(['resource-id'], ['id' => static::$parameters['id'], 'uid' => $uid]);
+		$photo = Photo::selectFirst(['resource-id'], ['id' => $this->parameters['id'], 'uid' => $uid]);
 		if (empty($photo['resource-id'])) {
 			DI::mstdnError()->RecordNotFound();
 		}
 
 		Photo::update(['desc' => $request['description']], ['resource-id' => $photo['resource-id']]);
 
-		System::jsonExit(DI::mstdnAttachment()->createFromPhoto(static::$parameters['id']));
+		System::jsonExit(DI::mstdnAttachment()->createFromPhoto($this->parameters['id']));
 	}
 
 	/**
@@ -87,11 +87,11 @@ class Media extends BaseApi
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$id = static::$parameters['id'];
+		$id = $this->parameters['id'];
 		if (!Photo::exists(['id' => $id, 'uid' => $uid])) {
 			DI::mstdnError()->RecordNotFound();
 		}
diff --git a/src/Module/Api/Mastodon/Mutes.php b/src/Module/Api/Mastodon/Mutes.php
index b5ba3fcfd5..3c24071f07 100644
--- a/src/Module/Api/Mastodon/Mutes.php
+++ b/src/Module/Api/Mastodon/Mutes.php
@@ -39,11 +39,11 @@ class Mutes extends BaseApi
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$id = static::$parameters['id'];
+		$id = $this->parameters['id'];
 		if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) {
 			DI::mstdnError()->RecordNotFound();
 		}
@@ -72,7 +72,7 @@ class Mutes extends BaseApi
 			$params['order'] = ['cid'];
 		}
 
-		$followers = DBA::select('user-contact', ['cid'], $condition, static::$parameters);
+		$followers = DBA::select('user-contact', ['cid'], $condition, $this->parameters);
 		while ($follower = DBA::fetch($followers)) {
 			self::setBoundaries($follower['cid']);
 			$accounts[] = DI::mstdnAccount()->createFromContactId($follower['cid'], $uid);
diff --git a/src/Module/Api/Mastodon/Notifications.php b/src/Module/Api/Mastodon/Notifications.php
index c2ddf2a4df..274a857866 100644
--- a/src/Module/Api/Mastodon/Notifications.php
+++ b/src/Module/Api/Mastodon/Notifications.php
@@ -45,8 +45,8 @@ class Notifications extends BaseApi
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
 
-		if (!empty(static::$parameters['id'])) {
-			$id = static::$parameters['id'];
+		if (!empty($this->parameters['id'])) {
+			$id = $this->parameters['id'];
 			try {
 				$notification = DI::notification()->selectOneForUser($uid, ['id' => $id]);
 				System::jsonExit(DI::mstdnNotification()->createFromNotification($notification));
diff --git a/src/Module/Api/Mastodon/Notifications/Dismiss.php b/src/Module/Api/Mastodon/Notifications/Dismiss.php
index b135b5bbf5..b978e46eee 100644
--- a/src/Module/Api/Mastodon/Notifications/Dismiss.php
+++ b/src/Module/Api/Mastodon/Notifications/Dismiss.php
@@ -37,11 +37,11 @@ class Dismiss extends BaseApi
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$Notification = DI::notification()->selectOneForUser($uid, static::$parameters['id']);
+		$Notification = DI::notification()->selectOneForUser($uid, $this->parameters['id']);
 		$Notification->setSeen();
 		DI::notification()->save($Notification);
 
diff --git a/src/Module/Api/Mastodon/ScheduledStatuses.php b/src/Module/Api/Mastodon/ScheduledStatuses.php
index b229293819..bfb2cff455 100644
--- a/src/Module/Api/Mastodon/ScheduledStatuses.php
+++ b/src/Module/Api/Mastodon/ScheduledStatuses.php
@@ -47,15 +47,15 @@ class ScheduledStatuses extends BaseApi
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		if (!DBA::exists('delayed-post', ['id' => static::$parameters['id'], 'uid' => $uid])) {
+		if (!DBA::exists('delayed-post', ['id' => $this->parameters['id'], 'uid' => $uid])) {
 			DI::mstdnError()->RecordNotFound();
 		}
 
-		Post\Delayed::deleteById(static::$parameters['id']);
+		Post\Delayed::deleteById($this->parameters['id']);
 
 		System::jsonExit([]);
 	}
@@ -68,8 +68,8 @@ class ScheduledStatuses extends BaseApi
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
 
-		if (isset(static::$parameters['id'])) {
-			System::jsonExit(DI::mstdnScheduledStatus()->createFromDelayedPostId(static::$parameters['id'], $uid)->toArray());
+		if (isset($this->parameters['id'])) {
+			System::jsonExit(DI::mstdnScheduledStatus()->createFromDelayedPostId($this->parameters['id'], $uid)->toArray());
 		}
 
 		$request = self::getRequest([
diff --git a/src/Module/Api/Mastodon/Search.php b/src/Module/Api/Mastodon/Search.php
index dc7c856ac6..6753b09098 100644
--- a/src/Module/Api/Mastodon/Search.php
+++ b/src/Module/Api/Mastodon/Search.php
@@ -73,7 +73,7 @@ class Search extends BaseApi
 			$result['statuses'] = self::searchStatuses($uid, $request['q'], $request['account_id'], $request['max_id'], $request['min_id'], $limit, $request['offset']);
 		}
 		if ((empty($request['type']) || ($request['type'] == 'hashtags')) && (strpos($request['q'], '@') == false)) {
-			$result['hashtags'] = self::searchHashtags($request['q'], $request['exclude_unreviewed'], $limit, $request['offset'], static::$parameters['version']);
+			$result['hashtags'] = self::searchHashtags($request['q'], $request['exclude_unreviewed'], $limit, $request['offset'], $this->parameters['version']);
 		}
 
 		System::jsonExit($result);
diff --git a/src/Module/Api/Mastodon/Statuses.php b/src/Module/Api/Mastodon/Statuses.php
index 8ffeef07a2..50c35f3477 100644
--- a/src/Module/Api/Mastodon/Statuses.php
+++ b/src/Module/Api/Mastodon/Statuses.php
@@ -212,11 +212,11 @@ class Statuses extends BaseApi
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$item = Post::selectFirstForUser($uid, ['id'], ['uri-id' => static::$parameters['id'], 'uid' => $uid]);
+		$item = Post::selectFirstForUser($uid, ['id'], ['uri-id' => $this->parameters['id'], 'uid' => $uid]);
 		if (empty($item['id'])) {
 			DI::mstdnError()->RecordNotFound();
 		}
@@ -235,10 +235,10 @@ class Statuses extends BaseApi
 	{
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid));
+		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid));
 	}
 }
diff --git a/src/Module/Api/Mastodon/Statuses/Bookmark.php b/src/Module/Api/Mastodon/Statuses/Bookmark.php
index 4d2f096cd0..de0ef641d3 100644
--- a/src/Module/Api/Mastodon/Statuses/Bookmark.php
+++ b/src/Module/Api/Mastodon/Statuses/Bookmark.php
@@ -38,11 +38,11 @@ class Bookmark extends BaseApi
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => static::$parameters['id'], 'uid' => [$uid, 0]]);
+		$item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => $this->parameters['id'], 'uid' => [$uid, 0]]);
 		if (!DBA::isResult($item)) {
 			DI::mstdnError()->RecordNotFound();
 		}
@@ -53,6 +53,6 @@ class Bookmark extends BaseApi
 
 		Item::update(['starred' => true], ['id' => $item['id']]);
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid)->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/Statuses/Card.php b/src/Module/Api/Mastodon/Statuses/Card.php
index 698dfab8c5..d3c1801a29 100644
--- a/src/Module/Api/Mastodon/Statuses/Card.php
+++ b/src/Module/Api/Mastodon/Statuses/Card.php
@@ -39,11 +39,11 @@ class Card extends BaseApi
 	{
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$id = static::$parameters['id'];
+		$id = $this->parameters['id'];
 
 		if (!Post::exists(['uri-id' => $id, 'uid' => [0, $uid]])) {
 			throw new HTTPException\NotFoundException('Item with URI ID ' . $id . ' not found' . ($uid ? ' for user ' . $uid : '.'));
diff --git a/src/Module/Api/Mastodon/Statuses/Context.php b/src/Module/Api/Mastodon/Statuses/Context.php
index da59bb1d96..03782ef1ce 100644
--- a/src/Module/Api/Mastodon/Statuses/Context.php
+++ b/src/Module/Api/Mastodon/Statuses/Context.php
@@ -39,7 +39,7 @@ class Context extends BaseApi
 	{
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
@@ -47,7 +47,7 @@ class Context extends BaseApi
 			'limit'    => 40, // Maximum number of results to return. Defaults to 40.
 		]);
 
-		$id = static::$parameters['id'];
+		$id = $this->parameters['id'];
 
 		$parents  = [];
 		$children = [];
diff --git a/src/Module/Api/Mastodon/Statuses/Favourite.php b/src/Module/Api/Mastodon/Statuses/Favourite.php
index 3fe55807b6..8ec818a8ff 100644
--- a/src/Module/Api/Mastodon/Statuses/Favourite.php
+++ b/src/Module/Api/Mastodon/Statuses/Favourite.php
@@ -38,17 +38,17 @@ class Favourite extends BaseApi
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$item = Post::selectFirstForUser($uid, ['id'], ['uri-id' => static::$parameters['id'], 'uid' => [$uid, 0]]);
+		$item = Post::selectFirstForUser($uid, ['id'], ['uri-id' => $this->parameters['id'], 'uid' => [$uid, 0]]);
 		if (!DBA::isResult($item)) {
 			DI::mstdnError()->RecordNotFound();
 		}
 
 		Item::performActivity($item['id'], 'like', $uid);
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid)->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/Statuses/FavouritedBy.php b/src/Module/Api/Mastodon/Statuses/FavouritedBy.php
index b6726cc54d..37d9e7521a 100644
--- a/src/Module/Api/Mastodon/Statuses/FavouritedBy.php
+++ b/src/Module/Api/Mastodon/Statuses/FavouritedBy.php
@@ -39,11 +39,11 @@ class FavouritedBy extends BaseApi
 	{
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$id = static::$parameters['id'];
+		$id = $this->parameters['id'];
 		if (!Post::exists(['uri-id' => $id, 'uid' => [0, $uid]])) {
 			DI::mstdnError()->RecordNotFound();
 		}
diff --git a/src/Module/Api/Mastodon/Statuses/Mute.php b/src/Module/Api/Mastodon/Statuses/Mute.php
index 739126d581..4a0e943f34 100644
--- a/src/Module/Api/Mastodon/Statuses/Mute.php
+++ b/src/Module/Api/Mastodon/Statuses/Mute.php
@@ -37,11 +37,11 @@ class Mute extends BaseApi
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => static::$parameters['id'], 'uid' => [$uid, 0]]);
+		$item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => $this->parameters['id'], 'uid' => [$uid, 0]]);
 		if (!DBA::isResult($item)) {
 			DI::mstdnError()->RecordNotFound();
 		}
@@ -50,8 +50,8 @@ class Mute extends BaseApi
 			DI::mstdnError()->UnprocessableEntity(DI::l10n()->t('Only starting posts can be muted'));
 		}
 
-		Post\ThreadUser::setIgnored(static::$parameters['id'], $uid, true);
+		Post\ThreadUser::setIgnored($this->parameters['id'], $uid, true);
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid)->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/Statuses/Pin.php b/src/Module/Api/Mastodon/Statuses/Pin.php
index b7573fd9d1..7648d12a0b 100644
--- a/src/Module/Api/Mastodon/Statuses/Pin.php
+++ b/src/Module/Api/Mastodon/Statuses/Pin.php
@@ -37,11 +37,11 @@ class Pin extends BaseApi
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => static::$parameters['id'], 'uid' => [$uid, 0]]);
+		$item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => $this->parameters['id'], 'uid' => [$uid, 0]]);
 		if (!DBA::isResult($item)) {
 			DI::mstdnError()->RecordNotFound();
 		}
@@ -50,8 +50,8 @@ class Pin extends BaseApi
 			DI::mstdnError()->UnprocessableEntity(DI::l10n()->t('Only starting posts can be pinned'));
 		}
 
-		Post\ThreadUser::setPinned(static::$parameters['id'], $uid, true);
+		Post\ThreadUser::setPinned($this->parameters['id'], $uid, true);
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid)->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/Statuses/Reblog.php b/src/Module/Api/Mastodon/Statuses/Reblog.php
index 136491bf26..d10149616a 100644
--- a/src/Module/Api/Mastodon/Statuses/Reblog.php
+++ b/src/Module/Api/Mastodon/Statuses/Reblog.php
@@ -40,11 +40,11 @@ class Reblog extends BaseApi
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$item = Post::selectFirstForUser($uid, ['id', 'network'], ['uri-id' => static::$parameters['id'], 'uid' => [$uid, 0]]);
+		$item = Post::selectFirstForUser($uid, ['id', 'network'], ['uri-id' => $this->parameters['id'], 'uid' => [$uid, 0]]);
 		if (!DBA::isResult($item)) {
 			DI::mstdnError()->RecordNotFound();
 		}
@@ -55,6 +55,6 @@ class Reblog extends BaseApi
 
 		Item::performActivity($item['id'], 'announce', $uid);
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid)->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/Statuses/RebloggedBy.php b/src/Module/Api/Mastodon/Statuses/RebloggedBy.php
index de2004b861..52f1e2f67d 100644
--- a/src/Module/Api/Mastodon/Statuses/RebloggedBy.php
+++ b/src/Module/Api/Mastodon/Statuses/RebloggedBy.php
@@ -39,11 +39,11 @@ class RebloggedBy extends BaseApi
 	{
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$id = static::$parameters['id'];
+		$id = $this->parameters['id'];
 		if (!Post::exists(['uri-id' => $id, 'uid' => [0, $uid]])) {
 			DI::mstdnError()->RecordNotFound();
 		}
diff --git a/src/Module/Api/Mastodon/Statuses/Unbookmark.php b/src/Module/Api/Mastodon/Statuses/Unbookmark.php
index d6bd6fcc8c..9279fec60e 100644
--- a/src/Module/Api/Mastodon/Statuses/Unbookmark.php
+++ b/src/Module/Api/Mastodon/Statuses/Unbookmark.php
@@ -38,11 +38,11 @@ class Unbookmark extends BaseApi
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => static::$parameters['id'], 'uid' => [$uid, 0]]);
+		$item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => $this->parameters['id'], 'uid' => [$uid, 0]]);
 		if (!DBA::isResult($item)) {
 			DI::mstdnError()->RecordNotFound();
 		}
@@ -53,6 +53,6 @@ class Unbookmark extends BaseApi
 
 		Item::update(['starred' => false], ['id' => $item['id']]);
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid)->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/Statuses/Unfavourite.php b/src/Module/Api/Mastodon/Statuses/Unfavourite.php
index 244b38cd1d..7898647acc 100644
--- a/src/Module/Api/Mastodon/Statuses/Unfavourite.php
+++ b/src/Module/Api/Mastodon/Statuses/Unfavourite.php
@@ -38,17 +38,17 @@ class Unfavourite extends BaseApi
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$item = Post::selectFirstForUser($uid, ['id'], ['uri-id' => static::$parameters['id'], 'uid' => [$uid, 0]]);
+		$item = Post::selectFirstForUser($uid, ['id'], ['uri-id' => $this->parameters['id'], 'uid' => [$uid, 0]]);
 		if (!DBA::isResult($item)) {
 			DI::mstdnError()->RecordNotFound();
 		}
 
 		Item::performActivity($item['id'], 'unlike', $uid);
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid)->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/Statuses/Unmute.php b/src/Module/Api/Mastodon/Statuses/Unmute.php
index a659b5b079..80b9c2c541 100644
--- a/src/Module/Api/Mastodon/Statuses/Unmute.php
+++ b/src/Module/Api/Mastodon/Statuses/Unmute.php
@@ -37,11 +37,11 @@ class Unmute extends BaseApi
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => static::$parameters['id'], 'uid' => [$uid, 0]]);
+		$item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => $this->parameters['id'], 'uid' => [$uid, 0]]);
 		if (!DBA::isResult($item)) {
 			DI::mstdnError()->RecordNotFound();
 		}
@@ -50,8 +50,8 @@ class Unmute extends BaseApi
 			DI::mstdnError()->UnprocessableEntity(DI::l10n()->t('Only starting posts can be unmuted'));
 		}
 
-		Post\ThreadUser::setIgnored(static::$parameters['id'], $uid, false);
+		Post\ThreadUser::setIgnored($this->parameters['id'], $uid, false);
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid)->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/Statuses/Unpin.php b/src/Module/Api/Mastodon/Statuses/Unpin.php
index 1eaf73409a..21f44b7cbb 100644
--- a/src/Module/Api/Mastodon/Statuses/Unpin.php
+++ b/src/Module/Api/Mastodon/Statuses/Unpin.php
@@ -37,11 +37,11 @@ class Unpin extends BaseApi
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => static::$parameters['id'], 'uid' => [$uid, 0]]);
+		$item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => $this->parameters['id'], 'uid' => [$uid, 0]]);
 		if (!DBA::isResult($item)) {
 			DI::mstdnError()->RecordNotFound();
 		}
@@ -50,8 +50,8 @@ class Unpin extends BaseApi
 			DI::mstdnError()->UnprocessableEntity(DI::l10n()->t('Only starting posts can be pinned'));
 		}
 
-		Post\ThreadUser::setPinned(static::$parameters['id'], $uid, false);
+		Post\ThreadUser::setPinned($this->parameters['id'], $uid, false);
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid)->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/Statuses/Unreblog.php b/src/Module/Api/Mastodon/Statuses/Unreblog.php
index 234d1058f3..972a6aa1af 100644
--- a/src/Module/Api/Mastodon/Statuses/Unreblog.php
+++ b/src/Module/Api/Mastodon/Statuses/Unreblog.php
@@ -40,11 +40,11 @@ class Unreblog extends BaseApi
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$item = Post::selectFirstForUser($uid, ['id', 'network'], ['uri-id' => static::$parameters['id'], 'uid' => [$uid, 0]]);
+		$item = Post::selectFirstForUser($uid, ['id', 'network'], ['uri-id' => $this->parameters['id'], 'uid' => [$uid, 0]]);
 		if (!DBA::isResult($item)) {
 			DI::mstdnError()->RecordNotFound();
 		}
@@ -55,6 +55,6 @@ class Unreblog extends BaseApi
 
 		Item::performActivity($item['id'], 'unannounce', $uid);
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid)->toArray());
+		System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid)->toArray());
 	}
 }
diff --git a/src/Module/Api/Mastodon/Timelines/ListTimeline.php b/src/Module/Api/Mastodon/Timelines/ListTimeline.php
index 6d58153119..c9316fdf53 100644
--- a/src/Module/Api/Mastodon/Timelines/ListTimeline.php
+++ b/src/Module/Api/Mastodon/Timelines/ListTimeline.php
@@ -41,7 +41,7 @@ class ListTimeline extends BaseApi
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
@@ -60,7 +60,7 @@ class ListTimeline extends BaseApi
 		$params = ['order' => ['uri-id' => true], 'limit' => $request['limit']];
 
 		$condition = ["`uid` = ? AND `gravity` IN (?, ?) AND `contact-id` IN (SELECT `contact-id` FROM `group_member` WHERE `gid` = ?)",
-			$uid, GRAVITY_PARENT, GRAVITY_COMMENT, static::$parameters['id']];
+			$uid, GRAVITY_PARENT, GRAVITY_COMMENT, $this->parameters['id']];
 
 		if (!empty($request['max_id'])) {
 			$condition = DBA::mergeConditions($condition, ["`uri-id` < ?", $request['max_id']]);
diff --git a/src/Module/Api/Mastodon/Timelines/Tag.php b/src/Module/Api/Mastodon/Timelines/Tag.php
index 80ccf5a9c2..3571dd7333 100644
--- a/src/Module/Api/Mastodon/Timelines/Tag.php
+++ b/src/Module/Api/Mastodon/Timelines/Tag.php
@@ -42,7 +42,7 @@ class Tag extends BaseApi
 		self::checkAllowedScope(self::SCOPE_READ);
 		$uid = self::getCurrentUserID();
 
-		if (empty(static::$parameters['hashtag'])) {
+		if (empty($this->parameters['hashtag'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
@@ -69,7 +69,7 @@ class Tag extends BaseApi
 
 		$condition = ["`name` = ? AND (`uid` = ? OR (`uid` = ? AND NOT `global`))
 			AND (`network` IN (?, ?, ?, ?) OR (`uid` = ? AND `uid` != ?))",
-			static::$parameters['hashtag'], 0, $uid, Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, $uid, 0];
+			$this->parameters['hashtag'], 0, $uid, Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, $uid, 0];
 
 		if ($request['local']) {
 			$condition = DBA::mergeConditions($condition, ["`uri-id` IN (SELECT `uri-id` FROM `post-user` WHERE `origin`)"]);
diff --git a/src/Module/Api/Twitter/Account/RateLimitStatus.php b/src/Module/Api/Twitter/Account/RateLimitStatus.php
index fa1383b8e0..e38ffb061a 100644
--- a/src/Module/Api/Twitter/Account/RateLimitStatus.php
+++ b/src/Module/Api/Twitter/Account/RateLimitStatus.php
@@ -32,7 +32,7 @@ class RateLimitStatus extends BaseApi
 {
 	public function rawContent()
 	{
-		if (!empty(static::$parameters['extension']) && (static::$parameters['extension'] == 'xml')) {
+		if (!empty($this->parameters['extension']) && ($this->parameters['extension'] == 'xml')) {
 			$hash = [
 				'remaining-hits'        => '150',
 				'@attributes'           => ["type" => "integer"],
@@ -52,6 +52,6 @@ class RateLimitStatus extends BaseApi
 			];
 		}
 
-		DI::apiResponse()->exit('hash', ['hash' => $hash], static::$parameters['extension'] ?? null);
+		DI::apiResponse()->exit('hash', ['hash' => $hash], $this->parameters['extension'] ?? null);
 	}
 }
diff --git a/src/Module/Api/Twitter/SavedSearches.php b/src/Module/Api/Twitter/SavedSearches.php
index 8c513a960c..ac75316710 100644
--- a/src/Module/Api/Twitter/SavedSearches.php
+++ b/src/Module/Api/Twitter/SavedSearches.php
@@ -45,6 +45,6 @@ class SavedSearches extends BaseApi
 
 		DBA::close($terms);
 
-		DI::apiResponse()->exit('terms', ['terms' => $result], static::$parameters['extension'] ?? null);
+		DI::apiResponse()->exit('terms', ['terms' => $result], $this->parameters['extension'] ?? null);
 	}
 }
diff --git a/src/Module/Attach.php b/src/Module/Attach.php
index 84961ca276..c35e6b9ba3 100644
--- a/src/Module/Attach.php
+++ b/src/Module/Attach.php
@@ -37,11 +37,11 @@ class Attach extends BaseModule
 	public function rawContent()
 	{
 		$a = DI::app();
-		if (empty(static::$parameters['item'])) {
+		if (empty($this->parameters['item'])) {
 			throw new \Friendica\Network\HTTPException\BadRequestException();
 		}
 
-		$item_id = intval(static::$parameters['item']);
+		$item_id = intval($this->parameters['item']);
 
 		// Check for existence
 		$item = MAttach::exists(['id' => $item_id]);
diff --git a/src/Module/Contact/Advanced.php b/src/Module/Contact/Advanced.php
index 53ab31d1a6..fb3aa62f4f 100644
--- a/src/Module/Contact/Advanced.php
+++ b/src/Module/Contact/Advanced.php
@@ -47,7 +47,7 @@ class Advanced extends BaseModule
 
 	public function post()
 	{
-		$cid = static::$parameters['id'];
+		$cid = $this->parameters['id'];
 
 		$contact = Model\Contact::selectFirst([], ['id' => $cid, 'uid' => local_user()]);
 		if (empty($contact)) {
@@ -98,7 +98,7 @@ class Advanced extends BaseModule
 
 	public function content(): string
 	{
-		$cid = static::$parameters['id'];
+		$cid = $this->parameters['id'];
 
 		$contact = Model\Contact::selectFirst([], ['id' => $cid, 'uid' => local_user()]);
 		if (empty($contact)) {
diff --git a/src/Module/Contact/Contacts.php b/src/Module/Contact/Contacts.php
index b5b501d6ea..bfe689c1e3 100644
--- a/src/Module/Contact/Contacts.php
+++ b/src/Module/Contact/Contacts.php
@@ -22,8 +22,8 @@ class Contacts extends BaseModule
 			throw new HTTPException\ForbiddenException();
 		}
 
-		$cid = static::$parameters['id'];
-		$type = static::$parameters['type'] ?? 'all';
+		$cid = $this->parameters['id'];
+		$type = $this->parameters['type'] ?? 'all';
 		$accounttype = $_GET['accounttype'] ?? '';
 		$accounttypeid = User::getAccountTypeByString($accounttype);
 
diff --git a/src/Module/Contact/Media.php b/src/Module/Contact/Media.php
index d9a0399579..a3a498b6d1 100644
--- a/src/Module/Contact/Media.php
+++ b/src/Module/Contact/Media.php
@@ -36,7 +36,7 @@ class Media extends BaseModule
 {
 	public function content(): string
 	{
-		$cid = static::$parameters['id'];
+		$cid = $this->parameters['id'];
 
 		$contact = Model\Contact::selectFirst([], ['id' => $cid]);
 		if (empty($contact)) {
diff --git a/src/Module/Contact/Poke.php b/src/Module/Contact/Poke.php
index 215e322580..23ec95a435 100644
--- a/src/Module/Contact/Poke.php
+++ b/src/Module/Contact/Poke.php
@@ -20,7 +20,7 @@ class Poke extends BaseModule
 {
 	public function post()
 	{
-		if (!local_user() || empty(static::$parameters['id'])) {
+		if (!local_user() || empty($this->parameters['id'])) {
 			return self::postReturn(false);
 		}
 
@@ -39,14 +39,14 @@ class Poke extends BaseModule
 
 		$activity = Activity::POKE . '#' . urlencode($verbs[$verb][0]);
 
-		$contact_id = intval(static::$parameters['id']);
+		$contact_id = intval($this->parameters['id']);
 		if (!$contact_id) {
 			return self::postReturn(false);
 		}
 
 		Logger::info('verb ' . $verb . ' contact ' . $contact_id);
 
-		$contact = DBA::selectFirst('contact', ['id', 'name', 'url', 'photo'], ['id' => static::$parameters['id'], 'uid' => local_user()]);
+		$contact = DBA::selectFirst('contact', ['id', 'name', 'url', 'photo'], ['id' => $this->parameters['id'], 'uid' => local_user()]);
 		if (!DBA::isResult($contact)) {
 			return self::postReturn(false);
 		}
@@ -129,11 +129,11 @@ class Poke extends BaseModule
 			throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this module.'));
 		}
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			throw new HTTPException\BadRequestException();
 		}
 
-		$contact = DBA::selectFirst('contact', ['id', 'url', 'name'], ['id' => static::$parameters['id'], 'uid' => local_user()]);
+		$contact = DBA::selectFirst('contact', ['id', 'url', 'name'], ['id' => $this->parameters['id'], 'uid' => local_user()]);
 		if (!DBA::isResult($contact)) {
 			throw new HTTPException\NotFoundException();
 		}
diff --git a/src/Module/Contact/Revoke.php b/src/Module/Contact/Revoke.php
index 1cace6255f..07fe7779b5 100644
--- a/src/Module/Contact/Revoke.php
+++ b/src/Module/Contact/Revoke.php
@@ -43,7 +43,7 @@ class Revoke extends BaseModule
 			return;
 		}
 
-		$data = Model\Contact::getPublicAndUserContactID(static::$parameters['id'], local_user());
+		$data = Model\Contact::getPublicAndUserContactID($this->parameters['id'], local_user());
 		if (!DBA::isResult($data)) {
 			throw new HTTPException\NotFoundException(DI::l10n()->t('Unknown contact.'));
 		}
@@ -69,7 +69,7 @@ class Revoke extends BaseModule
 			throw new HTTPException\UnauthorizedException();
 		}
 
-		self::checkFormSecurityTokenRedirectOnError('contact/' . static::$parameters['id'], 'contact_revoke');
+		self::checkFormSecurityTokenRedirectOnError('contact/' . $this->parameters['id'], 'contact_revoke');
 
 		$result = Model\Contact::revokeFollow(self::$contact);
 		if ($result === true) {
@@ -80,7 +80,7 @@ class Revoke extends BaseModule
 			notice(DI::l10n()->t('Unable to revoke follow, please try again later or contact the administrator.'));
 		}
 
-		DI::baseUrl()->redirect('contact/' . static::$parameters['id']);
+		DI::baseUrl()->redirect('contact/' . $this->parameters['id']);
 	}
 
 	public function content(): string
diff --git a/src/Module/Conversation/Community.php b/src/Module/Conversation/Community.php
index 58a0c5750b..d954ef8f39 100644
--- a/src/Module/Conversation/Community.php
+++ b/src/Module/Conversation/Community.php
@@ -51,7 +51,7 @@ class Community extends BaseModule
 
 	public function content(): string
 	{
-		self::parseRequest();
+		$this->parseRequest();
 
 		if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) {
 			$tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl');
@@ -94,8 +94,8 @@ class Community extends BaseModule
 	
 			if (local_user() && DI::config()->get('system', 'community_no_sharer')) {
 				$path = self::$content;
-				if (!empty(static::$parameters['accounttype'])) {
-					$path .= '/' . static::$parameters['accounttype'];
+				if (!empty($this->parameters['accounttype'])) {
+					$path .= '/' . $this->parameters['accounttype'];
 				}
 				$query_parameters = [];
 		
@@ -169,7 +169,7 @@ class Community extends BaseModule
 	 * @throws HTTPException\BadRequestException
 	 * @throws HTTPException\ForbiddenException
 	 */
-	protected static function parseRequest()
+	protected function parseRequest()
 	{
 		if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Public access denied.'));
@@ -181,10 +181,10 @@ class Community extends BaseModule
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Access denied.'));
 		}
 
-		self::$accountTypeString = $_GET['accounttype'] ?? static::$parameters['accounttype'] ?? '';
+		self::$accountTypeString = $_GET['accounttype'] ?? $this->parameters['accounttype'] ?? '';
 		self::$accountType = User::getAccountTypeByString(self::$accountTypeString);
 
-		self::$content = static::$parameters['content'] ?? '';
+		self::$content = $this->parameters['content'] ?? '';
 		if (!self::$content) {
 			if (!empty(DI::config()->get('system', 'singleuser'))) {
 				// On single user systems only the global page does make sense
diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php
index 06fec9ee7c..0f2d9cd6fc 100644
--- a/src/Module/Conversation/Network.php
+++ b/src/Module/Conversation/Network.php
@@ -63,7 +63,7 @@ class Network extends BaseModule
 			return Login::form();
 		}
 
-		self::parseRequest($_GET);
+		$this->parseRequest($_GET);
 
 		$module = 'network';
 
@@ -272,11 +272,11 @@ class Network extends BaseModule
 		return Renderer::replaceMacros($tpl, ['$tabs' => $arr['tabs']]);
 	}
 
-	protected static function parseRequest(array $get)
+	protected function parseRequest(array $get)
 	{
-		self::$groupId = static::$parameters['group_id'] ?? 0;
+		self::$groupId = $this->parameters['group_id'] ?? 0;
 
-		self::$forumContactId = static::$parameters['contact_id'] ?? 0;
+		self::$forumContactId = $this->parameters['contact_id'] ?? 0;
 
 		self::$selectedTab = Session::get('network-tab', DI::pConfig()->get(local_user(), 'network.view', 'selected_tab', ''));
 
@@ -317,13 +317,13 @@ class Network extends BaseModule
 		Session::set('network-tab', self::$selectedTab);
 		DI::pConfig()->set(local_user(), 'network.view', 'selected_tab', self::$selectedTab);
 
-		self::$accountTypeString = $get['accounttype'] ?? static::$parameters['accounttype'] ?? '';
+		self::$accountTypeString = $get['accounttype'] ?? $this->parameters['accounttype'] ?? '';
 		self::$accountType = User::getAccountTypeByString(self::$accountTypeString);
 
 		self::$network = $get['nets'] ?? '';
 
-		self::$dateFrom = static::$parameters['from'] ?? '';
-		self::$dateTo = static::$parameters['to'] ?? '';
+		self::$dateFrom = $this->parameters['from'] ?? '';
+		self::$dateTo = $this->parameters['to'] ?? '';
 
 		if (DI::mode()->isMobile()) {
 			self::$itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network',
diff --git a/src/Module/DFRN/Notify.php b/src/Module/DFRN/Notify.php
index cbd658fc91..eda5da9361 100644
--- a/src/Module/DFRN/Notify.php
+++ b/src/Module/DFRN/Notify.php
@@ -47,8 +47,8 @@ class Notify extends BaseModule
 		}
 
 		$data = json_decode($postdata);
-		if (is_object($data) && !empty(static::$parameters['nickname'])) {
-			$user = User::getByNickname(static::$parameters['nickname']);
+		if (is_object($data) && !empty($this->parameters['nickname'])) {
+			$user = User::getByNickname($this->parameters['nickname']);
 			if (empty($user)) {
 				throw new \Friendica\Network\HTTPException\InternalServerErrorException();
 			}
diff --git a/src/Module/DFRN/Poll.php b/src/Module/DFRN/Poll.php
index 3c4becdd6b..0cf43f2a7e 100644
--- a/src/Module/DFRN/Poll.php
+++ b/src/Module/DFRN/Poll.php
@@ -33,7 +33,7 @@ class Poll extends BaseModule
 	{
 		header("Content-type: application/atom+xml");
 		$last_update = $_GET['last_update'] ?? '';
-		echo OStatus::feed(static::$parameters['nickname'], $last_update, 10);
+		echo OStatus::feed($this->parameters['nickname'], $last_update, 10);
 		exit();
 	}
 }
diff --git a/src/Module/Debug/ItemBody.php b/src/Module/Debug/ItemBody.php
index 04dab22c6b..3759931145 100644
--- a/src/Module/Debug/ItemBody.php
+++ b/src/Module/Debug/ItemBody.php
@@ -37,11 +37,11 @@ class ItemBody extends BaseModule
 			throw new HTTPException\UnauthorizedException(DI::l10n()->t('Access denied.'));
 		}
 
-		if (empty(static::$parameters['item'])) {
+		if (empty($this->parameters['item'])) {
 			throw new HTTPException\NotFoundException(DI::l10n()->t('Item not found.'));
 		}
 
-		$itemId = intval(static::$parameters['item']);
+		$itemId = intval($this->parameters['item']);
 
 		$item = Post::selectFirst(['body'], ['uid' => [0, local_user()], 'uri-id' => $itemId]);
 
diff --git a/src/Module/Diaspora/Fetch.php b/src/Module/Diaspora/Fetch.php
index aa582558f8..e3d6f4616e 100644
--- a/src/Module/Diaspora/Fetch.php
+++ b/src/Module/Diaspora/Fetch.php
@@ -40,11 +40,11 @@ class Fetch extends BaseModule
 {
 	public function rawContent()
 	{
-		if (empty(static::$parameters['guid'])) {
+		if (empty($this->parameters['guid'])) {
 			throw new HTTPException\NotFoundException();
 		}
 
-		$guid = static::$parameters['guid'];
+		$guid = $this->parameters['guid'];
 
 		// Fetch the item
 		$condition = ['origin' => true, 'private' => [Item::PUBLIC, Item::UNLISTED], 'guid' => $guid,
diff --git a/src/Module/Diaspora/Receive.php b/src/Module/Diaspora/Receive.php
index 9ac89cc6e6..14ad5c3912 100644
--- a/src/Module/Diaspora/Receive.php
+++ b/src/Module/Diaspora/Receive.php
@@ -51,10 +51,10 @@ class Receive extends BaseModule
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Access denied.'));
 		}
 
-		if (static::$parameters['type'] === 'public') {
+		if ($this->parameters['type'] === 'public') {
 			self::receivePublic();
-		} else if (static::$parameters['type'] === 'users') {
-			self::receiveUser(static::$parameters['guid']);
+		} else if ($this->parameters['type'] === 'users') {
+			self::receiveUser($this->parameters['guid']);
 		}
 	}
 
diff --git a/src/Module/Feed.php b/src/Module/Feed.php
index 94908abe21..6470ab5c37 100644
--- a/src/Module/Feed.php
+++ b/src/Module/Feed.php
@@ -68,7 +68,7 @@ class Feed extends BaseModule
 		}
 
 		header("Content-type: application/atom+xml; charset=utf-8");
-		echo ProtocolFeed::atom(static::$parameters['nickname'], $last_update, 10, $type, $nocache, true);
+		echo ProtocolFeed::atom($this->parameters['nickname'], $last_update, 10, $type, $nocache, true);
 		exit();
 	}
 }
diff --git a/src/Module/Filer/RemoveTag.php b/src/Module/Filer/RemoveTag.php
index 43a0ff1fb0..e6749de020 100644
--- a/src/Module/Filer/RemoveTag.php
+++ b/src/Module/Filer/RemoveTag.php
@@ -41,7 +41,7 @@ class RemoveTag extends BaseModule
 
 		$logger = DI::logger();
 
-		$item_id = static::$parameters['id'] ?? 0;
+		$item_id = $this->parameters['id'] ?? 0;
 
 		$term = XML::unescape(trim($_GET['term'] ?? ''));
 		$cat = XML::unescape(trim($_GET['cat'] ?? ''));
diff --git a/src/Module/Filer/SaveTag.php b/src/Module/Filer/SaveTag.php
index ee620f54c6..b1742c8a6a 100644
--- a/src/Module/Filer/SaveTag.php
+++ b/src/Module/Filer/SaveTag.php
@@ -48,7 +48,7 @@ class SaveTag extends BaseModule
 
 		$term = XML::unescape(trim($_GET['term'] ?? ''));
 
-		$item_id = static::$parameters['id'] ?? 0;
+		$item_id = $this->parameters['id'] ?? 0;
 
 		$logger->info('filer', ['tag' => $term, 'item' => $item_id]);
 
diff --git a/src/Module/FriendSuggest.php b/src/Module/FriendSuggest.php
index cc4041a6f0..b0456377f1 100644
--- a/src/Module/FriendSuggest.php
+++ b/src/Module/FriendSuggest.php
@@ -47,7 +47,7 @@ class FriendSuggest extends BaseModule
 
 	public function post()
 	{
-		$cid = intval(static::$parameters['contact']);
+		$cid = intval($this->parameters['contact']);
 
 		// We do query the "uid" as well to ensure that it is our contact
 		if (!DI::dba()->exists('contact', ['id' => $cid, 'uid' => local_user()])) {
@@ -85,7 +85,7 @@ class FriendSuggest extends BaseModule
 
 	public function content(): string
 	{
-		$cid = intval(static::$parameters['contact']);
+		$cid = intval($this->parameters['contact']);
 
 		$contact = DI::dba()->selectFirst('contact', [], ['id' => $cid, 'uid' => local_user()]);
 		if (empty($contact)) {
diff --git a/src/Module/HCard.php b/src/Module/HCard.php
index 7dabf6c692..110371ee95 100644
--- a/src/Module/HCard.php
+++ b/src/Module/HCard.php
@@ -36,12 +36,12 @@ class HCard extends BaseModule
 {
 	public function content(): string
 	{
-		if ((local_user()) && (static::$parameters['action'] ?? '') === 'view') {
+		if ((local_user()) && ($this->parameters['action'] ?? '') === 'view') {
 			// A logged in user views a profile of a user
 			$nickname = DI::app()->getLoggedInUserNickname();
-		} elseif (empty(static::$parameters['action'])) {
+		} elseif (empty($this->parameters['action'])) {
 			// Show the profile hCard
-			$nickname = static::$parameters['profile'];
+			$nickname = $this->parameters['profile'];
 		} else {
 			throw new HTTPException\NotFoundException(DI::l10n()->t('No profile'));
 		}
diff --git a/src/Module/Item/Activity.php b/src/Module/Item/Activity.php
index b92b0acf68..3936aa2bcb 100644
--- a/src/Module/Item/Activity.php
+++ b/src/Module/Item/Activity.php
@@ -44,12 +44,12 @@ class Activity extends BaseModule
 			throw new HTTPException\ForbiddenException();
 		}
 
-		if (empty(static::$parameters['id']) || empty(static::$parameters['verb'])) {
+		if (empty($this->parameters['id']) || empty($this->parameters['verb'])) {
 			throw new HTTPException\BadRequestException();
 		}
 
-		$verb = static::$parameters['verb'];
-		$itemId =  static::$parameters['id'];
+		$verb = $this->parameters['verb'];
+		$itemId =  $this->parameters['id'];
 
 		if (in_array($verb, ['announce', 'unannounce'])) {
 			$item = Post::selectFirst(['network'], ['id' => $itemId]);
diff --git a/src/Module/Item/Compose.php b/src/Module/Item/Compose.php
index 7867b98586..6521ddc91a 100644
--- a/src/Module/Item/Compose.php
+++ b/src/Module/Item/Compose.php
@@ -64,7 +64,7 @@ class Compose extends BaseModule
 		}
 
 		/// @TODO Retrieve parameter from router
-		$posttype = static::$parameters['type'] ?? Item::PT_ARTICLE;
+		$posttype = $this->parameters['type'] ?? Item::PT_ARTICLE;
 		if (!in_array($posttype, [Item::PT_ARTICLE, Item::PT_PERSONAL_NOTE])) {
 			switch ($posttype) {
 				case 'note':
diff --git a/src/Module/Item/Follow.php b/src/Module/Item/Follow.php
index baa99c21e0..f893531708 100644
--- a/src/Module/Item/Follow.php
+++ b/src/Module/Item/Follow.php
@@ -42,11 +42,11 @@ class Follow extends BaseModule
 			throw new HttpException\ForbiddenException($l10n->t('Access denied.'));
 		}
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			throw new HTTPException\BadRequestException();
 		}
 
-		$itemId = intval(static::$parameters['id']);
+		$itemId = intval($this->parameters['id']);
 
 		if (!Item::performActivity($itemId, 'follow', local_user())) {
 			throw new HTTPException\BadRequestException($l10n->t('Unable to follow this item.'));
diff --git a/src/Module/Item/Ignore.php b/src/Module/Item/Ignore.php
index e38dd46bc7..33481fd2e3 100644
--- a/src/Module/Item/Ignore.php
+++ b/src/Module/Item/Ignore.php
@@ -41,11 +41,11 @@ class Ignore extends BaseModule
 			throw new HttpException\ForbiddenException($l10n->t('Access denied.'));
 		}
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			throw new HTTPException\BadRequestException();
 		}
 
-		$itemId = intval(static::$parameters['id']);
+		$itemId = intval($this->parameters['id']);
 
 		$dba = DI::dba();
 
diff --git a/src/Module/Item/Pin.php b/src/Module/Item/Pin.php
index 185b418bb6..12ff946553 100644
--- a/src/Module/Item/Pin.php
+++ b/src/Module/Item/Pin.php
@@ -42,11 +42,11 @@ class Pin extends BaseModule
 			throw new HttpException\ForbiddenException($l10n->t('Access denied.'));
 		}
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			throw new HTTPException\BadRequestException();
 		}
 
-		$itemId = intval(static::$parameters['id']);
+		$itemId = intval($this->parameters['id']);
 
 		$item = Post::selectFirst(['uri-id', 'uid'], ['id' => $itemId]);
 		if (!DBA::isResult($item)) {
diff --git a/src/Module/Item/Star.php b/src/Module/Item/Star.php
index 336207718e..b3e4ed2a13 100644
--- a/src/Module/Item/Star.php
+++ b/src/Module/Item/Star.php
@@ -43,11 +43,11 @@ class Star extends BaseModule
 			throw new HttpException\ForbiddenException($l10n->t('Access denied.'));
 		}
 
-		if (empty(static::$parameters['id'])) {
+		if (empty($this->parameters['id'])) {
 			throw new HTTPException\BadRequestException();
 		}
 
-		$itemId = intval(static::$parameters['id']);
+		$itemId = intval($this->parameters['id']);
 
 
 		$item = Post::selectFirstForUser(local_user(), ['uid', 'uri-id', 'starred'], ['uid' => [0, local_user()], 'id' => $itemId]);
diff --git a/src/Module/NoScrape.php b/src/Module/NoScrape.php
index c5a66c9bb6..06bce3e248 100644
--- a/src/Module/NoScrape.php
+++ b/src/Module/NoScrape.php
@@ -39,10 +39,10 @@ class NoScrape extends BaseModule
 	{
 		$a = DI::app();
 
-		if (isset(static::$parameters['nick'])) {
+		if (isset($this->parameters['nick'])) {
 			// Get infos about a specific nick (public)
-			$which = static::$parameters['nick'];
-		} elseif (local_user() && isset(static::$parameters['profile']) && DI::args()->get(2) == 'view') {
+			$which = $this->parameters['nick'];
+		} elseif (local_user() && isset($this->parameters['profile']) && DI::args()->get(2) == 'view') {
 			// view infos about a known profile (needs a login)
 			$which = $a->getLoggedInUserNickname();
 		} else {
diff --git a/src/Module/Notifications/Notification.php b/src/Module/Notifications/Notification.php
index 1ceafc105b..486054f98f 100644
--- a/src/Module/Notifications/Notification.php
+++ b/src/Module/Notifications/Notification.php
@@ -48,7 +48,7 @@ class Notification extends BaseModule
 			throw new HTTPException\UnauthorizedException(DI::l10n()->t('Permission denied.'));
 		}
 
-		$request_id = static::$parameters['id'] ?? false;
+		$request_id = $this->parameters['id'] ?? false;
 
 		if ($request_id) {
 			$intro = DI::intro()->selectOneById($request_id, local_user());
@@ -108,7 +108,7 @@ class Notification extends BaseModule
 			return Login::form();
 		}
 
-		$request_id = static::$parameters['id'] ?? false;
+		$request_id = $this->parameters['id'] ?? false;
 
 		if ($request_id) {
 			$Notify = DI::notify()->selectOneById($request_id);
diff --git a/src/Module/PermissionTooltip.php b/src/Module/PermissionTooltip.php
index bf0cc0d63e..1f6b58e4aa 100644
--- a/src/Module/PermissionTooltip.php
+++ b/src/Module/PermissionTooltip.php
@@ -17,8 +17,8 @@ class PermissionTooltip extends \Friendica\BaseModule
 {
 	public function rawContent()
 	{
-		$type = static::$parameters['type'];
-		$referenceId = static::$parameters['id'];
+		$type = $this->parameters['type'];
+		$referenceId = $this->parameters['id'];
 
 		$expectedTypes = ['item', 'photo', 'event'];
 		if (!in_array($type, $expectedTypes)) {
diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index 4ea3617acf..824edeb6af 100644
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -77,14 +77,14 @@ class Photo extends BaseModule
 		$scale = null;
 		$stamp = microtime(true);
 		// User avatar
-		if (!empty(static::$parameters['type'])) {
-			if (!empty(static::$parameters['customsize'])) {
-				$customsize = intval(static::$parameters['customsize']);
-				$square_resize = !in_array(static::$parameters['type'], ['media', 'preview']);
+		if (!empty($this->parameters['type'])) {
+			if (!empty($this->parameters['customsize'])) {
+				$customsize = intval($this->parameters['customsize']);
+				$square_resize = !in_array($this->parameters['type'], ['media', 'preview']);
 			}
 
-			if (!empty(static::$parameters['guid'])) {
-				$guid = static::$parameters['guid'];
+			if (!empty($this->parameters['guid'])) {
+				$guid = $this->parameters['guid'];
 				$account = DBA::selectFirst('account-user-view', ['id'], ['guid' => $guid], ['order' => ['uid' => true]]);
 				if (empty($account)) {
 					throw new HTTPException\NotFoundException();
@@ -94,12 +94,12 @@ class Photo extends BaseModule
 			}
 
 			// Contact Id Fallback, to remove after version 2021.12
-			if (isset(static::$parameters['contact_id'])) {
-				$id = intval(static::$parameters['contact_id']);
+			if (isset($this->parameters['contact_id'])) {
+				$id = intval($this->parameters['contact_id']);
 			}
 
-			if (!empty(static::$parameters['nickname_ext'])) {
-				$nickname = pathinfo(static::$parameters['nickname_ext'], PATHINFO_FILENAME);
+			if (!empty($this->parameters['nickname_ext'])) {
+				$nickname = pathinfo($this->parameters['nickname_ext'], PATHINFO_FILENAME);
 				$user = User::getByNickname($nickname, ['uid']);
 				if (empty($user)) {
 					throw new HTTPException\NotFoundException();
@@ -109,23 +109,23 @@ class Photo extends BaseModule
 			}
 
 			// User Id Fallback, to remove after version 2021.12
-			if (!empty(static::$parameters['uid_ext'])) {
-				$id = intval(pathinfo(static::$parameters['uid_ext'], PATHINFO_FILENAME));
+			if (!empty($this->parameters['uid_ext'])) {
+				$id = intval(pathinfo($this->parameters['uid_ext'], PATHINFO_FILENAME));
 			}
 
 			// Please refactor this for the love of everything that's good
-			if (isset(static::$parameters['id'])) {
-				$id = static::$parameters['id'];
+			if (isset($this->parameters['id'])) {
+				$id = $this->parameters['id'];
 			}
 
 			if (empty($id)) {
-				Logger::notice('No picture id was detected', ['parameters' => static::$parameters, 'query' => DI::args()->getQueryString()]);
+				Logger::notice('No picture id was detected', ['parameters' => $this->parameters, 'query' => DI::args()->getQueryString()]);
 				throw new HTTPException\NotFoundException(DI::l10n()->t('The Photo is not available.'));
 			}
 
-			$photo = self::getPhotoByid($id, static::$parameters['type'], $customsize ?: Proxy::PIXEL_SMALL);
+			$photo = self::getPhotoByid($id, $this->parameters['type'], $customsize ?: Proxy::PIXEL_SMALL);
 		} else {
-			$photoid = pathinfo(static::$parameters['name'], PATHINFO_FILENAME);
+			$photoid = pathinfo($this->parameters['name'], PATHINFO_FILENAME);
 			$scale = 0;
 			if (substr($photoid, -2, 1) == "-") {
 				$scale = intval(substr($photoid, -1, 1));
diff --git a/src/Module/Profile/Common.php b/src/Module/Profile/Common.php
index d95f2b01ef..4a335ddf7f 100644
--- a/src/Module/Profile/Common.php
+++ b/src/Module/Profile/Common.php
@@ -45,7 +45,7 @@ class Common extends BaseProfile
 
 		Nav::setSelected('home');
 
-		$nickname = static::$parameters['nickname'];
+		$nickname = $this->parameters['nickname'];
 
 		$profile = Profile::load($a, $nickname);
 		if (empty($profile)) {
diff --git a/src/Module/Profile/Contacts.php b/src/Module/Profile/Contacts.php
index d849d57783..e20fd3f2d5 100644
--- a/src/Module/Profile/Contacts.php
+++ b/src/Module/Profile/Contacts.php
@@ -42,8 +42,8 @@ class Contacts extends Module\BaseProfile
 
 		$a = DI::app();
 
-		$nickname = static::$parameters['nickname'];
-		$type = static::$parameters['type'] ?? 'all';
+		$nickname = $this->parameters['nickname'];
+		$type = $this->parameters['type'] ?? 'all';
 
 		$profile = Model\Profile::load($a, $nickname);
 		if (empty($profile)) {
diff --git a/src/Module/Profile/Index.php b/src/Module/Profile/Index.php
index e6249f90e5..75d467f547 100644
--- a/src/Module/Profile/Index.php
+++ b/src/Module/Profile/Index.php
@@ -36,11 +36,11 @@ class Index extends BaseModule
 {
 	public function rawContent()
 	{
-		(new Profile(static::$parameters))->rawContent();
+		(new Profile($this->parameters))->rawContent();
 	}
 
 	public function content(): string
 	{
-		return (new Status(static::$parameters))->content();
+		return (new Status($this->parameters))->content();
 	}
 }
diff --git a/src/Module/Profile/Media.php b/src/Module/Profile/Media.php
index 0f34b267de..74af5f95e2 100644
--- a/src/Module/Profile/Media.php
+++ b/src/Module/Profile/Media.php
@@ -33,7 +33,7 @@ class Media extends BaseProfile
 	{
 		$a = DI::app();
 
-		$profile = ProfileModel::load($a, static::$parameters['nickname']);
+		$profile = ProfileModel::load($a, $this->parameters['nickname']);
 		if (empty($profile)) {
 			throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
 		}
diff --git a/src/Module/Profile/Profile.php b/src/Module/Profile/Profile.php
index 32d3aae700..a497fc4dd6 100644
--- a/src/Module/Profile/Profile.php
+++ b/src/Module/Profile/Profile.php
@@ -49,7 +49,7 @@ class Profile extends BaseProfile
 	public function rawContent()
 	{
 		if (ActivityPub::isRequest()) {
-			$user = DBA::selectFirst('user', ['uid'], ['nickname' => static::$parameters['nickname']]);
+			$user = DBA::selectFirst('user', ['uid'], ['nickname' => $this->parameters['nickname']]);
 			if (DBA::isResult($user)) {
 				try {
 					$data = ActivityPub\Transmitter::getProfile($user['uid']);
@@ -61,9 +61,9 @@ class Profile extends BaseProfile
 				}
 			}
 
-			if (DBA::exists('userd', ['username' => static::$parameters['nickname']])) {
+			if (DBA::exists('userd', ['username' => $this->parameters['nickname']])) {
 				// Known deleted user
-				$data = ActivityPub\Transmitter::getDeletedUser(static::$parameters['nickname']);
+				$data = ActivityPub\Transmitter::getDeletedUser($this->parameters['nickname']);
 
 				System::jsonError(410, $data);
 			} else {
@@ -77,7 +77,7 @@ class Profile extends BaseProfile
 	{
 		$a = DI::app();
 
-		$profile = ProfileModel::load($a, static::$parameters['nickname']);
+		$profile = ProfileModel::load($a, $this->parameters['nickname']);
 		if (!$profile) {
 			throw new HTTPException\NotFoundException(DI::l10n()->t('Profile not found.'));
 		}
@@ -98,7 +98,7 @@ class Profile extends BaseProfile
 			DI::page()['htmlhead'] .= '<meta name="friendica.community" content="true" />' . "\n";
 		}
 
-		DI::page()['htmlhead'] .= self::buildHtmlHead($profile, static::$parameters['nickname'], $remote_contact_id);
+		DI::page()['htmlhead'] .= self::buildHtmlHead($profile, $this->parameters['nickname'], $remote_contact_id);
 
 		Nav::setSelected('home');
 
@@ -134,7 +134,7 @@ class Profile extends BaseProfile
 				$view_as_contact_alert = DI::l10n()->t(
 					'You\'re currently viewing your profile as <b>%s</b> <a href="%s" class="btn btn-sm pull-right">Cancel</a>',
 					htmlentities($view_as_contacts[$key]['name'], ENT_COMPAT, 'UTF-8'),
-					'profile/' . static::$parameters['nickname'] . '/profile'
+					'profile/' . $this->parameters['nickname'] . '/profile'
 				);
 			}
 		}
diff --git a/src/Module/Profile/Schedule.php b/src/Module/Profile/Schedule.php
index 72208fe798..1e9cd5fa5d 100644
--- a/src/Module/Profile/Schedule.php
+++ b/src/Module/Profile/Schedule.php
@@ -80,7 +80,7 @@ class Schedule extends BaseProfile
 			'$form_security_token' => BaseModule::getFormSecurityToken("profile_schedule"),
 			'$baseurl'             => DI::baseUrl()->get(true),
 			'$title'               => DI::l10n()->t('Scheduled Posts'),
-			'$nickname'            => static::$parameters['nickname'] ?? '',
+			'$nickname'            => $this->parameters['nickname'] ?? '',
 			'$scheduled_at'        => DI::l10n()->t('Scheduled'),
 			'$content'             => DI::l10n()->t('Content'),
 			'$delete'              => DI::l10n()->t('Remove post'),
diff --git a/src/Module/Profile/Status.php b/src/Module/Profile/Status.php
index db5400bff1..ad9a4acdee 100644
--- a/src/Module/Profile/Status.php
+++ b/src/Module/Profile/Status.php
@@ -52,7 +52,7 @@ class Status extends BaseProfile
 
 		$a = DI::app();
 
-		$profile = ProfileModel::load($a, static::$parameters['nickname']);
+		$profile = ProfileModel::load($a, $this->parameters['nickname']);
 
 		if (empty($profile)) {
 			throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
@@ -62,10 +62,10 @@ class Status extends BaseProfile
 			DI::page()['htmlhead'] .= '<meta content="noindex, noarchive" name="robots" />' . "\n";
 		}
 
-		DI::page()['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . DI::baseUrl() . '/dfrn_poll/' . static::$parameters['nickname'] . '" title="DFRN: ' . DI::l10n()->t('%s\'s timeline', $profile['name']) . '"/>' . "\n";
-		DI::page()['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . DI::baseUrl() . '/feed/' . static::$parameters['nickname'] . '/" title="' . DI::l10n()->t('%s\'s posts', $profile['name']) . '"/>' . "\n";
-		DI::page()['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . DI::baseUrl() . '/feed/' . static::$parameters['nickname'] . '/comments" title="' . DI::l10n()->t('%s\'s comments', $profile['name']) . '"/>' . "\n";
-		DI::page()['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . DI::baseUrl() . '/feed/' . static::$parameters['nickname'] . '/activity" title="' . DI::l10n()->t('%s\'s timeline', $profile['name']) . '"/>' . "\n";
+		DI::page()['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . DI::baseUrl() . '/dfrn_poll/' . $this->parameters['nickname'] . '" title="DFRN: ' . DI::l10n()->t('%s\'s timeline', $profile['name']) . '"/>' . "\n";
+		DI::page()['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . DI::baseUrl() . '/feed/' . $this->parameters['nickname'] . '/" title="' . DI::l10n()->t('%s\'s posts', $profile['name']) . '"/>' . "\n";
+		DI::page()['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . DI::baseUrl() . '/feed/' . $this->parameters['nickname'] . '/comments" title="' . DI::l10n()->t('%s\'s comments', $profile['name']) . '"/>' . "\n";
+		DI::page()['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . DI::baseUrl() . '/feed/' . $this->parameters['nickname'] . '/activity" title="' . DI::l10n()->t('%s\'s timeline', $profile['name']) . '"/>' . "\n";
 
 		$category = $datequery = $datequery2 = '';
 
diff --git a/src/Module/Proxy.php b/src/Module/Proxy.php
index 7a7c7b082b..abe9a8c2e9 100644
--- a/src/Module/Proxy.php
+++ b/src/Module/Proxy.php
@@ -46,7 +46,7 @@ class Proxy extends BaseModule
 	 */
 	public function rawContent()
 	{
-		$request = self::getRequestInfo();
+		$request = $this->getRequestInfo();
 
 		if (!DI::config()->get('system', 'proxify_content')) {
 			Logger::notice('Proxy access is forbidden', ['request' => $request, 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '', 'accept' => $_SERVER['HTTP_ACCEPT'] ?? '']);
@@ -119,13 +119,13 @@ class Proxy extends BaseModule
 	 *    ]
 	 * @throws \Exception
 	 */
-	private static function getRequestInfo()
+	private function getRequestInfo()
 	{
 		$size = ProxyUtils::PIXEL_LARGE;
 		$sizetype = '';
 
-		if (!empty(static::$parameters['url']) && empty($_REQUEST['url'])) {
-			$url = static::$parameters['url'];
+		if (!empty($this->parameters['url']) && empty($_REQUEST['url'])) {
+			$url = $this->parameters['url'];
 
 			// thumb, small, medium and large.
 			if (substr($url, -6) == ':micro') {
diff --git a/src/Module/PublicRSAKey.php b/src/Module/PublicRSAKey.php
index 9df9f5857b..d159255eee 100644
--- a/src/Module/PublicRSAKey.php
+++ b/src/Module/PublicRSAKey.php
@@ -35,11 +35,11 @@ class PublicRSAKey extends BaseModule
 {
 	public function rawContent()
 	{
-		if (empty(static::$parameters['nick'])) {
+		if (empty($this->parameters['nick'])) {
 			throw new BadRequestException();
 		}
 
-		$nick = static::$parameters['nick'];
+		$nick = $this->parameters['nick'];
 
 		$user = User::getByNickname($nick, ['spubkey']);
 		if (empty($user) || empty($user['spubkey'])) {
diff --git a/src/Module/Register.php b/src/Module/Register.php
index 42b95e78e9..fca59a2c85 100644
--- a/src/Module/Register.php
+++ b/src/Module/Register.php
@@ -129,7 +129,7 @@ class Register extends BaseModule
 
 		$tpl = $arr['template'];
 
-		$tos = new Tos(static::$parameters);
+		$tos = new Tos($this->parameters);
 
 		$o = Renderer::replaceMacros($tpl, [
 			'$invitations'  => DI::config()->get('system', 'invitation_only'),
diff --git a/src/Module/RemoteFollow.php b/src/Module/RemoteFollow.php
index b6b0255fcb..6fedc13931 100644
--- a/src/Module/RemoteFollow.php
+++ b/src/Module/RemoteFollow.php
@@ -44,7 +44,7 @@ class RemoteFollow extends BaseModule
 
 	public function init()
 	{
-		self::$owner = User::getOwnerDataByNick(static::$parameters['profile']);
+		self::$owner = User::getOwnerDataByNick($this->parameters['profile']);
 		if (!self::$owner) {
 			throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
 		}
@@ -115,7 +115,7 @@ class RemoteFollow extends BaseModule
 			'$submit'        => DI::l10n()->t('Submit Request'),
 			'$cancel'        => DI::l10n()->t('Cancel'),
 
-			'$request'       => 'remote_follow/' . static::$parameters['profile'],
+			'$request'       => 'remote_follow/' . $this->parameters['profile'],
 			'$name'          => self::$owner['name'],
 			'$myaddr'        => Profile::getMyURL(),
 		]);
diff --git a/src/Module/Settings/Profile/Photo/Crop.php b/src/Module/Settings/Profile/Photo/Crop.php
index c23361cf81..3b5f109d79 100644
--- a/src/Module/Settings/Profile/Photo/Crop.php
+++ b/src/Module/Settings/Profile/Photo/Crop.php
@@ -39,7 +39,7 @@ class Crop extends BaseSettings
 			return;
 		}
 
-		$photo_prefix = static::$parameters['guid'];
+		$photo_prefix = $this->parameters['guid'];
 		$resource_id = $photo_prefix;
 		$scale = 0;
 		if (substr($photo_prefix, -2, 1) == '-') {
@@ -168,7 +168,7 @@ class Crop extends BaseSettings
 
 		parent::content();
 
-		$resource_id = static::$parameters['guid'];
+		$resource_id = $this->parameters['guid'];
 
 		$photos = Photo::selectToArray([], ['resource-id' => $resource_id, 'uid' => local_user()], ['order' => ['scale' => false]]);
 		if (!DBA::isResult($photos)) {
diff --git a/src/Module/Theme.php b/src/Module/Theme.php
index cd393d641d..6c164b5ba5 100644
--- a/src/Module/Theme.php
+++ b/src/Module/Theme.php
@@ -34,7 +34,7 @@ class Theme extends BaseModule
 	{
 		header('Content-Type: text/css');
 
-		$theme = Strings::sanitizeFilePathItem(static::$parameters['theme']);
+		$theme = Strings::sanitizeFilePathItem($this->parameters['theme']);
 
 		if (file_exists("view/theme/$theme/theme.php")) {
 			require_once "view/theme/$theme/theme.php";
diff --git a/src/Module/Update/Community.php b/src/Module/Update/Community.php
index f42274953d..07ed5a610f 100644
--- a/src/Module/Update/Community.php
+++ b/src/Module/Update/Community.php
@@ -35,7 +35,7 @@ class Community extends CommunityModule
 {
 	public function rawContent()
 	{
-		self::parseRequest();
+		$this->parseRequest();
 
 		$o = '';
 		if (!empty($_GET['force']) || !DI::pConfig()->get(local_user(), 'system', 'no_auto_update')) {
diff --git a/src/Module/Update/Network.php b/src/Module/Update/Network.php
index a1a120ea27..3652b11263 100644
--- a/src/Module/Update/Network.php
+++ b/src/Module/Update/Network.php
@@ -15,7 +15,7 @@ class Network extends NetworkModule
 			exit();
 		}
 
-		self::parseRequest($_GET);
+		$this->parseRequest($_GET);
 
 		$profile_uid = intval($_GET['p']);
 

From cca1be21a39115adc80ba0a4b029210d56fba1ec Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Sun, 14 Nov 2021 23:32:01 +0100
Subject: [PATCH 05/17] Fixed static leftovers from #10975

---
 src/Module/Api/Friendica/Group/Delete.php     | 5 +++--
 src/Module/Api/GNUSocial/GNUSocial/Config.php | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Module/Api/Friendica/Group/Delete.php b/src/Module/Api/Friendica/Group/Delete.php
index 7d27222f40..d78ea658e2 100644
--- a/src/Module/Api/Friendica/Group/Delete.php
+++ b/src/Module/Api/Friendica/Group/Delete.php
@@ -22,6 +22,7 @@
 namespace Friendica\Module\Api\Friendica\Group;
 
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Group;
 use Friendica\Module\BaseApi;
 use Friendica\Network\HTTPException\BadRequestException;
@@ -31,7 +32,7 @@ use Friendica\Network\HTTPException\BadRequestException;
  */
 class Delete extends BaseApi
 {
-	public static function rawContent(array $parameters = [])
+	public function rawContent()
 	{
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
@@ -69,7 +70,7 @@ class Delete extends BaseApi
 		if ($ret) {
 			// return success
 			$success = ['success' => $ret, 'gid' => $request['gid'], 'name' => $request['name'], 'status' => 'deleted', 'wrong users' => []];
-			self::exit('group_delete', ['$result' => $success], $parameters['extension'] ?? null);
+			DI::apiResponse()->exit('group_delete', ['$result' => $success], $parameters['extension'] ?? null);
 		} else {
 			throw new BadRequestException('other API error');
 		}
diff --git a/src/Module/Api/GNUSocial/GNUSocial/Config.php b/src/Module/Api/GNUSocial/GNUSocial/Config.php
index 3ec6cdbce1..6e661d2d72 100644
--- a/src/Module/Api/GNUSocial/GNUSocial/Config.php
+++ b/src/Module/Api/GNUSocial/GNUSocial/Config.php
@@ -31,7 +31,7 @@ use Friendica\Module\Register;
  */
 class Config extends BaseApi
 {
-	public static function rawContent(array $parameters = [])
+	public function rawContent()
 	{
 		$config = [
 			'site' => [
@@ -61,6 +61,6 @@ class Config extends BaseApi
 			],
 		];
 
-		self::exit('config', ['config' => $config], $parameters['extension'] ?? null);
+		DI::apiResponse()->exit('config', ['config' => $config], $this->parameters['extension'] ?? null);
 	}
 }

From d32f8e5285e6bb2265398fd658a39d3a6b5ff94e Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Sun, 14 Nov 2021 23:35:01 +0100
Subject: [PATCH 06/17] Adapt API tests for dynamic usage

---
 tests/src/Module/Api/Friendica/NotificationTest.php         | 6 ++++--
 tests/src/Module/Api/Friendica/Photo/DeleteTest.php         | 4 ++--
 tests/src/Module/Api/Friendica/Photoalbum/DeleteTest.php    | 4 ++--
 tests/src/Module/Api/Friendica/Photoalbum/UpdateTest.php    | 6 +++---
 tests/src/Module/Api/GnuSocial/GnuSocial/VersionTest.php    | 3 ++-
 tests/src/Module/Api/GnuSocial/Help/TestTest.php            | 6 ++++--
 .../src/Module/Api/Twitter/Account/RateLimitStatusTest.php  | 6 ++++--
 tests/src/Module/Api/Twitter/SavedSearchesTest.php          | 3 ++-
 8 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/tests/src/Module/Api/Friendica/NotificationTest.php b/tests/src/Module/Api/Friendica/NotificationTest.php
index 7a213e2a5b..7f1fd701fa 100644
--- a/tests/src/Module/Api/Friendica/NotificationTest.php
+++ b/tests/src/Module/Api/Friendica/NotificationTest.php
@@ -67,14 +67,16 @@ class NotificationTest extends ApiTest
 </notes>
 XML;
 
-		Notification::rawContent(['extension' => 'xml']);
+		$notification = new Notification(['extension' => 'xml']);
+		$notification->rawContent();
 
 		self::assertXmlStringEqualsXmlString($assertXml, ApiResponseDouble::getOutput());
 	}
 
 	public function testWithJsonResult()
 	{
-		Notification::rawContent(['parameter' => 'json']);
+		$notification = new Notification(['parameter' => 'json']);
+		$notification->rawContent();
 
 		$result = json_encode(ApiResponseDouble::getOutput());
 
diff --git a/tests/src/Module/Api/Friendica/Photo/DeleteTest.php b/tests/src/Module/Api/Friendica/Photo/DeleteTest.php
index 3fd1d92f72..5581c9cc2e 100644
--- a/tests/src/Module/Api/Friendica/Photo/DeleteTest.php
+++ b/tests/src/Module/Api/Friendica/Photo/DeleteTest.php
@@ -30,7 +30,7 @@ class DeleteTest extends ApiTest
 	public function testEmpty()
 	{
 		$this->expectException(BadRequestException::class);
-		Delete::rawContent();
+		(new Delete())->rawContent();
 	}
 
 	public function testWithoutAuthenticatedUser()
@@ -41,7 +41,7 @@ class DeleteTest extends ApiTest
 	public function testWrong()
 	{
 		$this->expectException(BadRequestException::class);
-		Delete::rawContent(['photo_id' => 1]);
+		(new Delete(['photo_id' => 1]))->rawContent();
 	}
 
 	public function testWithCorrectPhotoId()
diff --git a/tests/src/Module/Api/Friendica/Photoalbum/DeleteTest.php b/tests/src/Module/Api/Friendica/Photoalbum/DeleteTest.php
index f99e61bd1b..6ee3c5e7b5 100644
--- a/tests/src/Module/Api/Friendica/Photoalbum/DeleteTest.php
+++ b/tests/src/Module/Api/Friendica/Photoalbum/DeleteTest.php
@@ -30,13 +30,13 @@ class DeleteTest extends ApiTest
 	public function testEmpty()
 	{
 		$this->expectException(BadRequestException::class);
-		Delete::rawContent();
+		(new Delete())->rawContent();
 	}
 
 	public function testWrong()
 	{
 		$this->expectException(BadRequestException::class);
-		Delete::rawContent(['album' => 'album_name']);
+		(new Delete(['album' => 'album_name']))->rawContent();
 	}
 
 	public function testValid()
diff --git a/tests/src/Module/Api/Friendica/Photoalbum/UpdateTest.php b/tests/src/Module/Api/Friendica/Photoalbum/UpdateTest.php
index b07d4c5bcf..c7d65cb16b 100644
--- a/tests/src/Module/Api/Friendica/Photoalbum/UpdateTest.php
+++ b/tests/src/Module/Api/Friendica/Photoalbum/UpdateTest.php
@@ -30,19 +30,19 @@ class UpdateTest extends ApiTest
 	public function testEmpty()
 	{
 		$this->expectException(BadRequestException::class);
-		Update::rawContent();
+		(new Update())->rawContent();
 	}
 
 	public function testTooFewArgs()
 	{
 		$this->expectException(BadRequestException::class);
-		Update::rawContent(['album' => 'album_name']);
+		(new Update(['album' => 'album_name']))->rawContent();
 	}
 
 	public function testWrongUpdate()
 	{
 		$this->expectException(BadRequestException::class);
-		Update::rawContent(['album' => 'album_name', 'album_new' => 'album_name']);
+		(new Update(['album' => 'album_name', 'album_new' => 'album_name']))->rawContent();
 	}
 
 	public function testWithoutAuthenticatedUser()
diff --git a/tests/src/Module/Api/GnuSocial/GnuSocial/VersionTest.php b/tests/src/Module/Api/GnuSocial/GnuSocial/VersionTest.php
index 454b8ef40d..a819a7a1e6 100644
--- a/tests/src/Module/Api/GnuSocial/GnuSocial/VersionTest.php
+++ b/tests/src/Module/Api/GnuSocial/GnuSocial/VersionTest.php
@@ -10,7 +10,8 @@ class VersionTest extends ApiTest
 {
 	public function test()
 	{
-		Version::rawContent(['extension' => 'json']);
+		$version = new Version(['extension' => 'json']);
+		$version->rawContent();
 
 		$result = json_decode(ApiResponseDouble::getOutput());
 
diff --git a/tests/src/Module/Api/GnuSocial/Help/TestTest.php b/tests/src/Module/Api/GnuSocial/Help/TestTest.php
index c962cac302..c624ca0326 100644
--- a/tests/src/Module/Api/GnuSocial/Help/TestTest.php
+++ b/tests/src/Module/Api/GnuSocial/Help/TestTest.php
@@ -10,14 +10,16 @@ class TestTest extends ApiTest
 {
 	public function testJson()
 	{
-		Test::rawContent(['extension' => 'json']);
+		$test = new Test(['extension' => 'json']);
+		$test->rawContent();
 
 		self::assertEquals('"ok"', ApiResponseDouble::getOutput());
 	}
 
 	public function testXml()
 	{
-		Test::rawContent(['extension' => 'xml']);
+		$test = new Test(['extension' => 'xml']);
+		$test->rawContent();
 
 		self::assertxml(ApiResponseDouble::getOutput(), 'ok');
 	}
diff --git a/tests/src/Module/Api/Twitter/Account/RateLimitStatusTest.php b/tests/src/Module/Api/Twitter/Account/RateLimitStatusTest.php
index 46088d330f..3a84324af5 100644
--- a/tests/src/Module/Api/Twitter/Account/RateLimitStatusTest.php
+++ b/tests/src/Module/Api/Twitter/Account/RateLimitStatusTest.php
@@ -10,7 +10,8 @@ class RateLimitStatusTest extends ApiTest
 {
 	public function testWithJson()
 	{
-		RateLimitStatus::rawContent(['extension' => 'json']);
+		$rateLimitStatus = new RateLimitStatus(['extension' => 'json']);
+		$rateLimitStatus->rawContent();
 
 		$result = json_decode(ApiResponseDouble::getOutput());
 
@@ -21,7 +22,8 @@ class RateLimitStatusTest extends ApiTest
 
 	public function testWithXml()
 	{
-		RateLimitStatus::rawContent(['extension' => 'xml']);
+		$rateLimitStatus = new RateLimitStatus(['extension' => 'xml']);
+		$rateLimitStatus->rawContent();
 
 		self::assertXml(ApiResponseDouble::getOutput(), 'hash');
 	}
diff --git a/tests/src/Module/Api/Twitter/SavedSearchesTest.php b/tests/src/Module/Api/Twitter/SavedSearchesTest.php
index f4dad04fc1..fc0f80467b 100644
--- a/tests/src/Module/Api/Twitter/SavedSearchesTest.php
+++ b/tests/src/Module/Api/Twitter/SavedSearchesTest.php
@@ -10,7 +10,8 @@ class SavedSearchesTest extends ApiTest
 {
 	public function test()
 	{
-		SavedSearches::rawContent(['extension' => 'json']);
+		$savedSearch = new SavedSearches(['extension' => 'json']);
+		$savedSearch->rawContent();
 
 		$result = json_decode(ApiResponseDouble::getOutput());
 

From 8bf61848f984c5ec42bdb7527ad276b7580ccab8 Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Mon, 15 Nov 2021 00:01:16 +0100
Subject: [PATCH 07/17] Fix Legacy test

---
 tests/datasets/legacy/legacy.php | 6 ++++++
 tests/src/App/ModuleTest.php     | 9 +++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 tests/datasets/legacy/legacy.php

diff --git a/tests/datasets/legacy/legacy.php b/tests/datasets/legacy/legacy.php
new file mode 100644
index 0000000000..4b0a76e609
--- /dev/null
+++ b/tests/datasets/legacy/legacy.php
@@ -0,0 +1,6 @@
+<?php
+
+function legacy_init()
+{
+	// I don't do nothing
+}
diff --git a/tests/src/App/ModuleTest.php b/tests/src/App/ModuleTest.php
index 65e0873c10..8bcd81bc83 100644
--- a/tests/src/App/ModuleTest.php
+++ b/tests/src/App/ModuleTest.php
@@ -146,24 +146,28 @@ class ModuleTest extends DatabaseTest
 				'name'    => App\Module::DEFAULT,
 				'command' => App\Module::DEFAULT,
 				'privAdd' => false,
+				'args'    => [],
 			],
 			'legacy'  => [
 				'assert'  => LegacyModule::class,
 				'name'    => 'display',
 				'command' => 'display/test/it',
 				'privAdd' => false,
+				'args'    => [__DIR__ . '/../../datasets/legacy/legacy.php'],
 			],
 			'new'     => [
 				'assert'  => HostMeta::class,
 				'not_required',
 				'command' => '.well-known/host-meta',
 				'privAdd' => false,
+				'args'    => [],
 			],
 			'404'     => [
 				'assert'  => PageNotFound::class,
 				'name'    => 'invalid',
 				'command' => 'invalid',
 				'privAdd' => false,
+				'args'    => [],
 			]
 		];
 	}
@@ -173,7 +177,7 @@ class ModuleTest extends DatabaseTest
 	 *
 	 * @dataProvider dataModuleClass
 	 */
-	public function testModuleClass($assert, string $name, string $command, bool $privAdd)
+	public function testModuleClass($assert, string $name, string $command, bool $privAdd, array $args)
 	{
 		$config = Mockery::mock(IManageConfigValues::class);
 		$config->shouldReceive('get')->with('config', 'private_addons', false)->andReturn($privAdd)->atMost()->once();
@@ -193,7 +197,8 @@ class ModuleTest extends DatabaseTest
 		$router = (new App\Router([], __DIR__ . '/../../../static/routes.config.php', $l10n, $cache, $lock));
 
 		$dice = Mockery::mock(Dice::class);
-		$dice->shouldReceive('create')->andReturn(new $assert());
+
+		$dice->shouldReceive('create')->andReturn(new $assert(...$args));
 
 		$module = (new App\Module($name))->determineClass(new App\Arguments('', $command), $router, $config, $dice);
 

From 2f4e19a82f6c901dc1bb82cde41fdd802a1f6bf2 Mon Sep 17 00:00:00 2001
From: Philipp <admin+Github@philipp.info>
Date: Tue, 16 Nov 2021 21:11:47 +0100
Subject: [PATCH 08/17] Update src/App/Module.php

Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
---
 src/App/Module.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App/Module.php b/src/App/Module.php
index eb1621b8b3..bfd6e74542 100644
--- a/src/App/Module.php
+++ b/src/App/Module.php
@@ -153,7 +153,7 @@ class Module
 
 		$isBackend = in_array($module, Module::BACKEND_MODULES);;
 
-		return new Module($module,null, $isBackend, $this->printNotAllowedAddon);
+		return new Module($module, null, $isBackend, $this->printNotAllowedAddon);
 	}
 
 	/**

From 85304b6e8f0055151aef4fe1419eeecf67b20ee7 Mon Sep 17 00:00:00 2001
From: Philipp <admin+Github@philipp.info>
Date: Tue, 16 Nov 2021 21:12:12 +0100
Subject: [PATCH 09/17] Update src/App/Page.php

Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
---
 src/App/Page.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App/Page.php b/src/App/Page.php
index d7e04ea7ce..856e2bc458 100644
--- a/src/App/Page.php
+++ b/src/App/Page.php
@@ -350,7 +350,7 @@ class Page implements ArrayAccess
 			$moduleClass = $module->getClass();
 
 			$arr = ['content' => $content];
-			Hook::callAll( $moduleClass->getClassName() . '_mod_content', $arr);
+			Hook::callAll($moduleClass->getClassName() . '_mod_content', $arr);
 			$content = $arr['content'];
 			$arr     = ['content' => $moduleClass->content()];
 			Hook::callAll($moduleClass->getClassName() . '_mod_aftercontent', $arr);

From 8f741c8b78e37fc8a93061fae96195bb7a82d3bb Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Tue, 16 Nov 2021 21:14:20 +0100
Subject: [PATCH 10/17] Remove afterpost() handling

---
 doc/Addons.md                           | 1 -
 doc/de/Addons.md                        | 1 -
 src/App/Module.php                      | 3 ---
 src/App/Page.php                        | 3 ---
 src/BaseModule.php                      | 7 -------
 src/Capabilities/ICanHandleRequests.php | 7 -------
 src/LegacyModule.php                    | 5 -----
 7 files changed, 27 deletions(-)

diff --git a/doc/Addons.md b/doc/Addons.md
index 6b3cd169bf..230e9e93b9 100644
--- a/doc/Addons.md
+++ b/doc/Addons.md
@@ -566,7 +566,6 @@ Here is a complete list of all hook callbacks with file locations (as of 24-Sep-
     Hook::callAll($a->module.'_mod_init', $placeholder);
     Hook::callAll($a->module.'_mod_init', $placeholder);
     Hook::callAll($a->module.'_mod_post', $_POST);
-    Hook::callAll($a->module.'_mod_afterpost', $placeholder);
     Hook::callAll($a->module.'_mod_content', $arr);
     Hook::callAll($a->module.'_mod_aftercontent', $arr);
     Hook::callAll('page_end', DI::page()['content']);
diff --git a/doc/de/Addons.md b/doc/de/Addons.md
index a20cf4a594..3381ef48f1 100644
--- a/doc/de/Addons.md
+++ b/doc/de/Addons.md
@@ -202,7 +202,6 @@ Eine komplette Liste aller Hook-Callbacks mit den zugehörigen Dateien (am 01-Ap
     Hook::callAll($a->module.'_mod_init', $placeholder);
     Hook::callAll($a->module.'_mod_init', $placeholder);
     Hook::callAll($a->module.'_mod_post', $_POST);
-    Hook::callAll($a->module.'_mod_afterpost', $placeholder);
     Hook::callAll($a->module.'_mod_content', $arr);
     Hook::callAll($a->module.'_mod_aftercontent', $arr);
     Hook::callAll('page_end', DI::page()['content']);
diff --git a/src/App/Module.php b/src/App/Module.php
index bfd6e74542..94caf63a11 100644
--- a/src/App/Module.php
+++ b/src/App/Module.php
@@ -318,9 +318,6 @@ class Module
 			$this->module_class->put();
 		}
 
-		Core\Hook::callAll($this->module . '_mod_afterpost', $placeholder);
-		$this->module_class->afterpost();
-
 		// "rawContent" is especially meant for technical endpoints.
 		// This endpoint doesn't need any theme initialization or other comparable stuff.
 		$this->module_class->rawContent();
diff --git a/src/App/Page.php b/src/App/Page.php
index 856e2bc458..71d59f59d0 100644
--- a/src/App/Page.php
+++ b/src/App/Page.php
@@ -352,9 +352,6 @@ class Page implements ArrayAccess
 			$arr = ['content' => $content];
 			Hook::callAll($moduleClass->getClassName() . '_mod_content', $arr);
 			$content = $arr['content'];
-			$arr     = ['content' => $moduleClass->content()];
-			Hook::callAll($moduleClass->getClassName() . '_mod_aftercontent', $arr);
-			$content .= $arr['content'];
 		} catch (HTTPException $e) {
 			$content = (new ModuleHTTPException())->content($e);
 		}
diff --git a/src/BaseModule.php b/src/BaseModule.php
index 2873357fd8..aaca6c5311 100644
--- a/src/BaseModule.php
+++ b/src/BaseModule.php
@@ -90,13 +90,6 @@ abstract class BaseModule implements ICanHandleRequests
 		// DI::baseurl()->redirect('module');
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function afterpost()
-	{
-	}
-
 	/**
 	 * {@inheritDoc}
 	 */
diff --git a/src/Capabilities/ICanHandleRequests.php b/src/Capabilities/ICanHandleRequests.php
index 2773404643..ce258c7dd3 100644
--- a/src/Capabilities/ICanHandleRequests.php
+++ b/src/Capabilities/ICanHandleRequests.php
@@ -56,13 +56,6 @@ interface ICanHandleRequests
 	 */
 	public function post();
 
-	/**
-	 * Called after post()
-	 *
-	 * Unknown purpose
-	 */
-	public function afterpost();
-
 	/**
 	 * Module PUT method to process submitted data
 	 *
diff --git a/src/LegacyModule.php b/src/LegacyModule.php
index 5f0cc3103c..38c3e9a8fb 100644
--- a/src/LegacyModule.php
+++ b/src/LegacyModule.php
@@ -76,11 +76,6 @@ class LegacyModule extends BaseModule
 		$this->runModuleFunction('post');
 	}
 
-	public function afterpost()
-	{
-		$this->runModuleFunction('afterpost');
-	}
-
 	/**
 	 * Runs the module function designated by the provided suffix if it exists, the BaseModule method otherwise
 	 *

From c95d47b0b4d01552804ebcf26e5ae42fc576fc60 Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Tue, 16 Nov 2021 22:34:49 +0100
Subject: [PATCH 11/17] Refactor App\Module to App\ModuleController and rename
 properties

---
 index.php                                    |  2 +-
 src/App.php                                  | 12 +--
 src/App/Mode.php                             | 10 +--
 src/App/{Module.php => ModuleController.php} | 79 ++++++++++----------
 src/App/Page.php                             | 16 ++--
 src/DI.php                                   |  4 +-
 static/dependencies.config.php               |  6 +-
 tests/src/App/ModeTest.php                   | 16 ++--
 tests/src/App/ModuleTest.php                 | 40 +++++-----
 9 files changed, 93 insertions(+), 92 deletions(-)
 rename src/App/{Module.php => ModuleController.php} (82%)

diff --git a/index.php b/index.php
index cfb5937368..0afd2c7d3e 100644
--- a/index.php
+++ b/index.php
@@ -41,7 +41,7 @@ $a = \Friendica\DI::app();
 \Friendica\DI::mode()->setExecutor(\Friendica\App\Mode::INDEX);
 
 $a->runFrontend(
-	$dice->create(\Friendica\App\Module::class),
+	$dice->create(\Friendica\App\ModuleController::class),
 	$dice->create(\Friendica\App\Router::class),
 	$dice->create(\Friendica\Core\PConfig\Capability\IManagePersonalConfigValues::class),
 	$dice->create(\Friendica\Security\Authentication::class),
diff --git a/src/App.php b/src/App.php
index 63d28fc80c..2dd8f9d1ab 100644
--- a/src/App.php
+++ b/src/App.php
@@ -25,7 +25,7 @@ use Dice\Dice;
 use Exception;
 use Friendica\App\Arguments;
 use Friendica\App\BaseURL;
-use Friendica\App\Module;
+use Friendica\App\ModuleController;
 use Friendica\Core\Config\Factory\Config;
 use Friendica\Module\Maintenance;
 use Friendica\Security\Authentication;
@@ -567,16 +567,16 @@ class App
 	 *
 	 * This probably should change to limit the size of this monster method.
 	 *
-	 * @param App\Module                  $module The determined module
+	 * @param App\ModuleController        $module The determined module
 	 * @param App\Router                  $router
 	 * @param IManagePersonalConfigValues $pconfig
-	 * @param Authentication              $auth The Authentication backend of the node
-	 * @param App\Page                    $page The Friendica page printing container
+	 * @param Authentication              $auth   The Authentication backend of the node
+	 * @param App\Page                    $page   The Friendica page printing container
 	 *
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public function runFrontend(App\Module $module, App\Router $router, IManagePersonalConfigValues $pconfig, Authentication $auth, App\Page $page, Dice $dice, float $start_time)
+	public function runFrontend(App\ModuleController $module, App\Router $router, IManagePersonalConfigValues $pconfig, Authentication $auth, App\Page $page, Dice $dice, float $start_time)
 	{
 		$this->profiler->set($start_time, 'start');
 		$this->profiler->set(microtime(true), 'classinit');
@@ -703,7 +703,7 @@ class App
 			$page['page_title'] = $moduleName;
 
 			if (!$this->mode->isInstall() && !$this->mode->has(App\Mode::MAINTENANCEDISABLED)) {
-				$module = new Module('maintenance', new Maintenance());
+				$module = new ModuleController('maintenance', new Maintenance());
 			} else {
 				// determine the module class and save it to the module instance
 				// @todo there's an implicit dependency due SESSION::start(), so it has to be called here (yet)
diff --git a/src/App/Mode.php b/src/App/Mode.php
index 1087b08a05..4a1213ae12 100644
--- a/src/App/Mode.php
+++ b/src/App/Mode.php
@@ -139,14 +139,14 @@ class Mode
 	/**
 	 * Checks if the site is called via a backend process
 	 *
-	 * @param bool         $isBackend    True, if the call is from a backend script (daemon, worker, ...)
-	 * @param Module       $module       The pre-loaded module (just name, not class!)
-	 * @param array        $server       The $_SERVER variable
-	 * @param MobileDetect $mobileDetect The mobile detection library
+	 * @param bool             $isBackend    True, if the call is from a backend script (daemon, worker, ...)
+	 * @param ModuleController $module       The pre-loaded module (just name, not class!)
+	 * @param array            $server       The $_SERVER variable
+	 * @param MobileDetect     $mobileDetect The mobile detection library
 	 *
 	 * @return Mode returns the determined mode
 	 */
-	public function determineRunMode(bool $isBackend, Module $module, array $server, MobileDetect $mobileDetect)
+	public function determineRunMode(bool $isBackend, ModuleController $module, array $server, MobileDetect $mobileDetect)
 	{
 		foreach (self::BACKEND_CONTENT_TYPES as $type) {
 			if (strpos(strtolower($server['HTTP_ACCEPT'] ?? ''), $type) !== false) {
diff --git a/src/App/Module.php b/src/App/ModuleController.php
similarity index 82%
rename from src/App/Module.php
rename to src/App/ModuleController.php
index 94caf63a11..013859de9d 100644
--- a/src/App/Module.php
+++ b/src/App/ModuleController.php
@@ -39,7 +39,7 @@ use Psr\Log\LoggerInterface;
 /**
  * Holds the common context of the current, loaded module
  */
-class Module
+class ModuleController
 {
 	const DEFAULT       = 'home';
 	const DEFAULT_CLASS = Home::class;
@@ -78,12 +78,12 @@ class Module
 	/**
 	 * @var string The module name
 	 */
-	private $module;
+	private $moduleName;
 
 	/**
 	 * @var ICanHandleRequests The module class
 	 */
-	private $module_class;
+	private $module;
 
 	/**
 	 * @var bool true, if the module is a backend module
@@ -99,33 +99,33 @@ class Module
 	 * @return string
 	 */
 	public function getName()
+	{
+		return $this->moduleName;
+	}
+
+	/**
+	 * @return ICanHandleRequests The base module object
+	 */
+	public function getModule(): ICanHandleRequests
 	{
 		return $this->module;
 	}
 
-	/**
-	 * @return ICanHandleRequests The base class name
-	 */
-	public function getClass(): ICanHandleRequests
-	{
-		return $this->module_class;
-	}
-
 	/**
 	 * @return bool True, if the current module is a backend module
-	 * @see Module::BACKEND_MODULES for a list
+	 * @see ModuleController::BACKEND_MODULES for a list
 	 */
 	public function isBackend()
 	{
 		return $this->isBackend;
 	}
 
-	public function __construct(string $module = self::DEFAULT, ICanHandleRequests $module_class = null, bool $isBackend = false, bool $printNotAllowedAddon = false)
+	public function __construct(string $moduleName = self::DEFAULT, ICanHandleRequests $module = null, bool $isBackend = false, bool $printNotAllowedAddon = false)
 	{
 		$defaultClass = static::DEFAULT_CLASS;
 
-		$this->module               = $module;
-		$this->module_class         = $module_class ?? new $defaultClass();
+		$this->moduleName           = $moduleName;
+		$this->module               = $module ?? new $defaultClass();
 		$this->isBackend            = $isBackend;
 		$this->printNotAllowedAddon = $printNotAllowedAddon;
 	}
@@ -135,9 +135,9 @@ class Module
 	 *
 	 * @param Arguments $args   The Friendica arguments
 	 *
-	 * @return Module The module with the determined module
+	 * @return ModuleController The module with the determined module
 	 */
-	public function determineModule(Arguments $args)
+	public function determineName(Arguments $args)
 	{
 		if ($args->getArgc() > 0) {
 			$module = str_replace('.', '_', $args->get(0));
@@ -151,9 +151,10 @@ class Module
 			$module = "login";
 		}
 
-		$isBackend = in_array($module, Module::BACKEND_MODULES);;
+		$isBackend = in_array($module, ModuleController::BACKEND_MODULES);
+		;
 
-		return new Module($module, null, $isBackend, $this->printNotAllowedAddon);
+		return new ModuleController($module, null, $isBackend, $this->printNotAllowedAddon);
 	}
 
 	/**
@@ -164,7 +165,7 @@ class Module
 	 * @param IManageConfigValues $config The Friendica Configuration
 	 * @param Dice                $dice   The Dependency Injection container
 	 *
-	 * @return Module The determined module of this call
+	 * @return ModuleController The determined module of this call
 	 *
 	 * @throws \Exception
 	 */
@@ -172,7 +173,7 @@ class Module
 	{
 		$printNotAllowedAddon = false;
 
-		$module_class = null;
+		$module_class      = null;
 		$module_parameters = [];
 		/**
 		 * ROUTING
@@ -181,21 +182,21 @@ class Module
 		 * post() and/or content() static methods can be respectively called to produce a data change or an output.
 		 **/
 		try {
-			$module_class = $router->getModuleClass($args->getCommand());
+			$module_class        = $router->getModuleClass($args->getCommand());
 			$module_parameters[] = $router->getModuleParameters();
 		} catch (MethodNotAllowedException $e) {
 			$module_class = MethodNotAllowed::class;
 		} catch (NotFoundException $e) {
 			// Then we try addon-provided modules that we wrap in the LegacyModule class
-			if (Core\Addon::isEnabled($this->module) && file_exists("addon/{$this->module}/{$this->module}.php")) {
+			if (Core\Addon::isEnabled($this->moduleName) && file_exists("addon/{$this->moduleName}/{$this->moduleName}.php")) {
 				//Check if module is an app and if public access to apps is allowed or not
 				$privateapps = $config->get('config', 'private_addons', false);
-				if ((!local_user()) && Core\Hook::isAddonApp($this->module) && $privateapps) {
+				if ((!local_user()) && Core\Hook::isAddonApp($this->moduleName) && $privateapps) {
 					$printNotAllowedAddon = true;
 				} else {
-					include_once "addon/{$this->module}/{$this->module}.php";
-					if (function_exists($this->module . '_module')) {
-						$module_parameters[] = "addon/{$this->module}/{$this->module}.php";
+					include_once "addon/{$this->moduleName}/{$this->moduleName}.php";
+					if (function_exists($this->moduleName . '_module')) {
+						$module_parameters[] = "addon/{$this->moduleName}/{$this->moduleName}.php";
 						$module_class        = LegacyModule::class;
 					}
 				}
@@ -204,8 +205,8 @@ class Module
 			/* Finally, we look for a 'standard' program module in the 'mod' directory
 			 * We emulate a Module class through the LegacyModule class
 			 */
-			if (!$module_class && file_exists("mod/{$this->module}.php")) {
-				$module_parameters[] = "mod/{$this->module}.php";
+			if (!$module_class && file_exists("mod/{$this->moduleName}.php")) {
+				$module_parameters[] = "mod/{$this->moduleName}.php";
 				$module_class        = LegacyModule::class;
 			}
 
@@ -215,7 +216,7 @@ class Module
 		/** @var ICanHandleRequests $module */
 		$module = $dice->create($module_class, $module_parameters);
 
-		return new Module($this->module, $module, $this->isBackend, $printNotAllowedAddon);
+		return new ModuleController($this->moduleName, $module, $this->isBackend, $printNotAllowedAddon);
 	}
 
 	/**
@@ -244,7 +245,7 @@ class Module
 		 *
 		 * Otherwise we are going to emit a 404 not found.
 		 */
-		if ($this->module_class === PageNotFound::class) {
+		if ($this->module === PageNotFound::class) {
 			$queryString = $server['QUERY_STRING'];
 			// Stupid browser tried to pre-fetch our Javascript img template. Don't log the event or return anything - just quietly exit.
 			if (!empty($queryString) && preg_match('/{[0-9]}/', $queryString) !== 0) {
@@ -295,31 +296,31 @@ class Module
 		$profiler->set(microtime(true), 'ready');
 		$timestamp = microtime(true);
 
-		Core\Hook::callAll($this->module . '_mod_init', $placeholder);
+		Core\Hook::callAll($this->moduleName . '_mod_init', $placeholder);
 
-		$this->module_class->init();
+		$this->module->init();
 
 		$profiler->set(microtime(true) - $timestamp, 'init');
 
 		if ($server['REQUEST_METHOD'] === Router::DELETE) {
-			$this->module_class->delete();
+			$this->module->delete();
 		}
 
 		if ($server['REQUEST_METHOD'] === Router::PATCH) {
-			$this->module_class->patch();
+			$this->module->patch();
 		}
 
 		if ($server['REQUEST_METHOD'] === Router::POST) {
-			Core\Hook::callAll($this->module . '_mod_post', $post);
-			$this->module_class->post();
+			Core\Hook::callAll($this->moduleName . '_mod_post', $post);
+			$this->module->post();
 		}
 
 		if ($server['REQUEST_METHOD'] === Router::PUT) {
-			$this->module_class->put();
+			$this->module->put();
 		}
 
 		// "rawContent" is especially meant for technical endpoints.
 		// This endpoint doesn't need any theme initialization or other comparable stuff.
-		$this->module_class->rawContent();
+		$this->module->rawContent();
 	}
 }
diff --git a/src/App/Page.php b/src/App/Page.php
index 71d59f59d0..f410f6aa28 100644
--- a/src/App/Page.php
+++ b/src/App/Page.php
@@ -191,14 +191,14 @@ class Page implements ArrayAccess
 	 * - head.tpl template
 	 *
 	 * @param App                         $app     The Friendica App instance
-	 * @param Module                      $module  The loaded Friendica module
+	 * @param ModuleController            $module  The loaded Friendica module
 	 * @param L10n                        $l10n    The l10n language instance
 	 * @param IManageConfigValues         $config  The Friendica configuration
 	 * @param IManagePersonalConfigValues $pConfig The Friendica personal configuration (for user)
 	 *
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	private function initHead(App $app, Module $module, L10n $l10n, IManageConfigValues $config, IManagePersonalConfigValues $pConfig)
+	private function initHead(App $app, ModuleController $module, L10n $l10n, IManageConfigValues $config, IManagePersonalConfigValues $pConfig)
 	{
 		$interval = ((local_user()) ? $pConfig->get(local_user(), 'system', 'update_interval') : 40000);
 
@@ -337,17 +337,17 @@ class Page implements ArrayAccess
 	 * - module content
 	 * - hooks for content
 	 *
-	 * @param Module $module The module
-	 * @param Mode   $mode   The Friendica execution mode
+	 * @param ModuleController $module The module
+	 * @param Mode             $mode   The Friendica execution mode
 	 *
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	private function initContent(Module $module, Mode $mode)
+	private function initContent(ModuleController $module, Mode $mode)
 	{
 		$content = '';
 
 		try {
-			$moduleClass = $module->getClass();
+			$moduleClass = $module->getModule();
 
 			$arr = ['content' => $content];
 			Hook::callAll($moduleClass->getClassName() . '_mod_content', $arr);
@@ -389,14 +389,14 @@ class Page implements ArrayAccess
 	 * @param App                         $app     The Friendica App
 	 * @param BaseURL                     $baseURL The Friendica Base URL
 	 * @param Mode                        $mode    The current node mode
-	 * @param Module                      $module  The loaded Friendica module
+	 * @param ModuleController            $module  The loaded Friendica module
 	 * @param L10n                        $l10n    The l10n language class
 	 * @param IManageConfigValues         $config  The Configuration of this node
 	 * @param IManagePersonalConfigValues $pconfig The personal/user configuration
 	 *
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	public function run(App $app, BaseURL $baseURL, Mode $mode, Module $module, L10n $l10n, Profiler $profiler, IManageConfigValues $config, IManagePersonalConfigValues $pconfig)
+	public function run(App $app, BaseURL $baseURL, Mode $mode, ModuleController $module, L10n $l10n, Profiler $profiler, IManageConfigValues $config, IManagePersonalConfigValues $pconfig)
 	{
 		$moduleName = $module->getName();
 
diff --git a/src/DI.php b/src/DI.php
index ead125cff2..0c134f37b4 100644
--- a/src/DI.php
+++ b/src/DI.php
@@ -99,11 +99,11 @@ abstract class DI
 	}
 
 	/**
-	 * @return App\Module
+	 * @return App\ModuleController
 	 */
 	public static function module()
 	{
-		return self::$dice->create(App\Module::class);
+		return self::$dice->create(App\ModuleController::class);
 	}
 
 	/**
diff --git a/static/dependencies.config.php b/static/dependencies.config.php
index 57ef629bb2..28d26b4e7b 100644
--- a/static/dependencies.config.php
+++ b/static/dependencies.config.php
@@ -181,10 +181,10 @@ return [
 			['determine', [$_SERVER, $_GET], Dice::CHAIN_CALL],
 		],
 	],
-	App\Module::class => [
-		'instanceOf' => App\Module::class,
+	App\ModuleController::class => [
+		'instanceOf' => App\ModuleController::class,
 		'call' => [
-			['determineModule', [], Dice::CHAIN_CALL],
+			['determineName', [], Dice::CHAIN_CALL],
 		],
 	],
 	\Friendica\Core\System::class => [
diff --git a/tests/src/App/ModeTest.php b/tests/src/App/ModeTest.php
index 24371925b8..80e45d308f 100644
--- a/tests/src/App/ModeTest.php
+++ b/tests/src/App/ModeTest.php
@@ -23,7 +23,7 @@ namespace Friendica\Test\src\App;
 
 use Detection\MobileDetect;
 use Friendica\App\Mode;
-use Friendica\App\Module;
+use Friendica\App\ModuleController;
 use Friendica\Core\Config\ValueObject\Cache;
 use Friendica\Database\Database;
 use Friendica\Test\MockedTest;
@@ -204,7 +204,7 @@ class ModeTest extends MockedTest
 	public function testIsBackendNotIsBackend()
 	{
 		$server       = [];
-		$module       = new Module();
+		$module       = new ModuleController();
 		$mobileDetect = new MobileDetect();
 
 		$mode = (new Mode())->determineRunMode(true, $module, $server, $mobileDetect);
@@ -218,7 +218,7 @@ class ModeTest extends MockedTest
 	public function testIsBackendButIndex()
 	{
 		$server       = [];
-		$module       = new Module(Module::DEFAULT, null, true);
+		$module       = new ModuleController(ModuleController::DEFAULT, null, true);
 		$mobileDetect = new MobileDetect();
 
 		$mode = (new Mode())->determineRunMode(false, $module, $server, $mobileDetect);
@@ -232,7 +232,7 @@ class ModeTest extends MockedTest
 	public function testIsNotBackend()
 	{
 		$server       = [];
-		$module       = new Module(Module::DEFAULT, null, false);
+		$module       = new ModuleController(ModuleController::DEFAULT, null, false);
 		$mobileDetect = new MobileDetect();
 
 		$mode = (new Mode())->determineRunMode(false, $module, $server, $mobileDetect);
@@ -250,7 +250,7 @@ class ModeTest extends MockedTest
 			'HTTP_X_REQUESTED_WITH' => 'xmlhttprequest',
 		];
 
-		$module       = new Module(Module::DEFAULT, null, false);
+		$module       = new ModuleController(ModuleController::DEFAULT, null, false);
 		$mobileDetect = new MobileDetect();
 
 		$mode = (new Mode())->determineRunMode(true, $module, $server, $mobileDetect);
@@ -264,7 +264,7 @@ class ModeTest extends MockedTest
 	public function testIsNotAjax()
 	{
 		$server       = [];
-		$module       = new Module(Module::DEFAULT, null, false);
+		$module       = new ModuleController(ModuleController::DEFAULT, null, false);
 		$mobileDetect = new MobileDetect();
 
 		$mode = (new Mode())->determineRunMode(true, $module, $server, $mobileDetect);
@@ -278,7 +278,7 @@ class ModeTest extends MockedTest
 	public function testIsMobileIsTablet()
 	{
 		$server       = [];
-		$module       = new Module(Module::DEFAULT, null, false);
+		$module       = new ModuleController(ModuleController::DEFAULT, null, false);
 		$mobileDetect = Mockery::mock(MobileDetect::class);
 		$mobileDetect->shouldReceive('isMobile')->andReturn(true);
 		$mobileDetect->shouldReceive('isTablet')->andReturn(true);
@@ -296,7 +296,7 @@ class ModeTest extends MockedTest
 	public function testIsNotMobileIsNotTablet()
 	{
 		$server       = [];
-		$module       = new Module(Module::DEFAULT, null, false);
+		$module       = new ModuleController(ModuleController::DEFAULT, null, false);
 		$mobileDetect = Mockery::mock(MobileDetect::class);
 		$mobileDetect->shouldReceive('isMobile')->andReturn(false);
 		$mobileDetect->shouldReceive('isTablet')->andReturn(false);
diff --git a/tests/src/App/ModuleTest.php b/tests/src/App/ModuleTest.php
index 8bcd81bc83..52823fc136 100644
--- a/tests/src/App/ModuleTest.php
+++ b/tests/src/App/ModuleTest.php
@@ -35,11 +35,11 @@ use Mockery;
 
 class ModuleTest extends DatabaseTest
 {
-	private function assertModule(array $assert, App\Module $module)
+	private function assertModule(array $assert, App\ModuleController $module)
 	{
 		self::assertEquals($assert['isBackend'], $module->isBackend());
 		self::assertEquals($assert['name'], $module->getName());
-		self::assertEquals($assert['class'], $module->getClass());
+		self::assertEquals($assert['class'], $module->getModule());
 	}
 
 	/**
@@ -47,20 +47,20 @@ class ModuleTest extends DatabaseTest
 	 */
 	public function testDefault()
 	{
-		$module = new App\Module();
+		$module = new App\ModuleController();
 
-		$defaultClass = App\Module::DEFAULT_CLASS;
+		$defaultClass = App\ModuleController::DEFAULT_CLASS;
 
 		self::assertModule([
 			'isBackend' => false,
-			'name'      => App\Module::DEFAULT,
+			'name'      => App\ModuleController::DEFAULT,
 			'class'     => new $defaultClass(),
 		], $module);
 	}
 
 	public function dataModuleName()
 	{
-		$defaultClass = App\Module::DEFAULT_CLASS;
+		$defaultClass = App\ModuleController::DEFAULT_CLASS;
 
 		return [
 			'default'                   => [
@@ -88,7 +88,7 @@ class ModuleTest extends DatabaseTest
 			'withNothing'               => [
 				'assert' => [
 					'isBackend' => false,
-					'name'      => App\Module::DEFAULT,
+					'name'      => App\ModuleController::DEFAULT,
 					'class'     => new $defaultClass(),
 				],
 				'args'   => new App\Arguments(),
@@ -96,7 +96,7 @@ class ModuleTest extends DatabaseTest
 			'withIndex'                 => [
 				'assert' => [
 					'isBackend' => false,
-					'name'      => App\Module::DEFAULT,
+					'name'      => App\ModuleController::DEFAULT,
 					'class'     => new $defaultClass(),
 				],
 				'args'   => new App\Arguments(),
@@ -104,12 +104,12 @@ class ModuleTest extends DatabaseTest
 			'withBackendMod'    => [
 				'assert' => [
 					'isBackend' => true,
-					'name'      => App\Module::BACKEND_MODULES[0],
+					'name'      => App\ModuleController::BACKEND_MODULES[0],
 					'class'     => new $defaultClass(),
 				],
-				'args'   => new App\Arguments(App\Module::BACKEND_MODULES[0] . '/data/in',
-					App\Module::BACKEND_MODULES[0] . '/data/in',
-					[App\Module::BACKEND_MODULES[0], 'data', 'in'],
+				'args'   => new App\Arguments(App\ModuleController::BACKEND_MODULES[0] . '/data/in',
+					App\ModuleController::BACKEND_MODULES[0] . '/data/in',
+					[App\ModuleController::BACKEND_MODULES[0], 'data', 'in'],
 					3),
 			],
 			'withFirefoxApp'            => [
@@ -133,7 +133,7 @@ class ModuleTest extends DatabaseTest
 	 */
 	public function testModuleName(array $assert, App\Arguments $args)
 	{
-		$module = (new App\Module())->determineModule($args);
+		$module = (new App\ModuleController())->determineName($args);
 
 		self::assertModule($assert, $module);
 	}
@@ -142,9 +142,9 @@ class ModuleTest extends DatabaseTest
 	{
 		return [
 			'default' => [
-				'assert'  => App\Module::DEFAULT_CLASS,
-				'name'    => App\Module::DEFAULT,
-				'command' => App\Module::DEFAULT,
+				'assert'  => App\ModuleController::DEFAULT_CLASS,
+				'name'    => App\ModuleController::DEFAULT,
+				'command' => App\ModuleController::DEFAULT,
 				'privAdd' => false,
 				'args'    => [],
 			],
@@ -200,9 +200,9 @@ class ModuleTest extends DatabaseTest
 
 		$dice->shouldReceive('create')->andReturn(new $assert(...$args));
 
-		$module = (new App\Module($name))->determineClass(new App\Arguments('', $command), $router, $config, $dice);
+		$module = (new App\ModuleController($name))->determineClass(new App\Arguments('', $command), $router, $config, $dice);
 
-		self::assertEquals($assert, $module->getClass()->getClassName());
+		self::assertEquals($assert, $module->getModule()->getClassName());
 	}
 
 	/**
@@ -210,9 +210,9 @@ class ModuleTest extends DatabaseTest
 	 */
 	public function testImmutable()
 	{
-		$module = new App\Module();
+		$module = new App\ModuleController();
 
-		$moduleNew = $module->determineModule(new App\Arguments());
+		$moduleNew = $module->determineName(new App\Arguments());
 
 		self::assertNotSame($moduleNew, $module);
 	}

From 90cde9898bfdcf206a3d4acc342cd8aa5bac3c5a Mon Sep 17 00:00:00 2001
From: Philipp <admin+Github@philipp.info>
Date: Tue, 16 Nov 2021 22:37:43 +0100
Subject: [PATCH 12/17] Update src/Capabilities/ICanHandleRequests.php

Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
---
 src/Capabilities/ICanHandleRequests.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Capabilities/ICanHandleRequests.php b/src/Capabilities/ICanHandleRequests.php
index ce258c7dd3..1d02be4397 100644
--- a/src/Capabilities/ICanHandleRequests.php
+++ b/src/Capabilities/ICanHandleRequests.php
@@ -10,7 +10,7 @@ interface ICanHandleRequests
 	/**
 	 * Initialization method common to both content() and post()
 	 *
-	 * Extend this method if you need to do any shared processing before both
+	 * Extend this method if you need to do any shared processing before either
 	 * content() or post()
 	 */
 	public function init();

From 766b3f0d01ac48fdb8d696277bfc6244333b9f8b Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Tue, 16 Nov 2021 22:39:23 +0100
Subject: [PATCH 13/17] Fixups

---
 src/LegacyModule.php    | 2 +-
 src/Module/Acctlink.php | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/LegacyModule.php b/src/LegacyModule.php
index 38c3e9a8fb..53f7676604 100644
--- a/src/LegacyModule.php
+++ b/src/LegacyModule.php
@@ -91,7 +91,7 @@ class LegacyModule extends BaseModule
 			$a = DI::app();
 			return $function_name($a);
 		} else {
-			return parent::{$function_suffix}($this->parameters);
+			return parent::{$function_suffix}();
 		}
 	}
 }
diff --git a/src/Module/Acctlink.php b/src/Module/Acctlink.php
index b14bbf8d70..4093e3cd8e 100644
--- a/src/Module/Acctlink.php
+++ b/src/Module/Acctlink.php
@@ -24,13 +24,14 @@ namespace Friendica\Module;
 use Friendica\BaseModule;
 use Friendica\Core\System;
 use Friendica\Model\Contact;
+use Friendica\Network\HTTPException\NotFoundException;
 
 /**
  * Redirects to another URL based on the parameter 'addr'
  */
 class Acctlink extends BaseModule
 {
-	public function content(): string
+	public function rawContent()
 	{
 		$addr = trim($_GET['addr'] ?? '');
 
@@ -42,6 +43,6 @@ class Acctlink extends BaseModule
 			}
 		}
 
-		return '';
+		throw new NotFoundException('Parameter "url" is missing');
 	}
 }

From 61a507000f58d730e5cd20709aa8f23f4d5583c2 Mon Sep 17 00:00:00 2001
From: Philipp <admin+Github@philipp.info>
Date: Wed, 17 Nov 2021 06:57:37 +0100
Subject: [PATCH 14/17] Update src/App/ModuleController.php

Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
---
 src/App/ModuleController.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/App/ModuleController.php b/src/App/ModuleController.php
index 013859de9d..a2c43ba5a8 100644
--- a/src/App/ModuleController.php
+++ b/src/App/ModuleController.php
@@ -152,7 +152,6 @@ class ModuleController
 		}
 
 		$isBackend = in_array($module, ModuleController::BACKEND_MODULES);
-		;
 
 		return new ModuleController($module, null, $isBackend, $this->printNotAllowedAddon);
 	}

From 804408e4bb91e9c7e32f7186534836dd57a5143e Mon Sep 17 00:00:00 2001
From: Philipp <admin+Github@philipp.info>
Date: Wed, 17 Nov 2021 06:57:48 +0100
Subject: [PATCH 15/17] Update src/App/ModuleController.php

Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
---
 src/App/ModuleController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App/ModuleController.php b/src/App/ModuleController.php
index a2c43ba5a8..6e3a106b5b 100644
--- a/src/App/ModuleController.php
+++ b/src/App/ModuleController.php
@@ -81,7 +81,7 @@ class ModuleController
 	private $moduleName;
 
 	/**
-	 * @var ICanHandleRequests The module class
+	 * @var ICanHandleRequests The module object
 	 */
 	private $module;
 

From d63877592767d190de1c283699ad69578825a651 Mon Sep 17 00:00:00 2001
From: Philipp <admin+Github@philipp.info>
Date: Wed, 17 Nov 2021 06:58:28 +0100
Subject: [PATCH 16/17] Update tests/src/App/ModuleTest.php

Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
---
 tests/src/App/ModuleTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/src/App/ModuleTest.php b/tests/src/App/ModuleTest.php
index 52823fc136..13ef16a6d4 100644
--- a/tests/src/App/ModuleTest.php
+++ b/tests/src/App/ModuleTest.php
@@ -33,7 +33,7 @@ use Friendica\Module\WellKnown\HostMeta;
 use Friendica\Test\DatabaseTest;
 use Mockery;
 
-class ModuleTest extends DatabaseTest
+class ModuleControllerTest extends DatabaseTest
 {
 	private function assertModule(array $assert, App\ModuleController $module)
 	{

From e73eda01565db47486ec5f95f4b96496a9c5f81f Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Wed, 17 Nov 2021 08:16:33 +0100
Subject: [PATCH 17/17] Add feedback

---
 src/Module/Acctlink.php                          | 16 ++++++++--------
 .../{ModuleTest.php => ModuleControllerTest.php} |  0
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename tests/src/App/{ModuleTest.php => ModuleControllerTest.php} (100%)

diff --git a/src/Module/Acctlink.php b/src/Module/Acctlink.php
index 4093e3cd8e..81b2c2391c 100644
--- a/src/Module/Acctlink.php
+++ b/src/Module/Acctlink.php
@@ -34,15 +34,15 @@ class Acctlink extends BaseModule
 	public function rawContent()
 	{
 		$addr = trim($_GET['addr'] ?? '');
-
-		if ($addr) {
-			$url = Contact::getByURL($addr)['url'] ?? '';
-			if ($url) {
-				System::externalRedirect($url['url']);
-				exit();
-			}
+		if (!$addr) {
+			throw new NotFoundException('Parameter "addr" is missing or empty');
 		}
 
-		throw new NotFoundException('Parameter "url" is missing');
+		$contact = Contact::getByURL($addr, null, ['url']) ?? '';
+		if (!$contact) {
+			throw new NotFoundException('Contact not found');
+		}
+
+		System::externalRedirect($contact['url']);
 	}
 }
diff --git a/tests/src/App/ModuleTest.php b/tests/src/App/ModuleControllerTest.php
similarity index 100%
rename from tests/src/App/ModuleTest.php
rename to tests/src/App/ModuleControllerTest.php