From 43ff3be751920bedb394ff5cf8cd27812131c489 Mon Sep 17 00:00:00 2001 From: bbielsa Date: Wed, 27 Oct 2021 17:54:40 -0400 Subject: [PATCH] Test if body content is likely JSON, if so parse the json format of subscriptions export. If the content is anything else, assume it is CSV and parse --- src/invidious.cr | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/invidious.cr b/src/invidious.cr index fb67af87..3a358c20 100644 --- a/src/invidious.cr +++ b/src/invidious.cr @@ -821,11 +821,14 @@ post "/data_control" do |env| user.subscriptions += subscriptions.xpath_nodes(%q(//outline[@type="rss"])).map do |channel| channel["xmlUrl"].match(/UC[a-zA-Z0-9_-]{22}/).not_nil![0] end - else + elsif body[0] == '[' subscriptions = JSON.parse(body) user.subscriptions += subscriptions.as_a.compact_map do |entry| entry["snippet"]["resourceId"]["channelId"].as_s end + else + subscriptions = parse_subscription_export_csv(body) + user.subscriptions += subscriptions end user.subscriptions.uniq!