diff options
| author | simonphoenix96 <diazjustin1995@yahoo.de> | 2021-02-27 18:58:55 +0100 |
|---|---|---|
| committer | simonphoenix96 <diazjustin1995@yahoo.de> | 2021-02-27 18:58:55 +0100 |
| commit | a2f79a163f899022ff4106b0c045c951d84d4244 (patch) | |
| tree | 2d03721f191ca85dd8a354027d7fe87e65fb03a9 | |
| parent | 489d0151ad0e72b875729b4a7839cc0df2692571 (diff) | |
| download | invidious-a2f79a163f899022ff4106b0c045c951d84d4244.tar.gz invidious-a2f79a163f899022ff4106b0c045c951d84d4244.tar.bz2 invidious-a2f79a163f899022ff4106b0c045c951d84d4244.zip | |
integrate legacy yt xml subscription import with new json sub import
| -rw-r--r-- | src/invidious.cr | 14 |
1 files 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] == "<opml" + subscriptions = XML.parse(body) + 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 + subscriptions = JSON.parse(body) + user.subscriptions += subscriptions.as_a.compact_map do |entry| + entry["snippet"]["resourceId"]["channelId"].as_s + end end user.subscriptions.uniq! |