Show network elements in the channel widget

diff --git a/src/Content/Conversation/Factory/Timeline.php b/src/Content/Conversation/Factory/Timeline.php
index 0e4c0b76d6a7761a0171140fdecf737bd204bbad..2a6e12330f8a4c0e1c30d5903eedf1e81dcb2e01 100644 (file)
--- a/src/Content/Conversation/Factory/Timeline.php
+++ b/src/Content/Conversation/Factory/Timeline.php
@@ -134,6 +134,11 @@ final class Timeline extends \Friendica\BaseFactory implements ICanCreateFromTab
                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
        {
                return in_array($selectedTab, [TimelineEntity::LOCAL, TimelineEntity::GLOBAL]);

diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index 1f73f0449591d1fc8746e4b662dfcf2e1965a705..486bada7d5c87efe0155fc41646ee823f72210c0 100644 (file)
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -560,6 +560,10 @@ class Widget
        {
                $channels = [];
 
+               foreach (DI::TimelineFactory()->getNetworkFeeds('') as $channel) {
+                       $channels[] = ['ref' => $channel->code, 'name' => $channel->label];
+               }
+
                foreach (DI::TimelineFactory()->getChannelsForUser($uid) as $channel) {
                        $channels[] = ['ref' => $channel->code, 'name' => $channel->label];
                }

diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php
index 095b2ccebe72dacec6c4d2476f69aa3604763c31..c05a06d393cd4eb948c2377f2d9d25a637d86d57 100644 (file)
--- a/src/Module/Conversation/Network.php
+++ b/src/Module/Conversation/Network.php
@@ -313,7 +313,7 @@ class Network extends Timeline
 
                if (!$this->selectedTab) {
                        $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.'));
                }