From 6e2ab6c3af5f6f0d7c4b24afd7988082b38c6127 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 8 Jul 2023 21:01:48 -0400
Subject: [PATCH 1/4] Centralize Vary header declaration in
 ActivityPub::isRequest

- Vary header should be set every time we vary the display based on an HTTP header value
---
 src/App.php                        | 3 +++
 src/Module/ActivityPub/Objects.php | 2 --
 src/Module/Friendica.php           | 2 --
 src/Module/Item/Display.php        | 2 --
 src/Module/Profile/Profile.php     | 2 --
 src/Module/Xrd.php                 | 2 ++
 src/Protocol/ActivityPub.php       | 2 ++
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/App.php b/src/App.php
index 8d253ec76..a48e21571 100644
--- a/src/App.php
+++ b/src/App.php
@@ -695,6 +695,9 @@ class App
 				$module = $router->getModule();
 			}
 
+			// Display can change depending on the requested language, so it shouldn't be cached whole
+			header('Vary: Accept-Language', false);
+
 			// Processes data from GET requests
 			$httpinput = $httpInput->process();
 			$input     = array_merge($httpinput['variables'], $httpinput['files'], $request ?? $_REQUEST);
diff --git a/src/Module/ActivityPub/Objects.php b/src/Module/ActivityPub/Objects.php
index f93c8b957..34d460951 100644
--- a/src/Module/ActivityPub/Objects.php
+++ b/src/Module/ActivityPub/Objects.php
@@ -46,8 +46,6 @@ class Objects extends BaseModule
 			throw new HTTPException\BadRequestException();
 		}
 
-		header('Vary: Accept', false);
-
 		if (!ActivityPub::isRequest()) {
 			DI::baseUrl()->redirect(str_replace('objects/', 'display/', DI::args()->getQueryString()));
 		}
diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php
index 73d5f633c..90869878e 100644
--- a/src/Module/Friendica.php
+++ b/src/Module/Friendica.php
@@ -115,8 +115,6 @@ class Friendica extends BaseModule
 
 	protected function rawContent(array $request = [])
 	{
-		header('Vary: Accept', false);
-
 		// @TODO: Replace with parameter from router
 		if (DI::args()->getArgc() <= 1 || (DI::args()->getArgv()[1] !== 'json')) {
 			if (!ActivityPub::isRequest()) {
diff --git a/src/Module/Item/Display.php b/src/Module/Item/Display.php
index a0d1ecbf5..b2ed43c5b 100644
--- a/src/Module/Item/Display.php
+++ b/src/Module/Item/Display.php
@@ -88,8 +88,6 @@ class Display extends BaseModule
 
 	protected function content(array $request = []): string
 	{
-		header('Vary: Accept', false);
-
 		if (ActivityPub::isRequest()) {
 			$this->baseUrl->redirect(str_replace('display/', 'objects/', $this->args->getQueryString()));
 		}
diff --git a/src/Module/Profile/Profile.php b/src/Module/Profile/Profile.php
index 31ef8d05b..5e5028cb8 100644
--- a/src/Module/Profile/Profile.php
+++ b/src/Module/Profile/Profile.php
@@ -80,8 +80,6 @@ class Profile extends BaseProfile
 
 	protected function rawContent(array $request = [])
 	{
-		header('Vary: Accept', false);
-
 		if (ActivityPub::isRequest()) {
 			$user = $this->database->selectFirst('user', ['uid'], ['nickname' => $this->parameters['nickname'] ?? '', 'account_removed' => false]);
 			if ($user) {
diff --git a/src/Module/Xrd.php b/src/Module/Xrd.php
index 3267e9e9a..af40bc3b0 100644
--- a/src/Module/Xrd.php
+++ b/src/Module/Xrd.php
@@ -38,6 +38,8 @@ class Xrd extends BaseModule
 {
 	protected function rawContent(array $request = [])
 	{
+		header('Vary: Accept', false);
+
 		// @TODO: Replace with parameter from router
 		if (DI::args()->getArgv()[0] == 'xrd') {
 			if (empty($_GET['uri'])) {
diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index eaf34669b..ad1e9367c 100644
--- a/src/Protocol/ActivityPub.php
+++ b/src/Protocol/ActivityPub.php
@@ -87,6 +87,8 @@ class ActivityPub
 	 */
 	public static function isRequest(): bool
 	{
+		header('Vary: Accept', false);
+
 		$isrequest = stristr($_SERVER['HTTP_ACCEPT'] ?? '', 'application/activity+json') ||
 			stristr($_SERVER['HTTP_ACCEPT'] ?? '', 'application/json') ||
 			stristr($_SERVER['HTTP_ACCEPT'] ?? '', 'application/ld+json');

From 31a3c7cf50fc03092353efdc8fbcb7e7a88e9be0 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 8 Jul 2023 21:09:29 -0400
Subject: [PATCH 2/4] [frio] Add link to About page in user menu

---
 view/theme/frio/templates/nav.tpl | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/view/theme/frio/templates/nav.tpl b/view/theme/frio/templates/nav.tpl
index 88a8e4bf6..77077fdd9 100644
--- a/view/theme/frio/templates/nav.tpl
+++ b/view/theme/frio/templates/nav.tpl
@@ -274,8 +274,14 @@
 											</a>
 										</li>
 									{{/if}}
+									<li role="presentation" class="divider"></li>
+									<li role="presentation">
+										<a role="menuitem" id="nav-about-link" class="nav-link {{$nav.about.2}}"
+											href="{{$nav.about.0}}" title="{{$nav.about.3}}">
+											<i class="fa fa-info" aria-hidden="true"></i> {{$nav.about.1}}
+										</a>
+									</li>
 									{{if $nav.tos}}
-										<li role="presentation" class="divider"></li>
 										<li role="presentation">
 											<a role="menuitem" id="nav-tos-link" class="nav-link {{$nav.tos.2}}"
 												href="{{$nav.tos.0}}" title="{{$nav.tos.3}}"><i class="fa fa-file-text"
@@ -401,6 +407,14 @@
 									</a>
 								</li>
 							{{/if}}
+							<li role="presentation" class="divider"></li>
+							<li role="presentation" class="list-group-item">
+								<a role="menuitem" class="nav-link {{$nav.about.2}}"
+								   href="{{$nav.about.0}}" title="{{$nav.about.3}}">
+									<i class="fa fa-info" aria-hidden="true"></i> {{$nav.about.1}}
+								</a>
+							</li>
+							<li role="presentation" class="divider"></li>
 							{{if $nav.logout}}
 								<li role="presentation" class="list-group-item">
 									<a role="menuitem"
@@ -494,4 +508,4 @@ The result is a friendica logo in the user icon color.*}}
 			</path>
 		</mask>
 	</defs>
-</svg>
\ No newline at end of file
+</svg>

From f20caf4c3a33025c7cfe799482697386bd9d4b8f Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 8 Jul 2023 21:16:29 -0400
Subject: [PATCH 3/4] Refactor DI out from Module\Friendica

---
 src/Module/Friendica.php | 83 +++++++++++++++++++++++-----------------
 static/routes.config.php |  2 +-
 2 files changed, 48 insertions(+), 37 deletions(-)

diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php
index 90869878e..302989309 100644
--- a/src/Module/Friendica.php
+++ b/src/Module/Friendica.php
@@ -24,26 +24,40 @@ namespace Friendica\Module;
 use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Core\Addon;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\Hook;
+use Friendica\Core\KeyValueStorage\Capabilities\IManageKeyValuePairs;
+use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\PostUpdate;
-use Friendica\DI;
 use Friendica\Model\User;
 use Friendica\Network\HTTPException;
 use Friendica\Protocol\ActivityPub;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
 
 /**
  * Prints information about the current node
- * Either in human readable form or in JSON
+ * Either in human-readable form or in JSON
  */
 class Friendica extends BaseModule
 {
+	/** @var IManageConfigValues */
+	private $config;
+	/** @var IManageKeyValuePairs */
+	private $keyValue;
+
+	public function __construct(IManageKeyValuePairs $keyValue, IManageConfigValues $config, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+	{
+		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
+		$this->config = $config;
+		$this->keyValue = $keyValue;
+	}
+
 	protected function content(array $request = []): string
 	{
-		$config = DI::config();
-		$keyValue = DI::keyValue();
-
 		$visibleAddonList = Addon::getVisibleList();
 		if (!empty($visibleAddonList)) {
 
@@ -61,29 +75,29 @@ class Friendica extends BaseModule
 				}
 			}
 			$addon = [
-				'title' => DI::l10n()->t('Installed addons/apps:'),
+				'title' => $this->t('Installed addons/apps:'),
 				'list'  => $sortedAddonList,
 			];
 		} else {
 			$addon = [
-				'title' => DI::l10n()->t('No installed addons/apps'),
+				'title' => $this->t('No installed addons/apps'),
 			];
 		}
 
-		$tos = ($config->get('system', 'tosdisplay')) ?
-			DI::l10n()->t('Read about the <a href="%1$s/tos">Terms of Service</a> of this node.', DI::baseUrl()) :
+		$tos = ($this->config->get('system', 'tosdisplay')) ?
+			$this->t('Read about the <a href="%1$s/tos">Terms of Service</a> of this node.', $this->baseUrl) :
 			'';
 
-		$blockList = $config->get('system', 'blocklist');
+		$blockList = $this->config->get('system', 'blocklist') ?? [];
 
 		if (!empty($blockList)) {
 			$blocked = [
-				'title'    => DI::l10n()->t('On this server the following remote servers are blocked.'),
+				'title'    => $this->t('On this server the following remote servers are blocked.'),
 				'header'   => [
-					DI::l10n()->t('Blocked domain'),
-					DI::l10n()->t('Reason for the block'),
+					$this->t('Blocked domain'),
+					$this->t('Reason for the block'),
 				],
-				'download' => DI::l10n()->t('Download this list in CSV format'),
+				'download' => $this->t('Download this list in CSV format'),
 				'list'     => $blockList,
 			];
 		} else {
@@ -97,14 +111,14 @@ class Friendica extends BaseModule
 		$tpl = Renderer::getMarkupTemplate('friendica.tpl');
 
 		return Renderer::replaceMacros($tpl, [
-			'about'     => DI::l10n()->t('This is Friendica, version %s that is running at the web location %s. The database version is %s, the post update version is %s.',
+			'about'     => $this->t('This is Friendica, version %s that is running at the web location %s. The database version is %s, the post update version is %s.',
 				'<strong>' . App::VERSION . '</strong>',
-				DI::baseUrl(),
-				'<strong>' . $config->get('system', 'build') . '/' . DB_UPDATE_VERSION . '</strong>',
-				'<strong>' . $keyValue->get('post_update_version') . '/' . PostUpdate::VERSION . '</strong>'),
-			'friendica' => DI::l10n()->t('Please visit <a href="https://friendi.ca">Friendi.ca</a> to learn more about the Friendica project.'),
-			'bugs'      => DI::l10n()->t('Bug reports and issues: please visit') . ' ' . '<a href="https://github.com/friendica/friendica/issues?state=open">' . DI::l10n()->t('the bugtracker at github') . '</a>',
-			'info'      => DI::l10n()->t('Suggestions, praise, etc. - please email "info" at "friendi - dot - ca'),
+				$this->baseUrl,
+				'<strong>' . $this->config->get('system', 'build') . '/' . DB_UPDATE_VERSION . '</strong>',
+				'<strong>' . $this->keyValue->get('post_update_version') . '/' . PostUpdate::VERSION . '</strong>'),
+			'friendica' => $this->t('Please visit <a href="https://friendi.ca">Friendi.ca</a> to learn more about the Friendica project.'),
+			'bugs'      => $this->t('Bug reports and issues: please visit') . ' ' . '<a href="https://github.com/friendica/friendica/issues?state=open">' . $this->t('the bugtracker at github') . '</a>',
+			'info'      => $this->t('Suggestions, praise, etc. - please email "info" at "friendi - dot - ca'),
 
 			'visible_addons' => $addon,
 			'tos'            => $tos,
@@ -115,8 +129,7 @@ class Friendica extends BaseModule
 
 	protected function rawContent(array $request = [])
 	{
-		// @TODO: Replace with parameter from router
-		if (DI::args()->getArgc() <= 1 || (DI::args()->getArgv()[1] !== 'json')) {
+		if (empty($this->parameters['format']) || $this->parameters['format'] !== 'json') {
 			if (!ActivityPub::isRequest()) {
 				return;
 			}
@@ -131,16 +144,14 @@ class Friendica extends BaseModule
 			}
 		}
 
-		$config = DI::config();
-
 		$register_policies = [
 			Register::CLOSED  => 'REGISTER_CLOSED',
 			Register::APPROVE => 'REGISTER_APPROVE',
 			Register::OPEN    => 'REGISTER_OPEN'
 		];
 
-		$register_policy_int = intval($config->get('config', 'register_policy'));
-		if ($register_policy_int !== Register::CLOSED && $config->get('config', 'invitation_only')) {
+		$register_policy_int = intval($this->config->get('config', 'register_policy'));
+		if ($register_policy_int !== Register::CLOSED && $this->config->get('config', 'invitation_only')) {
 			$register_policy = 'REGISTER_INVITATION';
 		} else {
 			$register_policy = $register_policies[$register_policy_int];
@@ -151,15 +162,15 @@ class Friendica extends BaseModule
 		if (!empty($administrator)) {
 			$admin = [
 				'name'    => $administrator['username'],
-				'profile' => DI::baseUrl() . '/profile/' . $administrator['nickname'],
+				'profile' => $this->baseUrl . '/profile/' . $administrator['nickname'],
 			];
 		}
 
 		$visible_addons = Addon::getVisibleList();
 
-		$config->reload();
+		$this->config->reload();
 		$locked_features = [];
-		$featureLocks = $config->get('config', 'feature_lock');
+		$featureLocks = $this->config->get('config', 'feature_lock');
 		if (isset($featureLocks)) {
 			foreach ($featureLocks as $feature => $lock) {
 				if ($feature === 'config_loaded') {
@@ -172,17 +183,17 @@ class Friendica extends BaseModule
 
 		$data = [
 			'version'          => App::VERSION,
-			'url'              => (string)DI::baseUrl(),
+			'url'              => (string)$this->baseUrl,
 			'addons'           => $visible_addons,
 			'locked_features'  => $locked_features,
-			'explicit_content' => intval($config->get('system', 'explicit_content', 0)),
-			'language'         => $config->get('system', 'language'),
+			'explicit_content' => intval($this->config->get('system', 'explicit_content', 0)),
+			'language'         => $this->config->get('system', 'language'),
 			'register_policy'  => $register_policy,
 			'admin'            => $admin,
-			'site_name'        => $config->get('config', 'sitename'),
+			'site_name'        => $this->config->get('config', 'sitename'),
 			'platform'         => strtolower(App::PLATFORM),
-			'info'             => $config->get('config', 'info'),
-			'no_scrape_url'    => DI::baseUrl() . '/noscrape',
+			'info'             => $this->config->get('config', 'info'),
+			'no_scrape_url'    => $this->baseUrl . '/noscrape',
 		];
 
 		System::jsonExit($data);
diff --git a/static/routes.config.php b/static/routes.config.php
index 7409c408d..157f141b1 100644
--- a/static/routes.config.php
+++ b/static/routes.config.php
@@ -449,7 +449,7 @@ return [
 	'/follow_confirm'       => [Module\FollowConfirm::class,         [R::GET, R::POST]],
 	'/followers/{nickname}' => [Module\ActivityPub\Followers::class, [R::GET]],
 	'/following/{nickname}' => [Module\ActivityPub\Following::class, [R::GET]],
-	'/friendica[/json]'     => [Module\Friendica::class,             [R::GET]],
+	'/friendica[/{format:json}]' => [Module\Friendica::class,        [R::GET]],
 	'/friendica/inbox'      => [Module\ActivityPub\Inbox::class,     [R::GET, R::POST]],
 
 	'/fsuggest/{contact:\d+}' => [Module\FriendSuggest::class,  [R::GET, R::POST]],

From 9f943650a934963625a9fba1418e2669ac2989fa Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 8 Jul 2023 21:18:27 -0400
Subject: [PATCH 4/4] Hide blocklist from anonymous users on closed
 registration nodes

---
 src/Module/Friendica.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php
index 302989309..c6e2768bd 100644
--- a/src/Module/Friendica.php
+++ b/src/Module/Friendica.php
@@ -29,6 +29,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\KeyValueStorage\Capabilities\IManageKeyValuePairs;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Core\System;
 use Friendica\Database\PostUpdate;
 use Friendica\Model\User;
@@ -47,13 +48,16 @@ class Friendica extends BaseModule
 	private $config;
 	/** @var IManageKeyValuePairs */
 	private $keyValue;
+	/** @var IHandleUserSessions */
+	private $session;
 
-	public function __construct(IManageKeyValuePairs $keyValue, IManageConfigValues $config, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+	public function __construct(IHandleUserSessions $session, IManageKeyValuePairs $keyValue, IManageConfigValues $config, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
 	{
 		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
 		$this->config = $config;
 		$this->keyValue = $keyValue;
+		$this->session = $session;
 	}
 
 	protected function content(array $request = []): string
@@ -90,7 +94,8 @@ class Friendica extends BaseModule
 
 		$blockList = $this->config->get('system', 'blocklist') ?? [];
 
-		if (!empty($blockList)) {
+		$register_policy_int = $this->config->get('config', 'register_policy');
+		if (!empty($blockList) && ($register_policy_int !== Register::CLOSED || $this->session->isAuthenticated())) {
 			$blocked = [
 				'title'    => $this->t('On this server the following remote servers are blocked.'),
 				'header'   => [
@@ -150,7 +155,7 @@ class Friendica extends BaseModule
 			Register::OPEN    => 'REGISTER_OPEN'
 		];
 
-		$register_policy_int = intval($this->config->get('config', 'register_policy'));
+		$register_policy_int = $this->config->get('config', 'register_policy');
 		if ($register_policy_int !== Register::CLOSED && $this->config->get('config', 'invitation_only')) {
 			$register_policy = 'REGISTER_INVITATION';
 		} else {