Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-25 03:10:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean channel confusion

Browse source
This commit is contained in:
Michael 2023-10-06 11:38:29 +00:00
parent 134cbacf31
commit 3f6480c127
7 changed files with 29 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/Module/Conversation/Timeline.php
View file

@ -81,19 +81,19 @@ class Timeline extends BaseModule
/** @var ICanCache */
protected $cache;
/** @var Channel */
protected $channel;
protected $channelRepository;
public function __construct(Channel $channel, Mode $mode, IHandleUserSessions $session, Database $database, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, ICanCache $cache, 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->channel = $channel;
$this->mode = $mode;
$this->session = $session;
$this->database = $database;
$this->pConfig = $pConfig;
$this->config = $config;
$this->cache = $cache;
$this->channelRepository = $channel;
$this->mode = $mode;
$this->session = $session;
$this->database = $database;
$this->pConfig = $pConfig;
$this->config = $config;
$this->cache = $cache;
}
/**
@ -368,7 +368,7 @@ class Timeline extends BaseModule
private function getUserChannelConditions(int $id, int $uid): array
{
$channel = $this->channel->selectById($id, $uid);
$channel = $this->channelRepository->selectById($id, $uid);
if (empty($channel)) {
return [];
}