From a2f79a163f899022ff4106b0c045c951d84d4244 Mon Sep 17 00:00:00 2001 From: simonphoenix96 Date: Sat, 27 Feb 2021 18:58:55 +0100 Subject: [PATCH 1/3] integrate legacy yt xml subscription import with new json sub import --- src/invidious.cr | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/invidious.cr b/src/invidious.cr index 563a3768..fb1d168e 100644 --- a/src/invidious.cr +++ b/src/invidious.cr @@ -760,10 +760,16 @@ post "/data_control" do |env| end end when "import_youtube" - subscriptions = JSON.parse(body) - - user.subscriptions += subscriptions.as_a.compact_map do |entry| - entry["snippet"]["resourceId"]["channelId"].as_s + if body[0..4] == " Date: Sat, 27 Feb 2021 19:12:01 +0100 Subject: [PATCH 2/3] fixed line indent typo --- src/invidious.cr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/invidious.cr b/src/invidious.cr index fb1d168e..a776b2c0 100644 --- a/src/invidious.cr +++ b/src/invidious.cr @@ -769,7 +769,7 @@ post "/data_control" do |env| subscriptions = JSON.parse(body) user.subscriptions += subscriptions.as_a.compact_map do |entry| entry["snippet"]["resourceId"]["channelId"].as_s - end + end end user.subscriptions.uniq! From 84487b2e520f74871afb7dfa97117cfe0282f0c9 Mon Sep 17 00:00:00 2001 From: simonphoenix96 Date: Sat, 27 Feb 2021 21:59:09 +0100 Subject: [PATCH 3/3] format invidious.cr using crystal cli --- src/invidious.cr | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/invidious.cr b/src/invidious.cr index a776b2c0..80f551e9 100644 --- a/src/invidious.cr +++ b/src/invidious.cr @@ -760,7 +760,7 @@ post "/data_control" do |env| end end when "import_youtube" - if body[0..4] == "