friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #14097 from annando/enable-user-defined-channel 

Enable user defined channels upon adding/editing
This commit is contained in:
Hypolite Petovan 2024-04-15 19:16:02 -04:00 committed by GitHub
parent ac195c7061 652802f758
commit bae1f63424
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Module/Settings/Channels.php
View File

@ -26,6 +26,7 @@ use Friendica\Content\Conversation\Factory;
use Friendica\Content\Conversation\Repository\UserDefinedChannel;
use Friendica\Core\Config\Capability\IManageConfigValues;
use Friendica\Core\L10n;
use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
use Friendica\Core\Renderer;
use Friendica\Core\Session\Capability\IHandleUserSessions;
use Friendica\Model\Circle;
@ -41,18 +42,21 @@ class Channels extends BaseSettings
{
/** @var UserDefinedChannel */
private $channel;
/** @var IManagePersonalConfigValues */
private $pConfig;
/** @var Factory\UserDefinedChannel */
private $userDefinedChannel;
/** @var IManageConfigValues */
private $config;
public function __construct(Factory\UserDefinedChannel $userDefinedChannel, UserDefinedChannel $channel, App\Page $page, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IManageConfigValues $config, array $server, array $parameters = [])
public function __construct(Factory\UserDefinedChannel $userDefinedChannel, UserDefinedChannel $channel, App\Page $page, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, array $server, array $parameters = [])
{
parent::__construct($session, $page, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
$this->userDefinedChannel = $userDefinedChannel;
$this->channel = $channel;
$this->config = $config;
$this->pConfig = $pConfig;
}
protected function post(array $request = [])
@ -91,6 +95,7 @@ class Channels extends BaseSettings
]);
$saved = $this->channel->save($channel);
$this->logger->debug('New channel added', ['saved' => $saved]);
$this->enableTimeline($uid, $saved->code);
return;
}
@ -123,6 +128,7 @@ class Channels extends BaseSettings
]);
$saved = $this->channel->save($channel);
$this->logger->debug('Save channel', ['id' => $id, 'saved' => $saved]);
$this->enableTimeline($uid, $id);
}
}
@ -232,4 +238,21 @@ class Channels extends BaseSettings
'$form_security_token' => self::getFormSecurityToken('settings_channels'),
]);
}
private function enableTimeline(int $uid, int $id)
{
$bookmarked_timelines = $this->pConfig->get($uid, 'system', 'network_timelines');
$enabled_timelines = $this->pConfig->get($uid, 'system', 'enabled_timelines');
if (empty($enabled_timelines) || empty($bookmarked_timelines)) {
return;
}
if (in_array($id, $enabled_timelines) || in_array($id, $bookmarked_timelines)) {
return;
}
$enabled_timelines[] = $id;
$this->pConfig->set($uid, 'system', 'enabled_timelines', $enabled_timelines);
}
}