mirror of
https://github.com/friendica/friendica
synced 2024-12-22 23:20:16 +00:00
Merge pull request #13291 from Quix0r/features/config-blocklist-published
Configuration key added to publish/hide blocklist
This commit is contained in:
commit
9c23a4511d
2 changed files with 6 additions and 2 deletions
|
@ -94,8 +94,7 @@ class Friendica extends BaseModule
|
|||
|
||||
$blockList = $this->config->get('system', 'blocklist') ?? [];
|
||||
|
||||
$register_policy_int = $this->config->get('config', 'register_policy');
|
||||
if (!empty($blockList) && ($register_policy_int !== Register::CLOSED || $this->session->isAuthenticated())) {
|
||||
if (!empty($blockList) && ($this->config->get('blocklist', 'public') || $this->session->isAuthenticated())) {
|
||||
$blocked = [
|
||||
'title' => $this->t('On this server the following remote servers are blocked.'),
|
||||
'header' => [
|
||||
|
|
|
@ -786,4 +786,9 @@ return [
|
|||
// Banner for Mastodon API
|
||||
'mastodon_banner' => '/images/friendica-banner.jpg',
|
||||
],
|
||||
'blocklist' => [
|
||||
// public (Boolean)
|
||||
// Wether the blocklist is publicly listed under /about (or in any later API)
|
||||
'public' => true,
|
||||
],
|
||||
];
|
||||
|
|
Loading…
Reference in a new issue