From 0d23f25a8ced84083cc54b3bf0393d54dafa7ec9 Mon Sep 17 00:00:00 2001 From: Omar Roth Date: Sat, 28 Jul 2018 22:31:02 -0500 Subject: [PATCH] Add option to redirect homepage to subscription feed --- src/invidious.cr | 35 ++++++++++++++++++++--------- src/invidious/helpers.cr | 5 +++++ src/invidious/views/preferences.ecr | 5 +++++ 3 files changed, 34 insertions(+), 11 deletions(-) diff --git a/src/invidious.cr b/src/invidious.cr index e7928e1b..137ce72a 100644 --- a/src/invidious.cr +++ b/src/invidious.cr @@ -258,6 +258,14 @@ before_all do |env| end get "/" do |env| + user = env.get? "user" + if user + user = user.as(User) + if user.preferences.redirect_feed + env.redirect "/feed/subscriptions" + end + end + templated "index" end @@ -1689,6 +1697,10 @@ post "/preferences" do |env| comments = env.params.body["comments"]? comments ||= "youtube" + redirect_feed = env.params.body["redirect_feed"]?.try &.as(String) + redirect_feed ||= "off" + redirect_feed = redirect_feed == "on" + dark_mode = env.params.body["dark_mode"]?.try &.as(String) dark_mode ||= "off" dark_mode = dark_mode == "on" @@ -1708,17 +1720,18 @@ post "/preferences" do |env| latest_only = latest_only == "on" preferences = { - "video_loop" => video_loop, - "autoplay" => autoplay, - "speed" => speed, - "quality" => quality, - "volume" => volume, - "comments" => comments, - "dark_mode" => dark_mode, - "thin_mode" => thin_mode, - "max_results" => max_results, - "sort" => sort, - "latest_only" => latest_only, + "video_loop" => video_loop, + "autoplay" => autoplay, + "speed" => speed, + "quality" => quality, + "volume" => volume, + "comments" => comments, + "redirect_feed" => redirect_feed, + "dark_mode" => dark_mode, + "thin_mode" => thin_mode, + "max_results" => max_results, + "sort" => sort, + "latest_only" => latest_only, }.to_json PG_DB.exec("UPDATE users SET preferences = $1 WHERE email = $2", preferences, user.email) diff --git a/src/invidious/helpers.cr b/src/invidious/helpers.cr index a091d1e2..370e1efd 100644 --- a/src/invidious/helpers.cr +++ b/src/invidious/helpers.cr @@ -163,6 +163,11 @@ class Preferences nilable: true, default: "youtube", }, + redirect_feed: { + type: Bool, + nilable: true, + default: false, + }, dark_mode: Bool, thin_mode: { type: Bool, diff --git a/src/invidious/views/preferences.ecr b/src/invidious/views/preferences.ecr index 9fd42d03..7f675bcc 100644 --- a/src/invidious/views/preferences.ecr +++ b/src/invidious/views/preferences.ecr @@ -68,6 +68,11 @@ function update_value(element) { Subscription preferences +
+ + checked<% end %>> +
+