mirrors/nadeko_invidious
1
0
Fork 0
mirror of https://git.nadeko.net/Fijxu/invidious.git synced 2025-12-19 19:38:51 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Clean useless database arguments (4/5)

Browse Source
This commit is contained in:
Samantaz Fox
2021-12-07 02:55:43 +01:00
parent 40ed4a0506
commit d74873fed1
11 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/invidious/routes/api/manifest.cr
View File

@@ -13,7 +13,7 @@ module Invidious::Routes::API::Manifest
unique_res = env.params.query["unique_res"]?.try { |q| (q == "true" || q == "1").to_unsafe }
begin
video = get_video(id, PG_DB, region: region)
video = get_video(id, region: region)
rescue ex : VideoRedirect
return env.redirect env.request.resource.gsub(id, ex.video_id)
rescue ex

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

@@ -245,7 +245,7 @@ module Invidious::Routes::API::V1::Authenticated
end
begin
video = get_video(video_id, PG_DB)
video = get_video(video_id)
rescue ex
return error_json(500, ex)
end

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

@@ -8,7 +8,7 @@ module Invidious::Routes::API::V1::Videos
region = env.params.query["region"]?
begin
video = get_video(id, PG_DB, region: region)
video = get_video(id, region: region)
rescue ex : VideoRedirect
env.response.headers["Location"] = env.request.resource.gsub(id, ex.video_id)
return error_json(302, "Video is unavailable", {"videoId" => ex.video_id})
@@ -36,7 +36,7 @@ module Invidious::Routes::API::V1::Videos
# getting video info.
begin
video = get_video(id, PG_DB, region: region)
video = get_video(id, region: region)
rescue ex : VideoRedirect
env.response.headers["Location"] = env.request.resource.gsub(id, ex.video_id)
return error_json(302, "Video is unavailable", {"videoId" => ex.video_id})
@@ -157,7 +157,7 @@ module Invidious::Routes::API::V1::Videos
region = env.params.query["region"]?
begin
video = get_video(id, PG_DB, region: region)
video = get_video(id, region: region)
rescue ex : VideoRedirect
env.response.headers["Location"] = env.request.resource.gsub(id, ex.video_id)
return error_json(302, "Video is unavailable", {"videoId" => ex.video_id})
@@ -271,7 +271,7 @@ module Invidious::Routes::API::V1::Videos
annotations = response.body
cache_annotation(PG_DB, id, annotations)
cache_annotation(id, annotations)
end
else # "youtube"
response = YT_POOL.client &.get("/annotations_invideo?video_id=#{id}")

4
src/invidious/routes/embed.cr
View File

@@ -30,7 +30,7 @@ module Invidious::Routes::Embed
id = env.params.url["id"]
plid = env.params.query["list"]?.try &.gsub(/[^a-zA-Z0-9_-]/, "")
continuation = process_continuation(PG_DB, env.params.query, plid, id)
continuation = process_continuation(env.params.query, plid, id)
if md = env.params.query["playlist"]?
.try &.match(/[a-zA-Z0-9_-]{11}(,[a-zA-Z0-9_-]{11})*/)
@@ -119,7 +119,7 @@ module Invidious::Routes::Embed
subscriptions ||= [] of String
begin
video = get_video(id, PG_DB, region: params.region)
video = get_video(id, region: params.region)
rescue ex : VideoRedirect
return env.redirect env.request.resource.gsub(id, ex.video_id)
rescue ex

2
src/invidious/routes/feeds.cr
View File

@@ -393,7 +393,7 @@ module Invidious::Routes::Feeds
published = Time.parse_rfc3339(entry.xpath_node("published").not_nil!.content)
updated = Time.parse_rfc3339(entry.xpath_node("updated").not_nil!.content)
video = get_video(id, PG_DB, force_refresh: true)
video = get_video(id, force_refresh: true)
# Deliver notifications to `/api/v1/auth/notifications`
payload = {

2
src/invidious/routes/playlists.cr
View File

@@ -345,7 +345,7 @@ module Invidious::Routes::Playlists
video_id = env.params.query["video_id"]
begin
video = get_video(video_id, PG_DB)
video = get_video(video_id)
rescue ex
if redirect
return error_template(500, ex)

2
src/invidious/routes/video_playback.cr
View File

@@ -263,7 +263,7 @@ module Invidious::Routes::VideoPlayback
haltf env, status_code: 400, response: "TESTING"
end
video = get_video(id, PG_DB, region: region)
video = get_video(id, region: region)
fmt = video.fmt_stream.find(nil) { |f| f["itag"].as_i == itag } || video.adaptive_fmts.find(nil) { |f| f["itag"].as_i == itag }
url = fmt.try &.["url"]?.try &.as_s

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

@@ -39,7 +39,7 @@ module Invidious::Routes::Watch
end
plid = env.params.query["list"]?.try &.gsub(/[^a-zA-Z0-9_-]/, "")
continuation = process_continuation(PG_DB, env.params.query, plid, id)
continuation = process_continuation(env.params.query, plid, id)
nojs = env.params.query["nojs"]?
@@ -60,7 +60,7 @@ module Invidious::Routes::Watch
env.params.query.delete_all("listen")
begin
video = get_video(id, PG_DB, region: params.region)
video = get_video(id, region: params.region)
rescue ex : VideoRedirect
return env.redirect env.request.resource.gsub(id, ex.video_id)
rescue ex