iv-org
/
invidious
mirror of https://github.com/iv-org/invidious.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

encode parameters retrieved from url

This commit is contained in:
ChunkyProgrammer 2024-08-20 19:55:22 -04:00
parent 42d588b2d5
commit 9b995d6dec
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/invidious/routes/api/v1/channels.cr
View File

@ -395,7 +395,7 @@ module Invidious::Routes::API::V1::Channels
locale = env.get("preferences").as(Preferences).locale locale = env.get("preferences").as(Preferences).locale
env.response.content_type = "application/json" env.response.content_type = "application/json"
id = env.params.url["id"].to_s id = URI.encode_www_form(env.params.url["id"].to_s)
ucid = env.params.query["ucid"]? ucid = env.params.query["ucid"]?
thin_mode = env.params.query["thin_mode"]? thin_mode = env.params.query["thin_mode"]?
@ -407,9 +407,9 @@ module Invidious::Routes::API::V1::Channels
if ucid.nil? if ucid.nil?
response = YoutubeAPI.resolve_url("https://www.youtube.com/post/#{id}") response = YoutubeAPI.resolve_url("https://www.youtube.com/post/#{id}")
return error_json(400, "Invalid post ID") if response["error"]? return error_json(400, "Invalid post ID") if response["error"]?
ucid = response.dig("endpoint", "browseEndpoint", "browseId").as_s ucid = URI.encode_www_form(response.dig("endpoint", "browseEndpoint", "browseId").as_s)
else else
ucid = ucid.to_s ucid = URI.encode_www_form(ucid.to_s)
end end
begin begin
@ -424,7 +424,7 @@ module Invidious::Routes::API::V1::Channels
env.response.content_type = "application/json" env.response.content_type = "application/json"
id = env.params.url["id"] id = URI.encode_www_form(env.params.url["id"])
thin_mode = env.params.query["thin_mode"]? thin_mode = env.params.query["thin_mode"]?
thin_mode = thin_mode == "true" thin_mode = thin_mode == "true"
@ -438,9 +438,9 @@ module Invidious::Routes::API::V1::Channels
if ucid.nil? if ucid.nil?
response = YoutubeAPI.resolve_url("https://www.youtube.com/post/#{id}") response = YoutubeAPI.resolve_url("https://www.youtube.com/post/#{id}")
return error_json(400, "Invalid post ID") if response["error"]? return error_json(400, "Invalid post ID") if response["error"]?
ucid = response.dig("endpoint", "browseEndpoint", "browseId").as_s ucid = URI.encode_www_form(response.dig("endpoint", "browseEndpoint", "browseId").as_s)
else else
ucid = ucid.to_s ucid = URI.encode_www_form(ucid.to_s)
end end
case continuation case continuation

2
src/invidious/routes/api/v1/videos.cr
View File

@ -392,7 +392,7 @@ module Invidious::Routes::API::V1::Videos
env.response.content_type = "application/json" env.response.content_type = "application/json"
clip_id = env.params.url["id"] clip_id = URI.encode_www_form(env.params.url["id"])
region = env.params.query["region"]? region = env.params.query["region"]?
proxy = {"1", "true"}.any? &.== env.params.query["local"]? proxy = {"1", "true"}.any? &.== env.params.query["local"]?

6
src/invidious/routes/channels.cr
View File

@ -239,7 +239,7 @@ module Invidious::Routes::Channels
def self.post(env) def self.post(env)
# /post/{postId} # /post/{postId}
id = env.params.url["id"] id = URI.encode_www_form(env.params.url["id"])
ucid = env.params.query["ucid"]? ucid = env.params.query["ucid"]?
prefs = env.get("preferences").as(Preferences) prefs = env.get("preferences").as(Preferences)
@ -255,14 +255,14 @@ module Invidious::Routes::Channels
nojs = nojs == "1" nojs = nojs == "1"
if !ucid.nil? if !ucid.nil?
ucid = ucid.to_s ucid = URI.encode_www_form(ucid.to_s)
post_response = fetch_channel_community_post(ucid, id, locale, "json", thin_mode) post_response = fetch_channel_community_post(ucid, id, locale, "json", thin_mode)
else else
# resolve the url to get the author's UCID # resolve the url to get the author's UCID
response = YoutubeAPI.resolve_url("https://www.youtube.com/post/#{id}") response = YoutubeAPI.resolve_url("https://www.youtube.com/post/#{id}")
return error_template(400, "Invalid post ID") if response["error"]? return error_template(400, "Invalid post ID") if response["error"]?
ucid = response.dig("endpoint", "browseEndpoint", "browseId").as_s ucid = URI.encode_www_form(response.dig("endpoint", "browseEndpoint", "browseId").as_s)
post_response = fetch_channel_community_post(ucid, id, locale, "json", thin_mode) post_response = fetch_channel_community_post(ucid, id, locale, "json", thin_mode)
end end

6
src/invidious/routes/watch.cr
View File

@ -338,7 +338,7 @@ module Invidious::Routes::Watch
locale = env.get("preferences").as(Preferences).locale locale = env.get("preferences").as(Preferences).locale
region = env.params.query["region"]? region = env.params.query["region"]?
id = env.params.query["id"] id = URI.encode_www_form(env.params.query["id"])
continuation = env.params.query["continuation"]? continuation = env.params.query["continuation"]?
source = env.params.query["source"]? || "youtube" source = env.params.query["source"]? || "youtube"
@ -356,9 +356,9 @@ module Invidious::Routes::Watch
if ucid.nil? if ucid.nil?
response = YoutubeAPI.resolve_url("https://www.youtube.com/post/#{id}") response = YoutubeAPI.resolve_url("https://www.youtube.com/post/#{id}")
return error_json(400, "Invalid post ID") if response["error"]? return error_json(400, "Invalid post ID") if response["error"]?
ucid = response.dig("endpoint", "browseEndpoint", "browseId").as_s ucid = URI.encode_www_form(response.dig("endpoint", "browseEndpoint", "browseId").as_s)
else else
ucid = ucid.to_s ucid = URI.encode_www_form(ucid.to_s)
end end
case continuation case continuation
when nil, "" when nil, ""