diff options
| author | bbielsa <bgb7@njit.edu> | 2021-11-03 00:45:03 -0400 |
|---|---|---|
| committer | Samantaz Fox <coding@samantaz.fr> | 2022-01-08 18:07:06 +0100 |
| commit | 9607fe03af8dc02a53ffd05df6f815e675bfadae (patch) | |
| tree | 2cc65b727471de85030fee714584b57f64ebea3c | |
| parent | 62057e676a4f4359b9e977b9a5aa055c61e16c8e (diff) | |
| download | invidious-9607fe03af8dc02a53ffd05df6f815e675bfadae.tar.gz invidious-9607fe03af8dc02a53ffd05df6f815e675bfadae.tar.bz2 invidious-9607fe03af8dc02a53ffd05df6f815e675bfadae.zip | |
Detect the type of subscription import format based on the content type of the file uploaded
| -rw-r--r-- | src/invidious.cr | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/invidious.cr b/src/invidious.cr index 3a358c20..bdecff1d 100644 --- a/src/invidious.cr +++ b/src/invidious.cr @@ -746,6 +746,8 @@ post "/data_control" do |env| HTTP::FormData.parse(env.request) do |part| body = part.body.gets_to_end + type = part.headers["Content-Type"] + next if body.empty? # TODO: Unify into single import based on content-type @@ -816,12 +818,12 @@ post "/data_control" do |env| end end when "import_youtube" - if body[0..4] == "<opml" + if type == "application/xml" 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 - elsif body[0] == '[' + elsif type == "application/json" subscriptions = JSON.parse(body) user.subscriptions += subscriptions.as_a.compact_map do |entry| entry["snippet"]["resourceId"]["channelId"].as_s |