Continued:

[friendica.git] / src / Content / Widget.php

diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index 486bada7d5c87efe0155fc41646ee823f72210c0..b9a75e4d2d8c5c1546f246175d55ff3b59171cb5 100644 (file)
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -560,16 +560,30 @@ class Widget
        {
                $channels = [];
 
-               foreach (DI::TimelineFactory()->getNetworkFeeds('') as $channel) {
-                       $channels[] = ['ref' => $channel->code, 'name' => $channel->label];
+               $enabled = DI::pConfig()->get($uid, 'system', 'enabled_timelines', []);
+
+               foreach (DI::NetworkFactory()->getTimelines('') as $channel) {
+                       if (empty($enabled) || in_array($channel->code, $enabled)) {
+                               $channels[] = ['ref' => $channel->code, 'name' => $channel->label];
+                       }
                }
 
-               foreach (DI::TimelineFactory()->getChannelsForUser($uid) as $channel) {
-                       $channels[] = ['ref' => $channel->code, 'name' => $channel->label];
+               foreach (DI::ChannelFactory()->getTimelines($uid) as $channel) {
+                       if (empty($enabled) || in_array($channel->code, $enabled)) {
+                               $channels[] = ['ref' => $channel->code, 'name' => $channel->label];
+                       }
                }
 
-               foreach (DI::TimelineFactory()->getCommunities(true) as $community) {
-                       $channels[] = ['ref' => $community->code, 'name' => $community->label];
+               foreach (DI::userDefinedChannel()->selectByUid($uid) as $channel) {
+                       if (empty($enabled) || in_array($channel->code, $enabled)) {
+                               $channels[] = ['ref' => $channel->code, 'name' => $channel->label];
+                       }
+               }
+
+               foreach (DI::CommunityFactory()->getTimelines(true) as $community) {
+                       if (empty($enabled) || in_array($community->code, $enabled)) {
+                               $channels[] = ['ref' => $community->code, 'name' => $community->label];
+                       }
                }
 
                return self::filter(