Minor refactor

This commit is contained in:
Omar Roth 2018-04-01 10:09:08 -05:00
parent 29545a7a6f
commit a54f59ad74
1 changed files with 6 additions and 7 deletions

View File

@ -206,8 +206,7 @@ get "/watch" do |env|
if env.params.query["v"]? if env.params.query["v"]?
id = env.params.query["v"] id = env.params.query["v"]
else else
env.redirect "/" next env.redirect "/"
next
end end
listen = false listen = false
@ -317,8 +316,7 @@ get "/search" do |env|
if env.params.query["q"]? if env.params.query["q"]?
query = env.params.query["q"] query = env.params.query["q"]
else else
env.redirect "/" next env.redirect "/"
next
end end
page = env.params.query["page"]?.try &.to_i page = env.params.query["page"]?.try &.to_i
@ -350,7 +348,7 @@ get "/search" do |env|
if title if title
video["title"] = title.content video["title"] = title.content
else else
video["title"] = "Something went wrong" video["title"] = ""
end end
author = root.xpath_node(%q(div[@class="yt-lockup-content"]/div/a)) author = root.xpath_node(%q(div[@class="yt-lockup-content"]/div/a))
@ -701,8 +699,7 @@ get "/subscription_ajax" do |env|
elsif env.params.query["action_remove_subscriptions"]? elsif env.params.query["action_remove_subscriptions"]?
action = "action_remove_subscriptions" action = "action_remove_subscriptions"
else else
action = "" next env.redirect referer
env.redirect referer
end end
channel_id = env.params.query["c"]? channel_id = env.params.query["c"]?
@ -713,7 +710,9 @@ get "/subscription_ajax" do |env|
client = get_client(youtube_pool) client = get_client(youtube_pool)
subs = client.get("/subscription_manager?disable_polymer=1", headers) subs = client.get("/subscription_manager?disable_polymer=1", headers)
headers["Cookie"] += "; " + subs.cookies.add_request_headers(headers)["Cookie"] headers["Cookie"] += "; " + subs.cookies.add_request_headers(headers)["Cookie"]
match = subs.body.match(/'XSRF_TOKEN': "(?<session_token>[A-Za-z0-9\_\-\=]+)"/) match = subs.body.match(/'XSRF_TOKEN': "(?<session_token>[A-Za-z0-9\_\-\=]+)"/)
if match if match
session_token = match["session_token"] session_token = match["session_token"]