tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Show network elements in the channel widget

Browse source
This commit is contained in:
Michael 2023-09-19 10:20:15 +00:00
parent 00eb6b01ff
commit 5056c95d60
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Content/Conversation/Factory/Timeline.php
View file

@ -134,6 +134,11 @@ final class Timeline extends \Friendica\BaseFactory implements ICanCreateFromTab
return new Timelines($tabs); return new Timelines($tabs);
} }
public function isNetwork(string $selectedTab): bool
{
return in_array($selectedTab, [TimelineEntity::COMMENTED, TimelineEntity::RECEIVED, TimelineEntity::CREATED, TimelineEntity::MENTION, TimelineEntity::STAR]);
}
public function isCommunity(string $selectedTab): bool public function isCommunity(string $selectedTab): bool
{ {
return in_array($selectedTab, [TimelineEntity::LOCAL, TimelineEntity::GLOBAL]); return in_array($selectedTab, [TimelineEntity::LOCAL, TimelineEntity::GLOBAL]);

4
src/Content/Widget.php
View file

@ -560,6 +560,10 @@ class Widget
{ {
$channels = []; $channels = [];
foreach (DI::TimelineFactory()->getNetworkFeeds('') as $channel) {
$channels[] = ['ref' => $channel->code, 'name' => $channel->label];
}
foreach (DI::TimelineFactory()->getChannelsForUser($uid) as $channel) { foreach (DI::TimelineFactory()->getChannelsForUser($uid) as $channel) {
$channels[] = ['ref' => $channel->code, 'name' => $channel->label]; $channels[] = ['ref' => $channel->code, 'name' => $channel->label];
} }

2
src/Module/Conversation/Network.php
View file

@ -313,7 +313,7 @@ class Network extends Timeline
if (!$this->selectedTab) { if (!$this->selectedTab) {
$this->selectedTab = self::getTimelineOrderBySession($this->session, $this->pConfig); $this->selectedTab = self::getTimelineOrderBySession($this->session, $this->pConfig);
} elseif (!$this->timeline->isChannel($this->selectedTab, $this->session->getLocalUserId()) && !$this->timeline->isCommunity($this->selectedTab)) { } elseif (!$this->timeline->isNetwork($this->selectedTab) && !$this->timeline->isChannel($this->selectedTab, $this->session->getLocalUserId()) && !$this->timeline->isCommunity($this->selectedTab)) {
throw new HTTPException\BadRequestException($this->l10n->t('Network feed not available.')); throw new HTTPException\BadRequestException($this->l10n->t('Network feed not available.'));
} }