diff options
| author | Omar Roth <omarroth@hotmail.com> | 2018-08-01 10:44:02 -0500 |
|---|---|---|
| committer | Omar Roth <omarroth@hotmail.com> | 2018-08-01 10:44:02 -0500 |
| commit | ea8aaf314581e374ad81d9dfdbf23383976dbf23 (patch) | |
| tree | 03730a5e75fa0c84f16752608d100831b4034e8c | |
| parent | fcb4f4cddb7f4be8475d23d5ebbde95e3d2b118c (diff) | |
| download | invidious-ea8aaf314581e374ad81d9dfdbf23383976dbf23.tar.gz invidious-ea8aaf314581e374ad81d9dfdbf23383976dbf23.tar.bz2 invidious-ea8aaf314581e374ad81d9dfdbf23383976dbf23.zip | |
Add support for user name in place of :ucid
| -rw-r--r-- | src/invidious.cr | 45 | ||||
| -rw-r--r-- | src/invidious/helpers.cr | 2 |
2 files changed, 43 insertions, 4 deletions
diff --git a/src/invidious.cr b/src/invidious.cr index 4628dd86..75ba0087 100644 --- a/src/invidious.cr +++ b/src/invidious.cr @@ -1055,6 +1055,19 @@ get "/api/v1/channels/:ucid" do |env| ucid = env.params.url["ucid"] client = make_client(YT_URL) + if !ucid.match(/UC[a-zA-Z0-9_-]{22}/) + rss = client.get("/feeds/videos.xml?user=#{ucid}").body + rss = XML.parse_html(rss) + + ucid = rss.xpath_node("//feed/channelid") + if ucid + ucid = ucid.content + else + env.response.content_type = "application/json" + next {"error" => "User does not exist"}.to_json + end + end + channel = get_channel(ucid, client, PG_DB, pull_all_videos: false) # TODO: Integrate this into `get_channel` function @@ -1171,8 +1184,21 @@ get "/api/v1/channels/:ucid/videos" do |env| page = env.params.query["page"]?.try &.to_i? page ||= 1 - url = produce_videos_url(ucid, page) client = make_client(YT_URL) + if !ucid.match(/UC[a-zA-Z0-9_-]{22}/) + rss = client.get("/feeds/videos.xml?user=#{ucid}").body + rss = XML.parse_html(rss) + + ucid = rss.xpath_node("//feed/channelid") + if ucid + ucid = ucid.content + else + env.response.content_type = "application/json" + next {"error" => "User does not exist"}.to_json + end + end + + url = produce_videos_url(ucid, page) response = client.get(url) json = JSON.parse(response.body) @@ -2055,8 +2081,21 @@ end get "/feed/channel/:ucid" do |env| ucid = env.params.url["ucid"] - url = produce_videos_url(ucid) client = make_client(YT_URL) + if !ucid.match(/UC[a-zA-Z0-9_-]{22}/) + rss = client.get("/feeds/videos.xml?user=#{ucid}").body + rss = XML.parse_html(rss) + + ucid = rss.xpath_node("//feed/channelid") + if ucid + ucid = ucid.content + else + env.response.content_type = "application/json" + next {"error" => "User does not exist"}.to_json + end + end + + url = produce_videos_url(ucid) response = client.get(url) channel = get_channel(ucid, client, PG_DB, pull_all_videos: false) @@ -2638,7 +2677,7 @@ get "/channel/:ucid" do |env| client = make_client(YT_URL) - if !ucid.starts_with? "UC" + if !ucid.match(/UC[a-zA-Z0-9_-]{22}/) rss = client.get("/feeds/videos.xml?user=#{ucid}").body rss = XML.parse_html(rss) diff --git a/src/invidious/helpers.cr b/src/invidious/helpers.cr index 68699fc8..28e85469 100644 --- a/src/invidious/helpers.cr +++ b/src/invidious/helpers.cr @@ -253,8 +253,8 @@ def elapsed_text(elapsed) end def fetch_video(id) - info_channel = Channel(HTTP::Params).new html_channel = Channel(XML::Node).new + info_channel = Channel(HTTP::Params).new spawn do client = make_client(YT_URL) |