diff --git a/config/config.example.yml b/config/config.example.yml index 64fc970c..d51223d3 100644 --- a/config/config.example.yml +++ b/config/config.example.yml @@ -314,7 +314,7 @@ https_only: false ## Enable/Disable specific pages on the main page. ## #pages_enabled: -# trending: true +# trending: false # popular: true # search: true ## diff --git a/spec/invidious/config_spec.cr b/spec/invidious/config_spec.cr index 1e9d3355..50465851 100644 --- a/spec/invidious/config_spec.cr +++ b/spec/invidious/config_spec.cr @@ -24,7 +24,7 @@ Spectator.describe Config do search: false YAML - expect(config.page_enabled?("trending")).to eq(true) + expect(config.page_enabled?("trending")).to eq(false) expect(config.page_enabled?("popular")).to eq(false) expect(config.page_enabled?("search")).to eq(false) end diff --git a/src/invidious/config.cr b/src/invidious/config.cr index 848a8a95..b274b75f 100644 --- a/src/invidious/config.cr +++ b/src/invidious/config.cr @@ -73,7 +73,7 @@ end # Structure used for global per-page feature toggles record PagesEnabled, - trending : Bool = true, + trending : Bool = false, popular : Bool = true, search : Bool = true do include YAML::Serializable diff --git a/src/invidious/views/components/feed_menu.ecr b/src/invidious/views/components/feed_menu.ecr index 3dbeaf37..b8e60e3a 100644 --- a/src/invidious/views/components/feed_menu.ecr +++ b/src/invidious/views/components/feed_menu.ecr @@ -3,6 +3,18 @@ <% if !env.get?("user") %> <% feed_menu.reject! {|item| {"Subscriptions", "Playlists"}.includes? item} %> <% end %> + <% feed_menu.reject! do |feed| + case feed + when "Popular" + !CONFIG.page_enabled?("popular") + when "Trending" + !CONFIG.page_enabled?("trending") + when "" + !CONFIG.page_enabled?("search") + else + false + end + end %> <% feed_menu.each do |feed| %> <%= translate(locale, feed) %>